aboutsummaryrefslogtreecommitdiff
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 07:31:44 +0000
commit45ceb58ff65da5bd57043d2d5e139867c942e66a (patch)
tree011366e9c4876938d48f4ee3efd727e1f5b1fc11
parentbe15c2968d83ab1590b4e560be911e90a48ff112 (diff)
downloadalpine_aports-45ceb58ff65da5bd57043d2d5e139867c942e66a.tar.bz2
alpine_aports-45ceb58ff65da5bd57043d2d5e139867c942e66a.tar.xz
alpine_aports-45ceb58ff65da5bd57043d2d5e139867c942e66a.zip
main/linux-grsec: upgrade to 2.1.14-2.6.32.12-201004292005
the 0006 and 0008 patch was applied upstream (cherry picked from commit 56350924f1206ad8e2d6c603c8b437395841a8e0)
Diffstat
-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 @@
1From a60cfaf3df9cd0cddbc24695434ed5bfa917d505 Mon Sep 17 00:00:00 2001
2From: Neil Horman <nhorman@redhat.com>
3Date: Mon, 29 Mar 2010 13:16:02 -0700
4Subject: [PATCH 06/18] r8169: offical fix for CVE-2009-4537 (overlength frame DMAs)
5
6Official patch to fix the r8169 frame length check error.
7
8Based on this initial thread:
9http://marc.info/?l=linux-netdev&m=126202972828626&w=1
10This is the official patch to fix the frame length problems in the r8169
11driver. As noted in the previous thread, while this patch incurs a performance
12hit on the driver, its possible to improve performance dynamically by updating
13the mtu and rx_copybreak values at runtime to return performance to what it was
14for those NICS which are unaffected by the ideosyncracy (if there are any).
15
16Summary:
17
18 A while back Eric submitted a patch for r8169 in which the proper
19allocated frame size was written to RXMaxSize to prevent the NIC from dmaing too
20much data. This was done in commit fdd7b4c3302c93f6833e338903ea77245eb510b4. A
21long time prior to that however, Francois posted
22126fa4b9ca5d9d7cb7d46f779ad3bd3631ca387c, which expiclitly disabled the MaxSize
23setting due to the fact that the hardware behaved in odd ways when overlong
24frames were received on NIC's supported by this driver. This was mentioned in a
25security conference recently:
26http://events.ccc.de/congress/2009/Fahrplan//events/3596.en.html
27
28It seems that if we can't enable frame size filtering, then, as Eric correctly
29noticed, we can find ourselves DMA-ing too much data to a buffer, causing
30corruption. As a result is seems that we are forced to allocate a frame which
31is ready to handle a maximally sized receive.
32
33This obviously has performance issues with it, so to mitigate that issue, this
34patch does two things:
35
361) Raises the copybreak value to the frame allocation size, which should force
37appropriately sized packets to get allocated on rx, rather than a full new 16k
38buffer.
39
402) This patch only disables frame filtering initially (i.e., during the NIC
41open), changing the MTU results in ring buffer allocation of a size in relation
42to the new mtu (along with a warning indicating that this is dangerous).
43
44Because of item (2), individuals who can't cope with the performance hit (or can
45otherwise filter frames to prevent the bug), or who have hardware they are sure
46is unaffected by this issue, can manually lower the copybreak and reset the mtu
47such that performance is restored easily.
48
49Signed-off-by: Neil Horman <nhorman@redhat.com>
50Signed-off-by: David S. Miller <davem@davemloft.net>
51(cherry picked from commit c0cd884af045338476b8e69a61fceb3f34ff22f1)
52---
53 drivers/net/r8169.c | 29 ++++++++++++++++++++++++-----
54 1 files changed, 24 insertions(+), 5 deletions(-)
55
56diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
57index 24599b5..1484528 100644
58--- a/drivers/net/r8169.c
59+++ b/drivers/net/r8169.c
60@@ -186,7 +186,12 @@ static struct pci_device_id rtl8169_pci_tbl[] = {
61
62 MODULE_DEVICE_TABLE(pci, rtl8169_pci_tbl);
63
64-static int rx_copybreak = 200;
65+/*
66+ * we set our copybreak very high so that we don't have
67+ * to allocate 16k frames all the time (see note in
68+ * rtl8169_open()
69+ */
70+static int rx_copybreak = 16383;
71 static int use_dac;
72 static struct {
73 u32 msg_enable;
74@@ -3245,9 +3250,13 @@ static void __devexit rtl8169_remove_one(struct pci_dev *pdev)
75 }
76
77 static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
78- struct net_device *dev)
79+ unsigned int mtu)
80 {
81- unsigned int max_frame = dev->mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
82+ unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
83+
84+ if (max_frame != 16383)
85+ printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
86+ "May lead to frame reception errors!\n");
87
88 tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
89 }
90@@ -3259,7 +3268,17 @@ static int rtl8169_open(struct net_device *dev)
91 int retval = -ENOMEM;
92
93
94- rtl8169_set_rxbufsize(tp, dev);
95+ /*
96+ * Note that we use a magic value here, its wierd I know
97+ * its done because, some subset of rtl8169 hardware suffers from
98+ * a problem in which frames received that are longer than
99+ * the size set in RxMaxSize register return garbage sizes
100+ * when received. To avoid this we need to turn off filtering,
101+ * which is done by setting a value of 16383 in the RxMaxSize register
102+ * and allocating 16k frames to handle the largest possible rx value
103+ * thats what the magic math below does.
104+ */
105+ rtl8169_set_rxbufsize(tp, 16383 - VLAN_ETH_HLEN - ETH_FCS_LEN);
106
107 /*
108 * Rx and Tx desscriptors needs 256 bytes alignment.
109@@ -3912,7 +3931,7 @@ static int rtl8169_change_mtu(struct net_device *dev, int new_mtu)
110
111 rtl8169_down(dev);
112
113- rtl8169_set_rxbufsize(tp, dev);
114+ rtl8169_set_rxbufsize(tp, dev->mtu);
115
116 ret = rtl8169_init_ring(dev);
117 if (ret < 0)
118--
1191.7.0.2
120
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 @@
1From d1c9ac562923fa0b1738fceb4c7bafac3ab936ba Mon Sep 17 00:00:00 2001
2From: Neil Horman <nhorman@tuxdriver.com>
3Date: Thu, 1 Apr 2010 07:30:07 +0000
4Subject: [PATCH 08/18] r8169: clean up my printk uglyness
5
6Fix formatting on r8169 printk
7
8Brandon Philips noted that I had a spacing issue in my printk for the
9last r8169 patch that made it quite ugly. Fix that up and add the PFX
10macro to it as well so it looks like the other r8169 printks
11
12Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
13Signed-off-by: David S. Miller <davem@davemloft.net>
14(cherry picked from commit 93f4d91d879acfcb0ba9c2725e3133fcff2dfd1e)
15---
16 drivers/net/r8169.c | 4 ++--
17 1 files changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c
20index bed1d47..790555e 100644
21--- a/drivers/net/r8169.c
22+++ b/drivers/net/r8169.c
23@@ -3255,8 +3255,8 @@ static void rtl8169_set_rxbufsize(struct rtl8169_private *tp,
24 unsigned int max_frame = mtu + VLAN_ETH_HLEN + ETH_FCS_LEN;
25
26 if (max_frame != 16383)
27- printk(KERN_WARNING "WARNING! Changing of MTU on this NIC"
28- "May lead to frame reception errors!\n");
29+ printk(KERN_WARNING PFX "WARNING! Changing of MTU on this "
30+ "NIC may lead to frame reception errors!\n");
31
32 tp->rx_buf_sz = (max_frame > RX_BUF_SIZE) ? max_frame : RX_BUF_SIZE;
33 }
34--
351.7.0.2
36
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 @@
2 2
3_flavor=grsec 3_flavor=grsec
4pkgname=linux-${_flavor} 4pkgname=linux-${_flavor}
5pkgver=2.6.32.11 5pkgver=2.6.32.12
6_kernver=2.6.32 6_kernver=2.6.32
7pkgrel=2 7pkgrel=2
8pkgdesc="Linux kernel with grsecurity" 8pkgdesc="Linux kernel with grsecurity"
@@ -14,15 +14,13 @@ _config=${config:-kernelconfig.${CARCH:-x86}}
14install= 14install=
15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 15source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2
16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 16 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
17 grsecurity-2.1.14-2.6.32.11-201004071936.patch 17 grsecurity-2.1.14-2.6.32.12-201004292005.patch
18 0001-grsec-revert-conflicting-flow-cache-changes.patch 18 0001-grsec-revert-conflicting-flow-cache-changes.patch
19 0002-gre-fix-hard-header-destination-address-checking.patch 19 0002-gre-fix-hard-header-destination-address-checking.patch
20 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 20 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
21 0004-arp-flush-arp-cache-on-device-change.patch 21 0004-arp-flush-arp-cache-on-device-change.patch
22 0005-r8169-fix-broken-register-writes.patch 22 0005-r8169-fix-broken-register-writes.patch
23 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
24 0007-r8169-Fix-rtl8169_rx_interrupt.patch 23 0007-r8169-Fix-rtl8169_rx_interrupt.patch
25 0008-r8169-clean-up-my-printk-uglyness.patch
26 0009-ipsec-Fix-bogus-bundle-flowi.patch 24 0009-ipsec-Fix-bogus-bundle-flowi.patch
27 0010-xfrm-Remove-xfrm_state_genid.patch 25 0010-xfrm-Remove-xfrm_state_genid.patch
28 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch 26 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch
@@ -138,16 +136,14 @@ firmware() {
138} 136}
139 137
140md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2 138md5sums="260551284ac224c3a43c4adac7df4879 linux-2.6.32.tar.bz2
141855c248334a71ef5ca3d8cb89d51334f patch-2.6.32.11.bz2 1399d097d34648a1734b1a7f97c5d000f03 patch-2.6.32.12.bz2
1426eabb0c08a988a97a823b5462d1c5018 grsecurity-2.1.14-2.6.32.11-201004071936.patch 1406c360e4ba40b91137f6ab8b5996e9b1f grsecurity-2.1.14-2.6.32.12-201004292005.patch
1431d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch 1411d247140abec49b96250aec9aa59b324 0001-grsec-revert-conflicting-flow-cache-changes.patch
144437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch 142437317f88ec13ace8d39c31983a41696 0002-gre-fix-hard-header-destination-address-checking.patch
145151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch 143151b29a161178ed39d62a08f21f3484d 0003-ip_gre-include-route-header_len-in-max_headroom-calc.patch
146776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch 144776adeeb5272093574f8836c5037dd7d 0004-arp-flush-arp-cache-on-device-change.patch
147afa06334c81f21c20571286a83d3d928 0005-r8169-fix-broken-register-writes.patch 145afa06334c81f21c20571286a83d3d928 0005-r8169-fix-broken-register-writes.patch
148c538c0f735d79fd71b47dde02bf1f790 0006-r8169-offical-fix-for-CVE-2009-4537-overlength-frame.patch
1495f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch 1465f8b9a76d95319c5b1aa26b54a42e6b5 0007-r8169-Fix-rtl8169_rx_interrupt.patch
150f878c802700e3babd03be3505119c5c2 0008-r8169-clean-up-my-printk-uglyness.patch
151cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch 147cf168620efa63479a6e03da78906e32f 0009-ipsec-Fix-bogus-bundle-flowi.patch
1523af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch 1483af4b5ae1afae3278b0070f585b874e3 0010-xfrm-Remove-xfrm_state_genid.patch
1539f284c3fd5ab38cef4544efc1f50c6ba 0011-xfrm_user-verify-policy-direction-at-XFRM_MSG_POLEXP.patch 1499f284c3fd5ab38cef4544efc1f50c6ba 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 @@
1diff -urNp linux-2.6.32.11/arch/alpha/include/asm/elf.h linux-2.6.32.11/arch/alpha/include/asm/elf.h 1diff -urNp linux-2.6.32.12/arch/alpha/include/asm/elf.h linux-2.6.32.12/arch/alpha/include/asm/elf.h
2--- linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2--- linux-2.6.32.12/arch/alpha/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
3+++ linux-2.6.32.11/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400 3+++ linux-2.6.32.12/arch/alpha/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
4@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 4@@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
5 5
6 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) 6 #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
15 /* $0 is set by ld.so to a pointer to a function which might be 15 /* $0 is set by ld.so to a pointer to a function which might be
16 registered using atexit. This provides a mean for the dynamic 16 registered using atexit. This provides a mean for the dynamic
17 linker to call DT_FINI functions for shared libraries that have 17 linker to call DT_FINI functions for shared libraries that have
18diff -urNp linux-2.6.32.11/arch/alpha/include/asm/pgtable.h linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 18diff -urNp linux-2.6.32.12/arch/alpha/include/asm/pgtable.h linux-2.6.32.12/arch/alpha/include/asm/pgtable.h
19--- linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 19--- linux-2.6.32.12/arch/alpha/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
20+++ linux-2.6.32.11/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -0400 20+++ linux-2.6.32.12/arch/alpha/include/asm/pgtable.h 2010-04-04 20:46:41.472784147 -0400
21@@ -101,6 +101,17 @@ struct vm_area_struct; 21@@ -101,6 +101,17 @@ struct vm_area_struct;
22 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) 22 #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS)
23 #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) 23 #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
36 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) 36 #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE)
37 37
38 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) 38 #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x))
39diff -urNp linux-2.6.32.11/arch/alpha/kernel/module.c linux-2.6.32.11/arch/alpha/kernel/module.c 39diff -urNp linux-2.6.32.12/arch/alpha/kernel/module.c linux-2.6.32.12/arch/alpha/kernel/module.c
40--- linux-2.6.32.11/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 40--- linux-2.6.32.12/arch/alpha/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
41+++ linux-2.6.32.11/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -0400 41+++ linux-2.6.32.12/arch/alpha/kernel/module.c 2010-04-04 20:46:41.472784147 -0400
42@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 42@@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs,
43 43
44 /* The small sections were sorted to the end of the segment. 44 /* 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
48 got = sechdrs[me->arch.gotsecindex].sh_addr; 48 got = sechdrs[me->arch.gotsecindex].sh_addr;
49 49
50 for (i = 0; i < n; i++) { 50 for (i = 0; i < n; i++) {
51diff -urNp linux-2.6.32.11/arch/alpha/kernel/osf_sys.c linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 51diff -urNp linux-2.6.32.12/arch/alpha/kernel/osf_sys.c linux-2.6.32.12/arch/alpha/kernel/osf_sys.c
52--- linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400 52--- linux-2.6.32.12/arch/alpha/kernel/osf_sys.c 2010-03-15 11:52:04.000000000 -0400
53+++ linux-2.6.32.11/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400 53+++ linux-2.6.32.12/arch/alpha/kernel/osf_sys.c 2010-04-04 20:46:41.472784147 -0400
54@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp 54@@ -1205,6 +1205,10 @@ arch_get_unmapped_area(struct file *filp
55 merely specific addresses, but regions of memory -- perhaps 55 merely specific addresses, but regions of memory -- perhaps
56 this feature should be incorporated into all ports? */ 56 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
73 if (addr != (unsigned long) -ENOMEM) 73 if (addr != (unsigned long) -ENOMEM)
74 return addr; 74 return addr;
75 75
76diff -urNp linux-2.6.32.11/arch/alpha/mm/fault.c linux-2.6.32.11/arch/alpha/mm/fault.c 76diff -urNp linux-2.6.32.12/arch/alpha/mm/fault.c linux-2.6.32.12/arch/alpha/mm/fault.c
77--- linux-2.6.32.11/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 77--- linux-2.6.32.12/arch/alpha/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
78+++ linux-2.6.32.11/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400 78+++ linux-2.6.32.12/arch/alpha/mm/fault.c 2010-04-04 20:46:41.472784147 -0400
79@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * 79@@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
80 __reload_thread(pcb); 80 __reload_thread(pcb);
81 } 81 }
@@ -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
232 } else if (!cause) { 232 } else if (!cause) {
233 /* Allow reads even for write-only mappings */ 233 /* Allow reads even for write-only mappings */
234 if (!(vma->vm_flags & (VM_READ | VM_WRITE))) 234 if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
235diff -urNp linux-2.6.32.11/arch/arm/include/asm/elf.h linux-2.6.32.11/arch/arm/include/asm/elf.h 235diff -urNp linux-2.6.32.12/arch/arm/include/asm/elf.h linux-2.6.32.12/arch/arm/include/asm/elf.h
236--- linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 236--- linux-2.6.32.12/arch/arm/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
237+++ linux-2.6.32.11/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400 237+++ linux-2.6.32.12/arch/arm/include/asm/elf.h 2010-04-04 20:46:41.472784147 -0400
238@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t 238@@ -109,7 +109,14 @@ int dump_task_regs(struct task_struct *t
239 the loader. We need to make sure that it is out of the way of the program 239 the loader. We need to make sure that it is out of the way of the program
240 that it will "exec", and that there is sufficient room for the brk. */ 240 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
251 251
252 /* When the program starts, a1 contains a pointer to a function to be 252 /* When the program starts, a1 contains a pointer to a function to be
253 registered with atexit, as per the SVR4 ABI. A value of 0 means we 253 registered with atexit, as per the SVR4 ABI. A value of 0 means we
254diff -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 254diff -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
255--- linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 255--- linux-2.6.32.12/arch/arm/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
256+++ linux-2.6.32.11/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400 256+++ linux-2.6.32.12/arch/arm/include/asm/kmap_types.h 2010-04-04 20:46:41.472784147 -0400
257@@ -19,6 +19,7 @@ enum km_type { 257@@ -19,6 +19,7 @@ enum km_type {
258 KM_SOFTIRQ0, 258 KM_SOFTIRQ0,
259 KM_SOFTIRQ1, 259 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
262 KM_TYPE_NR 262 KM_TYPE_NR
263 }; 263 };
264 264
265diff -urNp linux-2.6.32.11/arch/arm/include/asm/uaccess.h linux-2.6.32.11/arch/arm/include/asm/uaccess.h 265diff -urNp linux-2.6.32.12/arch/arm/include/asm/uaccess.h linux-2.6.32.12/arch/arm/include/asm/uaccess.h
266--- linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 266--- linux-2.6.32.12/arch/arm/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
267+++ linux-2.6.32.11/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -0400 267+++ linux-2.6.32.12/arch/arm/include/asm/uaccess.h 2010-04-04 20:46:41.472784147 -0400
268@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn 268@@ -403,6 +403,9 @@ extern unsigned long __must_check __strn
269 269
270 static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) 270 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
285 if (access_ok(VERIFY_WRITE, to, n)) 285 if (access_ok(VERIFY_WRITE, to, n))
286 n = __copy_to_user(to, from, n); 286 n = __copy_to_user(to, from, n);
287 return n; 287 return n;
288diff -urNp linux-2.6.32.11/arch/arm/kernel/kgdb.c linux-2.6.32.11/arch/arm/kernel/kgdb.c 288diff -urNp linux-2.6.32.12/arch/arm/kernel/kgdb.c linux-2.6.32.12/arch/arm/kernel/kgdb.c
289--- linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 289--- linux-2.6.32.12/arch/arm/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
290+++ linux-2.6.32.11/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400 290+++ linux-2.6.32.12/arch/arm/kernel/kgdb.c 2010-04-04 20:46:41.472784147 -0400
291@@ -190,7 +190,7 @@ void kgdb_arch_exit(void) 291@@ -190,7 +190,7 @@ void kgdb_arch_exit(void)
292 * and we handle the normal undef case within the do_undefinstr 292 * and we handle the normal undef case within the do_undefinstr
293 * handler. 293 * 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
297 #ifndef __ARMEB__ 297 #ifndef __ARMEB__
298 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7} 298 .gdb_bpt_instr = {0xfe, 0xde, 0xff, 0xe7}
299 #else /* ! __ARMEB__ */ 299 #else /* ! __ARMEB__ */
300diff -urNp linux-2.6.32.11/arch/arm/mach-at91/pm.c linux-2.6.32.11/arch/arm/mach-at91/pm.c 300diff -urNp linux-2.6.32.12/arch/arm/mach-at91/pm.c linux-2.6.32.12/arch/arm/mach-at91/pm.c
301--- linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400 301--- linux-2.6.32.12/arch/arm/mach-at91/pm.c 2010-03-15 11:52:04.000000000 -0400
302+++ linux-2.6.32.11/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400 302+++ linux-2.6.32.12/arch/arm/mach-at91/pm.c 2010-04-04 20:46:41.472784147 -0400
303@@ -348,7 +348,7 @@ static void at91_pm_end(void) 303@@ -348,7 +348,7 @@ static void at91_pm_end(void)
304 } 304 }
305 305
@@ -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
309 .valid = at91_pm_valid_state, 309 .valid = at91_pm_valid_state,
310 .begin = at91_pm_begin, 310 .begin = at91_pm_begin,
311 .enter = at91_pm_enter, 311 .enter = at91_pm_enter,
312diff -urNp linux-2.6.32.11/arch/arm/mach-omap1/pm.c linux-2.6.32.11/arch/arm/mach-omap1/pm.c 312diff -urNp linux-2.6.32.12/arch/arm/mach-omap1/pm.c linux-2.6.32.12/arch/arm/mach-omap1/pm.c
313--- linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400 313--- linux-2.6.32.12/arch/arm/mach-omap1/pm.c 2010-03-15 11:52:04.000000000 -0400
314+++ linux-2.6.32.11/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400 314+++ linux-2.6.32.12/arch/arm/mach-omap1/pm.c 2010-04-04 20:46:41.472784147 -0400
315@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq 315@@ -647,7 +647,7 @@ static struct irqaction omap_wakeup_irq
316 316
317 317
@@ -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
321 .prepare = omap_pm_prepare, 321 .prepare = omap_pm_prepare,
322 .enter = omap_pm_enter, 322 .enter = omap_pm_enter,
323 .finish = omap_pm_finish, 323 .finish = omap_pm_finish,
324diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 324diff -urNp linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c
325--- linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400 325--- linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c 2010-03-15 11:52:04.000000000 -0400
326+++ linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400 326+++ linux-2.6.32.12/arch/arm/mach-omap2/pm24xx.c 2010-04-04 20:46:41.472784147 -0400
327@@ -326,7 +326,7 @@ static void omap2_pm_finish(void) 327@@ -326,7 +326,7 @@ static void omap2_pm_finish(void)
328 enable_hlt(); 328 enable_hlt();
329 } 329 }
@@ -333,9 +333,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm24xx.c linux-2.6.32.11/arch/arm
333 .prepare = omap2_pm_prepare, 333 .prepare = omap2_pm_prepare,
334 .enter = omap2_pm_enter, 334 .enter = omap2_pm_enter,
335 .finish = omap2_pm_finish, 335 .finish = omap2_pm_finish,
336diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 336diff -urNp linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c
337--- linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400 337--- linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c 2010-03-15 11:52:04.000000000 -0400
338+++ linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400 338+++ linux-2.6.32.12/arch/arm/mach-omap2/pm34xx.c 2010-04-04 20:46:41.472784147 -0400
339@@ -401,7 +401,7 @@ static void omap3_pm_end(void) 339@@ -401,7 +401,7 @@ static void omap3_pm_end(void)
340 return; 340 return;
341 } 341 }
@@ -345,9 +345,9 @@ diff -urNp linux-2.6.32.11/arch/arm/mach-omap2/pm34xx.c linux-2.6.32.11/arch/arm
345 .begin = omap3_pm_begin, 345 .begin = omap3_pm_begin,
346 .end = omap3_pm_end, 346 .end = omap3_pm_end,
347 .prepare = omap3_pm_prepare, 347 .prepare = omap3_pm_prepare,
348diff -urNp linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 348diff -urNp linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c
349--- linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400 349--- linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c 2010-03-15 11:52:04.000000000 -0400
350+++ linux-2.6.32.11/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400 350+++ linux-2.6.32.12/arch/arm/mach-pnx4008/pm.c 2010-04-04 20:46:41.476773136 -0400
351@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat 351@@ -116,7 +116,7 @@ static int pnx4008_pm_valid(suspend_stat
352 (state == PM_SUSPEND_MEM); 352 (state == PM_SUSPEND_MEM);
353 } 353 }
@@ -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
357 .enter = pnx4008_pm_enter, 357 .enter = pnx4008_pm_enter,
358 .valid = pnx4008_pm_valid, 358 .valid = pnx4008_pm_valid,
359 }; 359 };
360diff -urNp linux-2.6.32.11/arch/arm/mach-pxa/pm.c linux-2.6.32.11/arch/arm/mach-pxa/pm.c 360diff -urNp linux-2.6.32.12/arch/arm/mach-pxa/pm.c linux-2.6.32.12/arch/arm/mach-pxa/pm.c
361--- linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400 361--- linux-2.6.32.12/arch/arm/mach-pxa/pm.c 2010-03-15 11:52:04.000000000 -0400
362+++ linux-2.6.32.11/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400 362+++ linux-2.6.32.12/arch/arm/mach-pxa/pm.c 2010-04-04 20:46:41.476773136 -0400
363@@ -95,7 +95,7 @@ void pxa_pm_finish(void) 363@@ -95,7 +95,7 @@ void pxa_pm_finish(void)
364 pxa_cpu_pm_fns->finish(); 364 pxa_cpu_pm_fns->finish();
365 } 365 }
@@ -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-
369 .valid = pxa_pm_valid, 369 .valid = pxa_pm_valid,
370 .enter = pxa_pm_enter, 370 .enter = pxa_pm_enter,
371 .prepare = pxa_pm_prepare, 371 .prepare = pxa_pm_prepare,
372diff -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 372diff -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
373--- linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400 373--- linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c 2010-03-15 11:52:04.000000000 -0400
374+++ linux-2.6.32.11/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400 374+++ linux-2.6.32.12/arch/arm/mach-pxa/sharpsl_pm.c 2010-04-04 20:46:41.476773136 -0400
375@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status 375@@ -891,7 +891,7 @@ static void sharpsl_apm_get_power_status
376 } 376 }
377 377
@@ -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
381 .prepare = pxa_pm_prepare, 381 .prepare = pxa_pm_prepare,
382 .finish = pxa_pm_finish, 382 .finish = pxa_pm_finish,
383 .enter = corgi_pxa_pm_enter, 383 .enter = corgi_pxa_pm_enter,
384diff -urNp linux-2.6.32.11/arch/arm/mach-sa1100/pm.c linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 384diff -urNp linux-2.6.32.12/arch/arm/mach-sa1100/pm.c linux-2.6.32.12/arch/arm/mach-sa1100/pm.c
385--- linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400 385--- linux-2.6.32.12/arch/arm/mach-sa1100/pm.c 2010-03-15 11:52:04.000000000 -0400
386+++ linux-2.6.32.11/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400 386+++ linux-2.6.32.12/arch/arm/mach-sa1100/pm.c 2010-04-04 20:46:41.476773136 -0400
387@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp) 387@@ -120,7 +120,7 @@ unsigned long sleep_phys_sp(void *sp)
388 return virt_to_phys(sp); 388 return virt_to_phys(sp);
389 } 389 }
@@ -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
393 .enter = sa11x0_pm_enter, 393 .enter = sa11x0_pm_enter,
394 .valid = suspend_valid_only_mem, 394 .valid = suspend_valid_only_mem,
395 }; 395 };
396diff -urNp linux-2.6.32.11/arch/arm/mm/fault.c linux-2.6.32.11/arch/arm/mm/fault.c 396diff -urNp linux-2.6.32.12/arch/arm/mm/fault.c linux-2.6.32.12/arch/arm/mm/fault.c
397--- linux-2.6.32.11/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 397--- linux-2.6.32.12/arch/arm/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
398+++ linux-2.6.32.11/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400 398+++ linux-2.6.32.12/arch/arm/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
399@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk, 399@@ -166,6 +166,13 @@ __do_user_fault(struct task_struct *tsk,
400 } 400 }
401 #endif 401 #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
444 /* 444 /*
445 * First Level Translation Fault Handler 445 * First Level Translation Fault Handler
446 * 446 *
447diff -urNp linux-2.6.32.11/arch/arm/mm/mmap.c linux-2.6.32.11/arch/arm/mm/mmap.c 447diff -urNp linux-2.6.32.12/arch/arm/mm/mmap.c linux-2.6.32.12/arch/arm/mm/mmap.c
448--- linux-2.6.32.11/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 448--- linux-2.6.32.12/arch/arm/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
449+++ linux-2.6.32.11/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400 449+++ linux-2.6.32.12/arch/arm/mm/mmap.c 2010-04-04 20:46:41.476773136 -0400
450@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp 450@@ -63,6 +63,10 @@ arch_get_unmapped_area(struct file *filp
451 if (len > TASK_SIZE) 451 if (len > TASK_SIZE)
452 return -ENOMEM; 452 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
483 mm->cached_hole_size = 0; 483 mm->cached_hole_size = 0;
484 goto full_search; 484 goto full_search;
485 } 485 }
486diff -urNp linux-2.6.32.11/arch/arm/plat-s3c/pm.c linux-2.6.32.11/arch/arm/plat-s3c/pm.c 486diff -urNp linux-2.6.32.12/arch/arm/plat-s3c/pm.c linux-2.6.32.12/arch/arm/plat-s3c/pm.c
487--- linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400 487--- linux-2.6.32.12/arch/arm/plat-s3c/pm.c 2010-03-15 11:52:04.000000000 -0400
488+++ linux-2.6.32.11/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400 488+++ linux-2.6.32.12/arch/arm/plat-s3c/pm.c 2010-04-04 20:46:41.476773136 -0400
489@@ -355,7 +355,7 @@ static void s3c_pm_finish(void) 489@@ -355,7 +355,7 @@ static void s3c_pm_finish(void)
490 s3c_pm_check_cleanup(); 490 s3c_pm_check_cleanup();
491 } 491 }
@@ -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-
495 .enter = s3c_pm_enter, 495 .enter = s3c_pm_enter,
496 .prepare = s3c_pm_prepare, 496 .prepare = s3c_pm_prepare,
497 .finish = s3c_pm_finish, 497 .finish = s3c_pm_finish,
498diff -urNp linux-2.6.32.11/arch/avr32/include/asm/elf.h linux-2.6.32.11/arch/avr32/include/asm/elf.h 498diff -urNp linux-2.6.32.12/arch/avr32/include/asm/elf.h linux-2.6.32.12/arch/avr32/include/asm/elf.h
499--- linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 499--- linux-2.6.32.12/arch/avr32/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
500+++ linux-2.6.32.11/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400 500+++ linux-2.6.32.12/arch/avr32/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
501@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg 501@@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg
502 the loader. We need to make sure that it is out of the way of the program 502 the loader. We need to make sure that it is out of the way of the program
503 that it will "exec", and that there is sufficient room for the brk. */ 503 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
514 514
515 /* This yields a mask that user programs can use to figure out what 515 /* This yields a mask that user programs can use to figure out what
516 instruction set this CPU supports. This could be done in user space, 516 instruction set this CPU supports. This could be done in user space,
517diff -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 517diff -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
518--- linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 518--- linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
519+++ linux-2.6.32.11/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400 519+++ linux-2.6.32.12/arch/avr32/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
520@@ -22,7 +22,8 @@ D(10) KM_IRQ0, 520@@ -22,7 +22,8 @@ D(10) KM_IRQ0,
521 D(11) KM_IRQ1, 521 D(11) KM_IRQ1,
522 D(12) KM_SOFTIRQ0, 522 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
527 }; 527 };
528 528
529 #undef D 529 #undef D
530diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 530diff -urNp linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c
531--- linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400 531--- linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c 2010-03-15 11:52:04.000000000 -0400
532+++ linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400 532+++ linux-2.6.32.12/arch/avr32/mach-at32ap/pm.c 2010-04-04 20:46:41.476773136 -0400
533@@ -176,7 +176,7 @@ out: 533@@ -176,7 +176,7 @@ out:
534 return 0; 534 return 0;
535 } 535 }
@@ -539,9 +539,9 @@ diff -urNp linux-2.6.32.11/arch/avr32/mach-at32ap/pm.c linux-2.6.32.11/arch/avr3
539 .valid = avr32_pm_valid_state, 539 .valid = avr32_pm_valid_state,
540 .enter = avr32_pm_enter, 540 .enter = avr32_pm_enter,
541 }; 541 };
542diff -urNp linux-2.6.32.11/arch/avr32/mm/fault.c linux-2.6.32.11/arch/avr32/mm/fault.c 542diff -urNp linux-2.6.32.12/arch/avr32/mm/fault.c linux-2.6.32.12/arch/avr32/mm/fault.c
543--- linux-2.6.32.11/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 543--- linux-2.6.32.12/arch/avr32/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
544+++ linux-2.6.32.11/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400 544+++ linux-2.6.32.12/arch/avr32/mm/fault.c 2010-04-04 20:46:41.476773136 -0400
545@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru 545@@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
546 546
547 int exception_trace = 1; 547 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
583 if (exception_trace && printk_ratelimit()) 583 if (exception_trace && printk_ratelimit())
584 printk("%s%s[%d]: segfault at %08lx pc %08lx " 584 printk("%s%s[%d]: segfault at %08lx pc %08lx "
585 "sp %08lx ecr %lu\n", 585 "sp %08lx ecr %lu\n",
586diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 586diff -urNp linux-2.6.32.12/arch/blackfin/kernel/kgdb.c linux-2.6.32.12/arch/blackfin/kernel/kgdb.c
587--- linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 587--- linux-2.6.32.12/arch/blackfin/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
588+++ linux-2.6.32.11/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -0400 588+++ linux-2.6.32.12/arch/blackfin/kernel/kgdb.c 2010-04-04 20:46:41.476773136 -0400
589@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto 589@@ -428,7 +428,7 @@ int kgdb_arch_handle_exception(int vecto
590 return -1; /* this means that we do not want to exit from the handler */ 590 return -1; /* this means that we do not want to exit from the handler */
591 } 591 }
@@ -595,9 +595,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/kernel/kgdb.c linux-2.6.32.11/arch/blac
595 .gdb_bpt_instr = {0xa1}, 595 .gdb_bpt_instr = {0xa1},
596 #ifdef CONFIG_SMP 596 #ifdef CONFIG_SMP
597 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP, 597 .flags = KGDB_HW_BREAKPOINT|KGDB_THR_PROC_SWAP,
598diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/blackfin/mach-common/pm.c 598diff -urNp linux-2.6.32.12/arch/blackfin/mach-common/pm.c linux-2.6.32.12/arch/blackfin/mach-common/pm.c
599--- linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400 599--- linux-2.6.32.12/arch/blackfin/mach-common/pm.c 2010-03-15 11:52:04.000000000 -0400
600+++ linux-2.6.32.11/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400 600+++ linux-2.6.32.12/arch/blackfin/mach-common/pm.c 2010-04-04 20:46:41.476773136 -0400
601@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t 601@@ -255,7 +255,7 @@ static int bfin_pm_enter(suspend_state_t
602 return 0; 602 return 0;
603 } 603 }
@@ -607,9 +607,9 @@ diff -urNp linux-2.6.32.11/arch/blackfin/mach-common/pm.c linux-2.6.32.11/arch/b
607 .enter = bfin_pm_enter, 607 .enter = bfin_pm_enter,
608 .valid = bfin_pm_valid, 608 .valid = bfin_pm_valid,
609 }; 609 };
610diff -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 610diff -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
611--- linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 611--- linux-2.6.32.12/arch/frv/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
612+++ linux-2.6.32.11/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400 612+++ linux-2.6.32.12/arch/frv/include/asm/kmap_types.h 2010-04-04 20:46:41.476773136 -0400
613@@ -23,6 +23,7 @@ enum km_type { 613@@ -23,6 +23,7 @@ enum km_type {
614 KM_IRQ1, 614 KM_IRQ1,
615 KM_SOFTIRQ0, 615 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
618 KM_TYPE_NR 618 KM_TYPE_NR
619 }; 619 };
620 620
621diff -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 621diff -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
622--- linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400 622--- linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c 2010-03-15 11:52:04.000000000 -0400
623+++ linux-2.6.32.11/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400 623+++ linux-2.6.32.12/arch/ia64/hp/common/hwsw_iommu.c 2010-04-04 20:46:41.476773136 -0400
624@@ -17,7 +17,7 @@ 624@@ -17,7 +17,7 @@
625 #include <linux/swiotlb.h> 625 #include <linux/swiotlb.h>
626 #include <asm/machvec.h> 626 #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
639 { 639 {
640 if (use_swiotlb(dev)) 640 if (use_swiotlb(dev))
641 return &swiotlb_dma_ops; 641 return &swiotlb_dma_ops;
642diff -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 642diff -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
643--- linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400 643--- linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c 2010-03-15 11:52:04.000000000 -0400
644+++ linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400 644+++ linux-2.6.32.12/arch/ia64/hp/common/sba_iommu.c 2010-04-04 20:46:41.476773136 -0400
645@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d 645@@ -2077,7 +2077,7 @@ static struct acpi_driver acpi_sba_ioc_d
646 }, 646 },
647 }; 647 };
@@ -660,9 +660,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/hp/common/sba_iommu.c linux-2.6.32.11/arch/
660 .alloc_coherent = sba_alloc_coherent, 660 .alloc_coherent = sba_alloc_coherent,
661 .free_coherent = sba_free_coherent, 661 .free_coherent = sba_free_coherent,
662 .map_page = sba_map_page, 662 .map_page = sba_map_page,
663diff -urNp linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 663diff -urNp linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c
664--- linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400 664--- linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c 2010-03-15 11:52:04.000000000 -0400
665+++ linux-2.6.32.11/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -0400 665+++ linux-2.6.32.12/arch/ia64/ia32/binfmt_elf32.c 2010-04-04 20:46:41.476773136 -0400
666@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ 666@@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_
667 667
668 #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) 668 #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
677 /* Ugly but avoids duplication */ 677 /* Ugly but avoids duplication */
678 #include "../../../fs/binfmt_elf.c" 678 #include "../../../fs/binfmt_elf.c"
679 679
680diff -urNp linux-2.6.32.11/arch/ia64/ia32/ia32priv.h linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 680diff -urNp linux-2.6.32.12/arch/ia64/ia32/ia32priv.h linux-2.6.32.12/arch/ia64/ia32/ia32priv.h
681--- linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400 681--- linux-2.6.32.12/arch/ia64/ia32/ia32priv.h 2010-03-15 11:52:04.000000000 -0400
682+++ linux-2.6.32.11/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400 682+++ linux-2.6.32.12/arch/ia64/ia32/ia32priv.h 2010-04-04 20:46:41.476773136 -0400
683@@ -296,7 +296,14 @@ typedef struct compat_siginfo { 683@@ -296,7 +296,14 @@ typedef struct compat_siginfo {
684 #define ELF_DATA ELFDATA2LSB 684 #define ELF_DATA ELFDATA2LSB
685 #define ELF_ARCH EM_386 685 #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
696 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET 696 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET
697 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE 697 #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE
698 698
699diff -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 699diff -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
700--- linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 700--- linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
701+++ linux-2.6.32.11/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400 701+++ linux-2.6.32.12/arch/ia64/include/asm/dma-mapping.h 2010-04-04 20:46:41.476773136 -0400
702@@ -12,7 +12,7 @@ 702@@ -12,7 +12,7 @@
703 703
704 #define ARCH_HAS_DMA_GET_REQUIRED_MASK 704 #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
742 return ops->dma_supported(dev, mask); 742 return ops->dma_supported(dev, mask);
743 } 743 }
744 744
745diff -urNp linux-2.6.32.11/arch/ia64/include/asm/elf.h linux-2.6.32.11/arch/ia64/include/asm/elf.h 745diff -urNp linux-2.6.32.12/arch/ia64/include/asm/elf.h linux-2.6.32.12/arch/ia64/include/asm/elf.h
746--- linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 746--- linux-2.6.32.12/arch/ia64/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
747+++ linux-2.6.32.11/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400 747+++ linux-2.6.32.12/arch/ia64/include/asm/elf.h 2010-04-04 20:46:41.476773136 -0400
748@@ -43,6 +43,13 @@ 748@@ -43,6 +43,13 @@
749 */ 749 */
750 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) 750 #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
759 #define PT_IA_64_UNWIND 0x70000001 759 #define PT_IA_64_UNWIND 0x70000001
760 760
761 /* IA-64 relocations: */ 761 /* IA-64 relocations: */
762diff -urNp linux-2.6.32.11/arch/ia64/include/asm/machvec.h linux-2.6.32.11/arch/ia64/include/asm/machvec.h 762diff -urNp linux-2.6.32.12/arch/ia64/include/asm/machvec.h linux-2.6.32.12/arch/ia64/include/asm/machvec.h
763--- linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400 763--- linux-2.6.32.12/arch/ia64/include/asm/machvec.h 2010-03-15 11:52:04.000000000 -0400
764+++ linux-2.6.32.11/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400 764+++ linux-2.6.32.12/arch/ia64/include/asm/machvec.h 2010-04-04 20:46:41.476773136 -0400
765@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event 765@@ -45,7 +45,7 @@ typedef void ia64_mv_kernel_launch_event
766 /* DMA-mapping interface: */ 766 /* DMA-mapping interface: */
767 typedef void ia64_mv_dma_init (void); 767 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/
780 780
781 /* 781 /*
782 * Define default versions so we can extend machvec for new platforms without having 782 * Define default versions so we can extend machvec for new platforms without having
783diff -urNp linux-2.6.32.11/arch/ia64/include/asm/pgtable.h linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 783diff -urNp linux-2.6.32.12/arch/ia64/include/asm/pgtable.h linux-2.6.32.12/arch/ia64/include/asm/pgtable.h
784--- linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 784--- linux-2.6.32.12/arch/ia64/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
785+++ linux-2.6.32.11/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400 785+++ linux-2.6.32.12/arch/ia64/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
786@@ -143,6 +143,17 @@ 786@@ -143,6 +143,17 @@
787 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) 787 #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R)
788 #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) 788 #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/
801 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) 801 #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX)
802 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) 802 #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX)
803 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) 803 #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX)
804diff -urNp linux-2.6.32.11/arch/ia64/include/asm/uaccess.h linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 804diff -urNp linux-2.6.32.12/arch/ia64/include/asm/uaccess.h linux-2.6.32.12/arch/ia64/include/asm/uaccess.h
805--- linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 805--- linux-2.6.32.12/arch/ia64/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
806+++ linux-2.6.32.11/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400 806+++ linux-2.6.32.12/arch/ia64/include/asm/uaccess.h 2010-04-04 20:46:41.480470677 -0400
807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ 807@@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
808 const void *__cu_from = (from); \ 808 const void *__cu_from = (from); \
809 long __cu_len = (n); \ 809 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/
822 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ 822 __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \
823 __cu_len; \ 823 __cu_len; \
824 }) 824 })
825diff -urNp linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 825diff -urNp linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c
826--- linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400 826--- linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c 2010-03-15 11:52:04.000000000 -0400
827+++ linux-2.6.32.11/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400 827+++ linux-2.6.32.12/arch/ia64/kernel/dma-mapping.c 2010-04-04 20:46:41.480470677 -0400
828@@ -3,7 +3,7 @@ 828@@ -3,7 +3,7 @@
829 /* Set this to 1 if there is a HW IOMMU in the system */ 829 /* Set this to 1 if there is a HW IOMMU in the system */
830 int iommu_detected __read_mostly; 830 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
843 { 843 {
844 return dma_ops; 844 return dma_ops;
845 } 845 }
846diff -urNp linux-2.6.32.11/arch/ia64/kernel/module.c linux-2.6.32.11/arch/ia64/kernel/module.c 846diff -urNp linux-2.6.32.12/arch/ia64/kernel/module.c linux-2.6.32.12/arch/ia64/kernel/module.c
847--- linux-2.6.32.11/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 847--- linux-2.6.32.12/arch/ia64/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
848+++ linux-2.6.32.11/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400 848+++ linux-2.6.32.12/arch/ia64/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
849@@ -315,8 +315,7 @@ module_alloc (unsigned long size) 849@@ -315,8 +315,7 @@ module_alloc (unsigned long size)
850 void 850 void
851 module_free (struct module *mod, void *module_region) 851 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
934 mod->arch.gp = gp; 934 mod->arch.gp = gp;
935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); 935 DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
936 } 936 }
937diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 937diff -urNp linux-2.6.32.12/arch/ia64/kernel/pci-dma.c linux-2.6.32.12/arch/ia64/kernel/pci-dma.c
938--- linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 938--- linux-2.6.32.12/arch/ia64/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
939+++ linux-2.6.32.11/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400 939+++ linux-2.6.32.12/arch/ia64/kernel/pci-dma.c 2010-04-04 20:46:41.480470677 -0400
940@@ -43,7 +43,7 @@ struct device fallback_dev = { 940@@ -43,7 +43,7 @@ struct device fallback_dev = {
941 .dma_mask = &fallback_dev.coherent_dma_mask, 941 .dma_mask = &fallback_dev.coherent_dma_mask,
942 }; 942 };
@@ -946,9 +946,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-dma.c linux-2.6.32.11/arch/ia64/
946 946
947 static int __init pci_iommu_init(void) 947 static int __init pci_iommu_init(void)
948 { 948 {
949diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 949diff -urNp linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c
950--- linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 950--- linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
951+++ linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400 951+++ linux-2.6.32.12/arch/ia64/kernel/pci-swiotlb.c 2010-04-04 20:46:41.480470677 -0400
952@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent 952@@ -21,7 +21,7 @@ static void *ia64_swiotlb_alloc_coherent
953 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp); 953 return swiotlb_alloc_coherent(dev, size, dma_handle, gfp);
954 } 954 }
@@ -958,9 +958,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/pci-swiotlb.c linux-2.6.32.11/arch/i
958 .alloc_coherent = ia64_swiotlb_alloc_coherent, 958 .alloc_coherent = ia64_swiotlb_alloc_coherent,
959 .free_coherent = swiotlb_free_coherent, 959 .free_coherent = swiotlb_free_coherent,
960 .map_page = swiotlb_map_page, 960 .map_page = swiotlb_map_page,
961diff -urNp linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 961diff -urNp linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c
962--- linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400 962--- linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c 2010-03-15 11:52:04.000000000 -0400
963+++ linux-2.6.32.11/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400 963+++ linux-2.6.32.12/arch/ia64/kernel/sys_ia64.c 2010-04-04 20:46:41.480470677 -0400
964@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil 964@@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
965 if (REGION_NUMBER(addr) == RGN_HPAGE) 965 if (REGION_NUMBER(addr) == RGN_HPAGE)
966 addr = 0; 966 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
987 goto full_search; 987 goto full_search;
988 } 988 }
989 return -ENOMEM; 989 return -ENOMEM;
990diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64/kernel/topology.c 990diff -urNp linux-2.6.32.12/arch/ia64/kernel/topology.c linux-2.6.32.12/arch/ia64/kernel/topology.c
991--- linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400 991--- linux-2.6.32.12/arch/ia64/kernel/topology.c 2010-03-15 11:52:04.000000000 -0400
992+++ linux-2.6.32.11/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400 992+++ linux-2.6.32.12/arch/ia64/kernel/topology.c 2010-04-04 20:46:41.480470677 -0400
993@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject 993@@ -282,7 +282,7 @@ static ssize_t cache_show(struct kobject
994 return ret; 994 return ret;
995 } 995 }
@@ -999,9 +999,9 @@ diff -urNp linux-2.6.32.11/arch/ia64/kernel/topology.c linux-2.6.32.11/arch/ia64
999 .show = cache_show 999 .show = cache_show
1000 }; 1000 };
1001 1001
1002diff -urNp linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 1002diff -urNp linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S
1003--- linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 1003--- linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
1004+++ linux-2.6.32.11/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400 1004+++ linux-2.6.32.12/arch/ia64/kernel/vmlinux.lds.S 2010-04-04 20:46:41.480470677 -0400
1005@@ -190,7 +190,7 @@ SECTIONS 1005@@ -190,7 +190,7 @@ SECTIONS
1006 /* Per-cpu data: */ 1006 /* Per-cpu data: */
1007 . = ALIGN(PERCPU_PAGE_SIZE); 1007 . = 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
1011 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits 1011 . = __phys_per_cpu_start + PERCPU_PAGE_SIZE; /* ensure percpu data fits
1012 * into percpu page size 1012 * into percpu page size
1013 */ 1013 */
1014diff -urNp linux-2.6.32.11/arch/ia64/mm/fault.c linux-2.6.32.11/arch/ia64/mm/fault.c 1014diff -urNp linux-2.6.32.12/arch/ia64/mm/fault.c linux-2.6.32.12/arch/ia64/mm/fault.c
1015--- linux-2.6.32.11/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1015--- linux-2.6.32.12/arch/ia64/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1016+++ linux-2.6.32.11/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 1016+++ linux-2.6.32.12/arch/ia64/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
1017@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned 1017@@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned
1018 return pte_present(pte); 1018 return pte_present(pte);
1019 } 1019 }
@@ -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
1063 survive: 1063 survive:
1064 /* 1064 /*
1065 * If for any reason at all we couldn't handle the fault, make 1065 * If for any reason at all we couldn't handle the fault, make
1066diff -urNp linux-2.6.32.11/arch/ia64/mm/init.c linux-2.6.32.11/arch/ia64/mm/init.c 1066diff -urNp linux-2.6.32.12/arch/ia64/mm/init.c linux-2.6.32.12/arch/ia64/mm/init.c
1067--- linux-2.6.32.11/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400 1067--- linux-2.6.32.12/arch/ia64/mm/init.c 2010-03-15 11:52:04.000000000 -0400
1068+++ linux-2.6.32.11/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -0400 1068+++ linux-2.6.32.12/arch/ia64/mm/init.c 2010-04-04 20:46:41.480470677 -0400
1069@@ -122,6 +122,19 @@ ia64_init_addr_space (void) 1069@@ -122,6 +122,19 @@ ia64_init_addr_space (void)
1070 vma->vm_start = current->thread.rbs_bot & PAGE_MASK; 1070 vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
1071 vma->vm_end = vma->vm_start + PAGE_SIZE; 1071 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
1086 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 1086 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
1087 down_write(&current->mm->mmap_sem); 1087 down_write(&current->mm->mmap_sem);
1088 if (insert_vm_struct(current->mm, vma)) { 1088 if (insert_vm_struct(current->mm, vma)) {
1089diff -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 1089diff -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
1090--- linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400 1090--- linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c 2010-03-15 11:52:04.000000000 -0400
1091+++ linux-2.6.32.11/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400 1091+++ linux-2.6.32.12/arch/ia64/sn/pci/pci_dma.c 2010-04-04 20:46:41.480470677 -0400
1092@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus * 1092@@ -464,7 +464,7 @@ int sn_pci_legacy_write(struct pci_bus *
1093 return ret; 1093 return ret;
1094 } 1094 }
@@ -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/
1098 .alloc_coherent = sn_dma_alloc_coherent, 1098 .alloc_coherent = sn_dma_alloc_coherent,
1099 .free_coherent = sn_dma_free_coherent, 1099 .free_coherent = sn_dma_free_coherent,
1100 .map_page = sn_dma_map_page, 1100 .map_page = sn_dma_map_page,
1101diff -urNp linux-2.6.32.11/arch/m32r/lib/usercopy.c linux-2.6.32.11/arch/m32r/lib/usercopy.c 1101diff -urNp linux-2.6.32.12/arch/m32r/lib/usercopy.c linux-2.6.32.12/arch/m32r/lib/usercopy.c
1102--- linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400 1102--- linux-2.6.32.12/arch/m32r/lib/usercopy.c 2010-03-15 11:52:04.000000000 -0400
1103+++ linux-2.6.32.11/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400 1103+++ linux-2.6.32.12/arch/m32r/lib/usercopy.c 2010-04-04 20:46:41.480470677 -0400
1104@@ -14,6 +14,9 @@ 1104@@ -14,6 +14,9 @@
1105 unsigned long 1105 unsigned long
1106 __generic_copy_to_user(void __user *to, const void *from, unsigned long n) 1106 __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
1121 prefetchw(to); 1121 prefetchw(to);
1122 if (access_ok(VERIFY_READ, from, n)) 1122 if (access_ok(VERIFY_READ, from, n))
1123 __copy_user_zeroing(to,from,n); 1123 __copy_user_zeroing(to,from,n);
1124diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 1124diff -urNp linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c
1125--- linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400 1125--- linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c 2010-03-15 11:52:04.000000000 -0400
1126+++ linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400 1126+++ linux-2.6.32.12/arch/mips/alchemy/devboards/pm.c 2010-04-04 20:46:41.480470677 -0400
1127@@ -78,7 +78,7 @@ static void db1x_pm_end(void) 1127@@ -78,7 +78,7 @@ static void db1x_pm_end(void)
1128 1128
1129 } 1129 }
@@ -1133,9 +1133,9 @@ diff -urNp linux-2.6.32.11/arch/mips/alchemy/devboards/pm.c linux-2.6.32.11/arch
1133 .valid = suspend_valid_only_mem, 1133 .valid = suspend_valid_only_mem,
1134 .begin = db1x_pm_begin, 1134 .begin = db1x_pm_begin,
1135 .enter = db1x_pm_enter, 1135 .enter = db1x_pm_enter,
1136diff -urNp linux-2.6.32.11/arch/mips/include/asm/elf.h linux-2.6.32.11/arch/mips/include/asm/elf.h 1136diff -urNp linux-2.6.32.12/arch/mips/include/asm/elf.h linux-2.6.32.12/arch/mips/include/asm/elf.h
1137--- linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1137--- linux-2.6.32.12/arch/mips/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1138+++ linux-2.6.32.11/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400 1138+++ linux-2.6.32.12/arch/mips/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
1139@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str 1139@@ -368,4 +368,11 @@ extern int dump_task_fpu(struct task_str
1140 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) 1140 #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2)
1141 #endif 1141 #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
1148+#endif 1148+#endif
1149+ 1149+
1150 #endif /* _ASM_ELF_H */ 1150 #endif /* _ASM_ELF_H */
1151diff -urNp linux-2.6.32.11/arch/mips/include/asm/page.h linux-2.6.32.11/arch/mips/include/asm/page.h 1151diff -urNp linux-2.6.32.12/arch/mips/include/asm/page.h linux-2.6.32.12/arch/mips/include/asm/page.h
1152--- linux-2.6.32.11/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1152--- linux-2.6.32.12/arch/mips/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1153+++ linux-2.6.32.11/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -0400 1153+++ linux-2.6.32.12/arch/mips/include/asm/page.h 2010-04-04 20:46:41.480470677 -0400
1154@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa 1154@@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
1155 #ifdef CONFIG_CPU_MIPS32 1155 #ifdef CONFIG_CPU_MIPS32
1156 typedef struct { unsigned long pte_low, pte_high; } pte_t; 1156 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
1160 #else 1160 #else
1161 typedef struct { unsigned long long pte; } pte_t; 1161 typedef struct { unsigned long long pte; } pte_t;
1162 #define pte_val(x) ((x).pte) 1162 #define pte_val(x) ((x).pte)
1163diff -urNp linux-2.6.32.11/arch/mips/include/asm/system.h linux-2.6.32.11/arch/mips/include/asm/system.h 1163diff -urNp linux-2.6.32.12/arch/mips/include/asm/system.h linux-2.6.32.12/arch/mips/include/asm/system.h
1164--- linux-2.6.32.11/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 1164--- linux-2.6.32.12/arch/mips/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
1165+++ linux-2.6.32.11/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400 1165+++ linux-2.6.32.12/arch/mips/include/asm/system.h 2010-04-04 20:46:41.480470677 -0400
1166@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void); 1166@@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
1167 */ 1167 */
1168 #define __ARCH_WANT_UNLOCKED_CTXSW 1168 #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
1171+#define arch_align_stack(x) ((x) & ALMASK) 1171+#define arch_align_stack(x) ((x) & ALMASK)
1172 1172
1173 #endif /* _ASM_SYSTEM_H */ 1173 #endif /* _ASM_SYSTEM_H */
1174diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 1174diff -urNp linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c
1175--- linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400 1175--- linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c 2010-03-15 11:52:04.000000000 -0400
1176+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -0400 1176+++ linux-2.6.32.12/arch/mips/kernel/binfmt_elfn32.c 2010-04-04 20:46:41.480470677 -0400
1177@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1177@@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1178 #undef ELF_ET_DYN_BASE 1178 #undef ELF_ET_DYN_BASE
1179 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1179 #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
1188 #include <asm/processor.h> 1188 #include <asm/processor.h>
1189 #include <linux/module.h> 1189 #include <linux/module.h>
1190 #include <linux/elfcore.h> 1190 #include <linux/elfcore.h>
1191diff -urNp linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 1191diff -urNp linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c
1192--- linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400 1192--- linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c 2010-03-15 11:52:04.000000000 -0400
1193+++ linux-2.6.32.11/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -0400 1193+++ linux-2.6.32.12/arch/mips/kernel/binfmt_elfo32.c 2010-04-04 20:46:41.480470677 -0400
1194@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N 1194@@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
1195 #undef ELF_ET_DYN_BASE 1195 #undef ELF_ET_DYN_BASE
1196 #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) 1196 #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
1205 #include <asm/processor.h> 1205 #include <asm/processor.h>
1206 1206
1207 /* 1207 /*
1208diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/kernel/kgdb.c 1208diff -urNp linux-2.6.32.12/arch/mips/kernel/kgdb.c linux-2.6.32.12/arch/mips/kernel/kgdb.c
1209--- linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 1209--- linux-2.6.32.12/arch/mips/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
1210+++ linux-2.6.32.11/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400 1210+++ linux-2.6.32.12/arch/mips/kernel/kgdb.c 2010-04-04 20:46:41.480470677 -0400
1211@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto 1211@@ -245,6 +245,7 @@ int kgdb_arch_handle_exception(int vecto
1212 return -1; 1212 return -1;
1213 } 1213 }
@@ -1216,9 +1216,9 @@ diff -urNp linux-2.6.32.11/arch/mips/kernel/kgdb.c linux-2.6.32.11/arch/mips/ker
1216 struct kgdb_arch arch_kgdb_ops; 1216 struct kgdb_arch arch_kgdb_ops;
1217 1217
1218 /* 1218 /*
1219diff -urNp linux-2.6.32.11/arch/mips/kernel/process.c linux-2.6.32.11/arch/mips/kernel/process.c 1219diff -urNp linux-2.6.32.12/arch/mips/kernel/process.c linux-2.6.32.12/arch/mips/kernel/process.c
1220--- linux-2.6.32.11/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 1220--- linux-2.6.32.12/arch/mips/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
1221+++ linux-2.6.32.11/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400 1221+++ linux-2.6.32.12/arch/mips/kernel/process.c 2010-04-04 20:46:41.480470677 -0400
1222@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru 1222@@ -470,15 +470,3 @@ unsigned long get_wchan(struct task_stru
1223 out: 1223 out:
1224 return pc; 1224 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/
1235- 1235-
1236- return sp & ALMASK; 1236- return sp & ALMASK;
1237-} 1237-}
1238diff -urNp linux-2.6.32.11/arch/mips/kernel/syscall.c linux-2.6.32.11/arch/mips/kernel/syscall.c 1238diff -urNp linux-2.6.32.12/arch/mips/kernel/syscall.c linux-2.6.32.12/arch/mips/kernel/syscall.c
1239--- linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400 1239--- linux-2.6.32.12/arch/mips/kernel/syscall.c 2010-03-15 11:52:04.000000000 -0400
1240+++ linux-2.6.32.11/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400 1240+++ linux-2.6.32.12/arch/mips/kernel/syscall.c 2010-04-04 20:46:41.480470677 -0400
1241@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str 1241@@ -102,6 +102,11 @@ unsigned long arch_get_unmapped_area(str
1242 do_color_align = 0; 1242 do_color_align = 0;
1243 if (filp || (flags & MAP_SHARED)) 1243 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/
1259 if (do_color_align) 1259 if (do_color_align)
1260 addr = COLOUR_ALIGN(addr, pgoff); 1260 addr = COLOUR_ALIGN(addr, pgoff);
1261 else 1261 else
1262diff -urNp linux-2.6.32.11/arch/mips/mm/fault.c linux-2.6.32.11/arch/mips/mm/fault.c 1262diff -urNp linux-2.6.32.12/arch/mips/mm/fault.c linux-2.6.32.12/arch/mips/mm/fault.c
1263--- linux-2.6.32.11/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1263--- linux-2.6.32.12/arch/mips/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1264+++ linux-2.6.32.11/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 1264+++ linux-2.6.32.12/arch/mips/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
1265@@ -26,6 +26,23 @@ 1265@@ -26,6 +26,23 @@
1266 #include <asm/ptrace.h> 1266 #include <asm/ptrace.h>
1267 #include <asm/highmem.h> /* For VMALLOC_END */ 1267 #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
1286 /* 1286 /*
1287 * This routine handles page faults. It determines the address, 1287 * This routine handles page faults. It determines the address,
1288 * and the problem, and then passes it off to one of the appropriate 1288 * and the problem, and then passes it off to one of the appropriate
1289diff -urNp linux-2.6.32.11/arch/parisc/include/asm/elf.h linux-2.6.32.11/arch/parisc/include/asm/elf.h 1289diff -urNp linux-2.6.32.12/arch/parisc/include/asm/elf.h linux-2.6.32.12/arch/parisc/include/asm/elf.h
1290--- linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1290--- linux-2.6.32.12/arch/parisc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1291+++ linux-2.6.32.11/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400 1291+++ linux-2.6.32.12/arch/parisc/include/asm/elf.h 2010-04-04 20:46:41.480470677 -0400
1292@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. 1292@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration..
1293 1293
1294 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) 1294 #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
1303 /* This yields a mask that user programs can use to figure out what 1303 /* This yields a mask that user programs can use to figure out what
1304 instruction set this CPU supports. This could be done in user space, 1304 instruction set this CPU supports. This could be done in user space,
1305 but it's not easy, and we've already done it here. */ 1305 but it's not easy, and we've already done it here. */
1306diff -urNp linux-2.6.32.11/arch/parisc/include/asm/pgtable.h linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 1306diff -urNp linux-2.6.32.12/arch/parisc/include/asm/pgtable.h linux-2.6.32.12/arch/parisc/include/asm/pgtable.h
1307--- linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 1307--- linux-2.6.32.12/arch/parisc/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
1308+++ linux-2.6.32.11/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400 1308+++ linux-2.6.32.12/arch/parisc/include/asm/pgtable.h 2010-04-04 20:46:41.480470677 -0400
1309@@ -207,6 +207,17 @@ 1309@@ -207,6 +207,17 @@
1310 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) 1310 #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
1311 #define PAGE_COPY PAGE_EXECREAD 1311 #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
1324 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) 1324 #define PAGE_KERNEL __pgprot(_PAGE_KERNEL)
1325 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) 1325 #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE)
1326 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) 1326 #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE)
1327diff -urNp linux-2.6.32.11/arch/parisc/kernel/module.c linux-2.6.32.11/arch/parisc/kernel/module.c 1327diff -urNp linux-2.6.32.12/arch/parisc/kernel/module.c linux-2.6.32.12/arch/parisc/kernel/module.c
1328--- linux-2.6.32.11/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 1328--- linux-2.6.32.12/arch/parisc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
1329+++ linux-2.6.32.11/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400 1329+++ linux-2.6.32.12/arch/parisc/kernel/module.c 2010-04-04 20:46:41.480470677 -0400
1330@@ -95,16 +95,38 @@ 1330@@ -95,16 +95,38 @@
1331 1331
1332 /* three functions to determine where in the module core 1332 /* 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
1427 1427
1428 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", 1428 DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n",
1429 me->arch.unwind_section, table, end, gp); 1429 me->arch.unwind_section, table, end, gp);
1430diff -urNp linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 1430diff -urNp linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c
1431--- linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400 1431--- linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c 2010-03-15 11:52:04.000000000 -0400
1432+++ linux-2.6.32.11/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400 1432+++ linux-2.6.32.12/arch/parisc/kernel/sys_parisc.c 2010-04-04 20:46:41.480470677 -0400
1433@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str 1433@@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str
1434 if (flags & MAP_FIXED) 1434 if (flags & MAP_FIXED)
1435 return addr; 1435 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/
1439 1439
1440 if (filp) { 1440 if (filp) {
1441 addr = get_shared_area(filp->f_mapping, addr, len, pgoff); 1441 addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
1442diff -urNp linux-2.6.32.11/arch/parisc/kernel/traps.c linux-2.6.32.11/arch/parisc/kernel/traps.c 1442diff -urNp linux-2.6.32.12/arch/parisc/kernel/traps.c linux-2.6.32.12/arch/parisc/kernel/traps.c
1443--- linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 1443--- linux-2.6.32.12/arch/parisc/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
1444+++ linux-2.6.32.11/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400 1444+++ linux-2.6.32.12/arch/parisc/kernel/traps.c 2010-04-04 20:46:41.480470677 -0400
1445@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod 1445@@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
1446 1446
1447 down_read(&current->mm->mmap_sem); 1447 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
1453 fault_address = regs->iaoq[0]; 1453 fault_address = regs->iaoq[0];
1454 fault_space = regs->iasq[0]; 1454 fault_space = regs->iasq[0];
1455 1455
1456diff -urNp linux-2.6.32.11/arch/parisc/mm/fault.c linux-2.6.32.11/arch/parisc/mm/fault.c 1456diff -urNp linux-2.6.32.12/arch/parisc/mm/fault.c linux-2.6.32.12/arch/parisc/mm/fault.c
1457--- linux-2.6.32.11/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 1457--- linux-2.6.32.12/arch/parisc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
1458+++ linux-2.6.32.11/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400 1458+++ linux-2.6.32.12/arch/parisc/mm/fault.c 2010-04-04 20:46:41.480470677 -0400
1459@@ -15,6 +15,7 @@ 1459@@ -15,6 +15,7 @@
1460 #include <linux/sched.h> 1460 #include <linux/sched.h>
1461 #include <linux/interrupt.h> 1461 #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
1625 1625
1626 /* 1626 /*
1627 * If for any reason at all we couldn't handle the fault, make 1627 * If for any reason at all we couldn't handle the fault, make
1628diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arch/powerpc/include/asm/device.h 1628diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/device.h linux-2.6.32.12/arch/powerpc/include/asm/device.h
1629--- linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 1629--- linux-2.6.32.12/arch/powerpc/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
1630+++ linux-2.6.32.11/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400 1630+++ linux-2.6.32.12/arch/powerpc/include/asm/device.h 2010-04-04 20:46:41.485273950 -0400
1631@@ -14,7 +14,7 @@ struct dev_archdata { 1631@@ -14,7 +14,7 @@ struct dev_archdata {
1632 struct device_node *of_node; 1632 struct device_node *of_node;
1633 1633
@@ -1637,9 +1637,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/device.h linux-2.6.32.11/arc
1637 1637
1638 /* 1638 /*
1639 * When an iommu is in use, dma_data is used as a ptr to the base of the 1639 * When an iommu is in use, dma_data is used as a ptr to the base of the
1640diff -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 1640diff -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
1641--- linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 1641--- linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
1642+++ linux-2.6.32.11/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400 1642+++ linux-2.6.32.12/arch/powerpc/include/asm/dma-mapping.h 2010-04-04 20:46:41.485273950 -0400
1643@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma 1643@@ -69,9 +69,9 @@ static inline unsigned long device_to_ma
1644 #ifdef CONFIG_PPC64 1644 #ifdef CONFIG_PPC64
1645 extern struct dma_map_ops dma_iommu_ops; 1645 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
1706 1706
1707 if (dma_ops->mapping_error) 1707 if (dma_ops->mapping_error)
1708 return dma_ops->mapping_error(dev, dma_addr); 1708 return dma_ops->mapping_error(dev, dma_addr);
1709diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/elf.h linux-2.6.32.11/arch/powerpc/include/asm/elf.h 1709diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/elf.h linux-2.6.32.12/arch/powerpc/include/asm/elf.h
1710--- linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 1710--- linux-2.6.32.12/arch/powerpc/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
1711+++ linux-2.6.32.11/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -0400 1711+++ linux-2.6.32.12/arch/powerpc/include/asm/elf.h 2010-04-04 20:46:41.485273950 -0400
1712@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E 1712@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
1713 the loader. We need to make sure that it is out of the way of the program 1713 the loader. We need to make sure that it is out of the way of the program
1714 that it will "exec", and that there is sufficient room for the brk. */ 1714 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
1741 #endif /* __KERNEL__ */ 1741 #endif /* __KERNEL__ */
1742 1742
1743 /* 1743 /*
1744diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/iommu.h linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 1744diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/iommu.h linux-2.6.32.12/arch/powerpc/include/asm/iommu.h
1745--- linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 1745--- linux-2.6.32.12/arch/powerpc/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
1746+++ linux-2.6.32.11/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -0400 1746+++ linux-2.6.32.12/arch/powerpc/include/asm/iommu.h 2010-04-04 20:46:41.485273950 -0400
1747@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi 1747@@ -116,6 +116,9 @@ extern void iommu_init_early_iSeries(voi
1748 extern void iommu_init_early_dart(void); 1748 extern void iommu_init_early_dart(void);
1749 extern void iommu_init_early_pasemi(void); 1749 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
1754 #ifdef CONFIG_PCI 1754 #ifdef CONFIG_PCI
1755 extern void pci_iommu_init(void); 1755 extern void pci_iommu_init(void);
1756 extern void pci_direct_iommu_init(void); 1756 extern void pci_direct_iommu_init(void);
1757diff -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 1757diff -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
1758--- linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 1758--- linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
1759+++ linux-2.6.32.11/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400 1759+++ linux-2.6.32.12/arch/powerpc/include/asm/kmap_types.h 2010-04-04 20:46:41.485273950 -0400
1760@@ -26,6 +26,7 @@ enum km_type { 1760@@ -26,6 +26,7 @@ enum km_type {
1761 KM_SOFTIRQ1, 1761 KM_SOFTIRQ1,
1762 KM_PPC_SYNC_PAGE, 1762 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
1765 KM_TYPE_NR 1765 KM_TYPE_NR
1766 }; 1766 };
1767 1767
1768diff -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 1768diff -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
1769--- linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400 1769--- linux-2.6.32.12/arch/powerpc/include/asm/page_64.h 2010-03-15 11:52:04.000000000 -0400
1770+++ linux-2.6.32.11/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -0400 1770+++ linux-2.6.32.12/arch/powerpc/include/asm/page_64.h 2010-04-04 20:46:41.485273950 -0400
1771@@ -180,15 +180,18 @@ do { \ 1771@@ -180,15 +180,18 @@ do { \
1772 * stack by default, so in the absense of a PT_GNU_STACK program header 1772 * stack by default, so in the absense of a PT_GNU_STACK program header
1773 * we turn execute permission off. 1773 * 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
1789 1789
1790 #include <asm-generic/getorder.h> 1790 #include <asm-generic/getorder.h>
1791 1791
1792diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/page.h linux-2.6.32.11/arch/powerpc/include/asm/page.h 1792diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/page.h linux-2.6.32.12/arch/powerpc/include/asm/page.h
1793--- linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 1793--- linux-2.6.32.12/arch/powerpc/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
1794+++ linux-2.6.32.11/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -0400 1794+++ linux-2.6.32.12/arch/powerpc/include/asm/page.h 2010-04-04 20:46:41.485273950 -0400
1795@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; 1795@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr;
1796 * and needs to be executable. This means the whole heap ends 1796 * and needs to be executable. This means the whole heap ends
1797 * up being executable. 1797 * 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/
1814 #ifndef __ASSEMBLY__ 1814 #ifndef __ASSEMBLY__
1815 1815
1816 #undef STRICT_MM_TYPECHECKS 1816 #undef STRICT_MM_TYPECHECKS
1817diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/powerpc/include/asm/pci.h 1817diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/pci.h linux-2.6.32.12/arch/powerpc/include/asm/pci.h
1818--- linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400 1818--- linux-2.6.32.12/arch/powerpc/include/asm/pci.h 2010-03-15 11:52:04.000000000 -0400
1819+++ linux-2.6.32.11/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400 1819+++ linux-2.6.32.12/arch/powerpc/include/asm/pci.h 2010-04-04 20:46:41.485273950 -0400
1820@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq 1820@@ -65,8 +65,8 @@ static inline int pci_get_legacy_ide_irq
1821 } 1821 }
1822 1822
@@ -1828,9 +1828,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/pci.h linux-2.6.32.11/arch/p
1828 #else /* CONFIG_PCI */ 1828 #else /* CONFIG_PCI */
1829 #define set_pci_dma_ops(d) 1829 #define set_pci_dma_ops(d)
1830 #define get_pci_dma_ops() NULL 1830 #define get_pci_dma_ops() NULL
1831diff -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 1831diff -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
1832--- linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400 1832--- linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h 2010-03-15 11:52:04.000000000 -0400
1833+++ linux-2.6.32.11/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400 1833+++ linux-2.6.32.12/arch/powerpc/include/asm/pte-hash32.h 2010-04-04 20:46:41.485273950 -0400
1834@@ -21,6 +21,7 @@ 1834@@ -21,6 +21,7 @@
1835 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */ 1835 #define _PAGE_FILE 0x004 /* when !present: nonlinear file mapping */
1836 #define _PAGE_USER 0x004 /* usermode access allowed */ 1836 #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
1839 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */ 1839 #define _PAGE_COHERENT 0x010 /* M: enforce memory coherence (SMP systems) */
1840 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */ 1840 #define _PAGE_NO_CACHE 0x020 /* I: cache inhibit */
1841 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */ 1841 #define _PAGE_WRITETHRU 0x040 /* W: cache write-through */
1842diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/reg.h linux-2.6.32.11/arch/powerpc/include/asm/reg.h 1842diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/reg.h linux-2.6.32.12/arch/powerpc/include/asm/reg.h
1843--- linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400 1843--- linux-2.6.32.12/arch/powerpc/include/asm/reg.h 2010-03-15 11:52:04.000000000 -0400
1844+++ linux-2.6.32.11/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400 1844+++ linux-2.6.32.12/arch/powerpc/include/asm/reg.h 2010-04-04 20:46:41.485273950 -0400
1845@@ -191,6 +191,7 @@ 1845@@ -191,6 +191,7 @@
1846 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */ 1846 #define SPRN_DBCR 0x136 /* e300 Data Breakpoint Control Reg */
1847 #define SPRN_DSISR 0x012 /* Data Storage Interrupt Status Register */ 1847 #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
1850 #define DSISR_PROTFAULT 0x08000000 /* protection fault */ 1850 #define DSISR_PROTFAULT 0x08000000 /* protection fault */
1851 #define DSISR_ISSTORE 0x02000000 /* access was a store */ 1851 #define DSISR_ISSTORE 0x02000000 /* access was a store */
1852 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */ 1852 #define DSISR_DABRMATCH 0x00400000 /* hit data breakpoint */
1853diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 1853diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h
1854--- linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400 1854--- linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h 2010-03-15 11:52:04.000000000 -0400
1855+++ linux-2.6.32.11/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400 1855+++ linux-2.6.32.12/arch/powerpc/include/asm/swiotlb.h 2010-04-04 20:46:41.485273950 -0400
1856@@ -13,7 +13,7 @@ 1856@@ -13,7 +13,7 @@
1857 1857
1858 #include <linux/swiotlb.h> 1858 #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
1862 1862
1863 static inline void dma_mark_clean(void *addr, size_t size) {} 1863 static inline void dma_mark_clean(void *addr, size_t size) {}
1864 1864
1865diff -urNp linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 1865diff -urNp linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h
1866--- linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 1866--- linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
1867+++ linux-2.6.32.11/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400 1867+++ linux-2.6.32.12/arch/powerpc/include/asm/uaccess.h 2010-04-04 20:46:41.485273950 -0400
1868@@ -327,52 +327,6 @@ do { \ 1868@@ -327,52 +327,6 @@ do { \
1869 extern unsigned long __copy_tofrom_user(void __user *to, 1869 extern unsigned long __copy_tofrom_user(void __user *to,
1870 const void __user *from, unsigned long size); 1870 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
2033 extern unsigned long __clear_user(void __user *addr, unsigned long size); 2033 extern unsigned long __clear_user(void __user *addr, unsigned long size);
2034 2034
2035 static inline unsigned long clear_user(void __user *addr, unsigned long size) 2035 static inline unsigned long clear_user(void __user *addr, unsigned long size)
2036diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2036diff -urNp linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c
2037--- linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 2037--- linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c 2010-03-15 11:52:04.000000000 -0400
2038+++ linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400 2038+++ linux-2.6.32.12/arch/powerpc/kernel/cacheinfo.c 2010-04-04 20:46:41.485273950 -0400
2039@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde 2039@@ -642,7 +642,7 @@ static struct kobj_attribute *cache_inde
2040 &cache_assoc_attr, 2040 &cache_assoc_attr,
2041 }; 2041 };
@@ -2045,9 +2045,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/cacheinfo.c linux-2.6.32.11/arch/
2045 .show = cache_index_show, 2045 .show = cache_index_show,
2046 }; 2046 };
2047 2047
2048diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerpc/kernel/dma.c 2048diff -urNp linux-2.6.32.12/arch/powerpc/kernel/dma.c linux-2.6.32.12/arch/powerpc/kernel/dma.c
2049--- linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400 2049--- linux-2.6.32.12/arch/powerpc/kernel/dma.c 2010-03-15 11:52:04.000000000 -0400
2050+++ linux-2.6.32.11/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400 2050+++ linux-2.6.32.12/arch/powerpc/kernel/dma.c 2010-04-04 20:46:41.485273950 -0400
2051@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl 2051@@ -134,7 +134,7 @@ static inline void dma_direct_sync_singl
2052 } 2052 }
2053 #endif 2053 #endif
@@ -2057,9 +2057,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma.c linux-2.6.32.11/arch/powerp
2057 .alloc_coherent = dma_direct_alloc_coherent, 2057 .alloc_coherent = dma_direct_alloc_coherent,
2058 .free_coherent = dma_direct_free_coherent, 2058 .free_coherent = dma_direct_free_coherent,
2059 .map_sg = dma_direct_map_sg, 2059 .map_sg = dma_direct_map_sg,
2060diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2060diff -urNp linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c
2061--- linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400 2061--- linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c 2010-03-15 11:52:04.000000000 -0400
2062+++ linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400 2062+++ linux-2.6.32.12/arch/powerpc/kernel/dma-iommu.c 2010-04-04 20:46:41.485273950 -0400
2063@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de 2063@@ -70,7 +70,7 @@ static void dma_iommu_unmap_sg(struct de
2064 } 2064 }
2065 2065
@@ -2069,9 +2069,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-iommu.c linux-2.6.32.11/arch/
2069 { 2069 {
2070 struct iommu_table *tbl = get_iommu_table_base(dev); 2070 struct iommu_table *tbl = get_iommu_table_base(dev);
2071 2071
2072diff -urNp linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2072diff -urNp linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c
2073--- linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 2073--- linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
2074+++ linux-2.6.32.11/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400 2074+++ linux-2.6.32.12/arch/powerpc/kernel/dma-swiotlb.c 2010-04-04 20:46:41.485273950 -0400
2075@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable; 2075@@ -31,7 +31,7 @@ unsigned int ppc_swiotlb_enable;
2076 * map_page, and unmap_page on highmem, use normal dma_ops 2076 * map_page, and unmap_page on highmem, use normal dma_ops
2077 * for everything else. 2077 * 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
2081 .alloc_coherent = dma_direct_alloc_coherent, 2081 .alloc_coherent = dma_direct_alloc_coherent,
2082 .free_coherent = dma_direct_free_coherent, 2082 .free_coherent = dma_direct_free_coherent,
2083 .map_sg = swiotlb_map_sg_attrs, 2083 .map_sg = swiotlb_map_sg_attrs,
2084diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2084diff -urNp linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S
2085--- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400 2085--- linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S 2010-03-15 11:52:04.000000000 -0400
2086+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400 2086+++ linux-2.6.32.12/arch/powerpc/kernel/exceptions-64e.S 2010-04-04 20:46:41.485273950 -0400
2087@@ -455,6 +455,7 @@ storage_fault_common: 2087@@ -455,6 +455,7 @@ storage_fault_common:
2088 std r14,_DAR(r1) 2088 std r14,_DAR(r1)
2089 std r15,_DSISR(r1) 2089 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/
2102 addi r3,r1,STACK_FRAME_OVERHEAD 2102 addi r3,r1,STACK_FRAME_OVERHEAD
2103 ld r4,_DAR(r1) 2103 ld r4,_DAR(r1)
2104 bl .bad_page_fault 2104 bl .bad_page_fault
2105diff -urNp linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2105diff -urNp linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S
2106--- linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400 2106--- linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S 2010-03-15 11:52:04.000000000 -0400
2107+++ linux-2.6.32.11/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400 2107+++ linux-2.6.32.12/arch/powerpc/kernel/exceptions-64s.S 2010-04-04 20:46:41.485273950 -0400
2108@@ -818,10 +818,10 @@ handle_page_fault: 2108@@ -818,10 +818,10 @@ handle_page_fault:
2109 11: ld r4,_DAR(r1) 2109 11: ld r4,_DAR(r1)
2110 ld r5,_DSISR(r1) 2110 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/
2117 mr r5,r3 2117 mr r5,r3
2118 addi r3,r1,STACK_FRAME_OVERHEAD 2118 addi r3,r1,STACK_FRAME_OVERHEAD
2119 lwz r4,_DAR(r1) 2119 lwz r4,_DAR(r1)
2120diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2120diff -urNp linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c
2121--- linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400 2121--- linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c 2010-03-15 11:52:04.000000000 -0400
2122+++ linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400 2122+++ linux-2.6.32.12/arch/powerpc/kernel/ibmebus.c 2010-04-04 20:46:41.485273950 -0400
2123@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct 2123@@ -127,7 +127,7 @@ static int ibmebus_dma_supported(struct
2124 return 1; 2124 return 1;
2125 } 2125 }
@@ -2129,9 +2129,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/ibmebus.c linux-2.6.32.11/arch/po
2129 .alloc_coherent = ibmebus_alloc_coherent, 2129 .alloc_coherent = ibmebus_alloc_coherent,
2130 .free_coherent = ibmebus_free_coherent, 2130 .free_coherent = ibmebus_free_coherent,
2131 .map_sg = ibmebus_map_sg, 2131 .map_sg = ibmebus_map_sg,
2132diff -urNp linux-2.6.32.11/arch/powerpc/kernel/kgdb.c linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2132diff -urNp linux-2.6.32.12/arch/powerpc/kernel/kgdb.c linux-2.6.32.12/arch/powerpc/kernel/kgdb.c
2133--- linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2133--- linux-2.6.32.12/arch/powerpc/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2134+++ linux-2.6.32.11/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400 2134+++ linux-2.6.32.12/arch/powerpc/kernel/kgdb.c 2010-04-04 20:46:41.485273950 -0400
2135@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct 2135@@ -126,7 +126,7 @@ static int kgdb_handle_breakpoint(struct
2136 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0) 2136 if (kgdb_handle_exception(0, SIGTRAP, 0, regs) != 0)
2137 return 0; 2137 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
2150 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08}, 2150 .gdb_bpt_instr = {0x7d, 0x82, 0x10, 0x08},
2151 }; 2151 };
2152 2152
2153diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2153diff -urNp linux-2.6.32.12/arch/powerpc/kernel/module_32.c linux-2.6.32.12/arch/powerpc/kernel/module_32.c
2154--- linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400 2154--- linux-2.6.32.12/arch/powerpc/kernel/module_32.c 2010-03-15 11:52:04.000000000 -0400
2155+++ linux-2.6.32.11/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400 2155+++ linux-2.6.32.12/arch/powerpc/kernel/module_32.c 2010-04-04 20:46:41.485273950 -0400
2156@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr 2156@@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
2157 me->arch.core_plt_section = i; 2157 me->arch.core_plt_section = i;
2158 } 2158 }
@@ -2182,9 +2182,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module_32.c linux-2.6.32.11/arch/
2182 2182
2183 /* Find this entry, or if that fails, the next avail. entry */ 2183 /* Find this entry, or if that fails, the next avail. entry */
2184 while (entry->jump[0]) { 2184 while (entry->jump[0]) {
2185diff -urNp linux-2.6.32.11/arch/powerpc/kernel/module.c linux-2.6.32.11/arch/powerpc/kernel/module.c 2185diff -urNp linux-2.6.32.12/arch/powerpc/kernel/module.c linux-2.6.32.12/arch/powerpc/kernel/module.c
2186--- linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2186--- linux-2.6.32.12/arch/powerpc/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2187+++ linux-2.6.32.11/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400 2187+++ linux-2.6.32.12/arch/powerpc/kernel/module.c 2010-04-04 20:46:41.485273950 -0400
2188@@ -31,11 +31,24 @@ 2188@@ -31,11 +31,24 @@
2189 2189
2190 LIST_HEAD(module_bug_list); 2190 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
2224 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr, 2224 static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
2225 const Elf_Shdr *sechdrs, 2225 const Elf_Shdr *sechdrs,
2226 const char *name) 2226 const char *name)
2227diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2227diff -urNp linux-2.6.32.12/arch/powerpc/kernel/pci-common.c linux-2.6.32.12/arch/powerpc/kernel/pci-common.c
2228--- linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400 2228--- linux-2.6.32.12/arch/powerpc/kernel/pci-common.c 2010-03-15 11:52:04.000000000 -0400
2229+++ linux-2.6.32.11/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400 2229+++ linux-2.6.32.12/arch/powerpc/kernel/pci-common.c 2010-04-04 20:46:41.485273950 -0400
2230@@ -50,14 +50,14 @@ resource_size_t isa_mem_base; 2230@@ -50,14 +50,14 @@ resource_size_t isa_mem_base;
2231 unsigned int ppc_pci_flags = 0; 2231 unsigned int ppc_pci_flags = 0;
2232 2232
@@ -2245,9 +2245,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/pci-common.c linux-2.6.32.11/arch
2245 { 2245 {
2246 return pci_dma_ops; 2246 return pci_dma_ops;
2247 } 2247 }
2248diff -urNp linux-2.6.32.11/arch/powerpc/kernel/process.c linux-2.6.32.11/arch/powerpc/kernel/process.c 2248diff -urNp linux-2.6.32.12/arch/powerpc/kernel/process.c linux-2.6.32.12/arch/powerpc/kernel/process.c
2249--- linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400 2249--- linux-2.6.32.12/arch/powerpc/kernel/process.c 2010-03-15 11:52:04.000000000 -0400
2250+++ linux-2.6.32.11/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400 2250+++ linux-2.6.32.12/arch/powerpc/kernel/process.c 2010-04-04 20:46:41.485273950 -0400
2251@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned 2251@@ -1141,51 +1141,3 @@ unsigned long arch_align_stack(unsigned
2252 sp -= get_random_int() & ~PAGE_MASK; 2252 sp -= get_random_int() & ~PAGE_MASK;
2253 return sp & ~0xf; 2253 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
2300- 2300-
2301- return ret; 2301- return ret;
2302-} 2302-}
2303diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_32.c linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2303diff -urNp linux-2.6.32.12/arch/powerpc/kernel/signal_32.c linux-2.6.32.12/arch/powerpc/kernel/signal_32.c
2304--- linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400 2304--- linux-2.6.32.12/arch/powerpc/kernel/signal_32.c 2010-03-15 11:52:04.000000000 -0400
2305+++ linux-2.6.32.11/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400 2305+++ linux-2.6.32.12/arch/powerpc/kernel/signal_32.c 2010-04-04 20:46:41.489273754 -0400
2306@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig 2306@@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig
2307 /* Save user registers on the stack */ 2307 /* Save user registers on the stack */
2308 frame = &rt_sf->uc.uc_mcontext; 2308 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/
2312 if (save_user_regs(regs, frame, 0, 1)) 2312 if (save_user_regs(regs, frame, 0, 1))
2313 goto badframe; 2313 goto badframe;
2314 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; 2314 regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
2315diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2315diff -urNp linux-2.6.32.12/arch/powerpc/kernel/signal_64.c linux-2.6.32.12/arch/powerpc/kernel/signal_64.c
2316--- linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400 2316--- linux-2.6.32.12/arch/powerpc/kernel/signal_64.c 2010-03-15 11:52:04.000000000 -0400
2317+++ linux-2.6.32.11/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400 2317+++ linux-2.6.32.12/arch/powerpc/kernel/signal_64.c 2010-04-04 20:46:41.489273754 -0400
2318@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct 2318@@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct
2319 current->thread.fpscr.val = 0; 2319 current->thread.fpscr.val = 0;
2320 2320
@@ -2324,9 +2324,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/signal_64.c linux-2.6.32.11/arch/
2324 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; 2324 regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
2325 } else { 2325 } else {
2326 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); 2326 err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
2327diff -urNp linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2327diff -urNp linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c
2328--- linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400 2328--- linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c 2010-03-15 11:52:04.000000000 -0400
2329+++ linux-2.6.32.11/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400 2329+++ linux-2.6.32.12/arch/powerpc/kernel/sys_ppc32.c 2010-04-04 20:46:41.489273754 -0400
2330@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct 2330@@ -563,10 +563,10 @@ asmlinkage long compat_sys_sysctl(struct
2331 if (oldlenp) { 2331 if (oldlenp) {
2332 if (!error) { 2332 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/
2340 } 2340 }
2341 return error; 2341 return error;
2342 } 2342 }
2343diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vdso.c linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2343diff -urNp linux-2.6.32.12/arch/powerpc/kernel/vdso.c linux-2.6.32.12/arch/powerpc/kernel/vdso.c
2344--- linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400 2344--- linux-2.6.32.12/arch/powerpc/kernel/vdso.c 2010-03-15 11:52:04.000000000 -0400
2345+++ linux-2.6.32.11/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400 2345+++ linux-2.6.32.12/arch/powerpc/kernel/vdso.c 2010-04-04 20:46:41.489273754 -0400
2346@@ -36,6 +36,7 @@ 2346@@ -36,6 +36,7 @@
2347 #include <asm/firmware.h> 2347 #include <asm/firmware.h>
2348 #include <asm/vdso.h> 2348 #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
2369 if (IS_ERR_VALUE(vdso_base)) { 2369 if (IS_ERR_VALUE(vdso_base)) {
2370 rc = vdso_base; 2370 rc = vdso_base;
2371 goto fail_mmapsem; 2371 goto fail_mmapsem;
2372diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerpc/kernel/vio.c 2372diff -urNp linux-2.6.32.12/arch/powerpc/kernel/vio.c linux-2.6.32.12/arch/powerpc/kernel/vio.c
2373--- linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400 2373--- linux-2.6.32.12/arch/powerpc/kernel/vio.c 2010-03-15 11:52:04.000000000 -0400
2374+++ linux-2.6.32.11/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400 2374+++ linux-2.6.32.12/arch/powerpc/kernel/vio.c 2010-04-04 20:46:41.489273754 -0400
2375@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc 2375@@ -601,11 +601,12 @@ static void vio_dma_iommu_unmap_sg(struc
2376 vio_cmo_dealloc(viodev, alloc_size); 2376 vio_cmo_dealloc(viodev, alloc_size);
2377 } 2377 }
@@ -2394,9 +2394,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/kernel/vio.c linux-2.6.32.11/arch/powerp
2394 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops; 2394 viodev->dev.archdata.dma_ops = &vio_dma_mapping_ops;
2395 } 2395 }
2396 2396
2397diff -urNp linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2397diff -urNp linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c
2398--- linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 2398--- linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
2399+++ linux-2.6.32.11/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400 2399+++ linux-2.6.32.12/arch/powerpc/lib/usercopy_64.c 2010-04-04 20:46:41.489273754 -0400
2400@@ -9,22 +9,6 @@ 2400@@ -9,22 +9,6 @@
2401 #include <linux/module.h> 2401 #include <linux/module.h>
2402 #include <asm/uaccess.h> 2402 #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
2428-EXPORT_SYMBOL(copy_to_user); 2428-EXPORT_SYMBOL(copy_to_user);
2429 EXPORT_SYMBOL(copy_in_user); 2429 EXPORT_SYMBOL(copy_in_user);
2430 2430
2431diff -urNp linux-2.6.32.11/arch/powerpc/mm/fault.c linux-2.6.32.11/arch/powerpc/mm/fault.c 2431diff -urNp linux-2.6.32.12/arch/powerpc/mm/fault.c linux-2.6.32.12/arch/powerpc/mm/fault.c
2432--- linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 2432--- linux-2.6.32.12/arch/powerpc/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
2433+++ linux-2.6.32.11/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400 2433+++ linux-2.6.32.12/arch/powerpc/mm/fault.c 2010-04-04 20:46:41.489273754 -0400
2434@@ -30,6 +30,10 @@ 2434@@ -30,6 +30,10 @@
2435 #include <linux/kprobes.h> 2435 #include <linux/kprobes.h>
2436 #include <linux/kdebug.h> 2436 #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/
2535 _exception(SIGSEGV, regs, code, address); 2535 _exception(SIGSEGV, regs, code, address);
2536 return 0; 2536 return 0;
2537 } 2537 }
2538diff -urNp linux-2.6.32.11/arch/powerpc/mm/mmap_64.c linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2538diff -urNp linux-2.6.32.12/arch/powerpc/mm/mmap_64.c linux-2.6.32.12/arch/powerpc/mm/mmap_64.c
2539--- linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400 2539--- linux-2.6.32.12/arch/powerpc/mm/mmap_64.c 2010-03-15 11:52:04.000000000 -0400
2540+++ linux-2.6.32.11/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400 2540+++ linux-2.6.32.12/arch/powerpc/mm/mmap_64.c 2010-04-04 20:46:41.489273754 -0400
2541@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str 2541@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
2542 */ 2542 */
2543 if (mmap_is_legacy()) { 2543 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
2561 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 2561 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
2562 mm->unmap_area = arch_unmap_area_topdown; 2562 mm->unmap_area = arch_unmap_area_topdown;
2563 } 2563 }
2564diff -urNp linux-2.6.32.11/arch/powerpc/mm/slice.c linux-2.6.32.11/arch/powerpc/mm/slice.c 2564diff -urNp linux-2.6.32.12/arch/powerpc/mm/slice.c linux-2.6.32.12/arch/powerpc/mm/slice.c
2565--- linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400 2565--- linux-2.6.32.12/arch/powerpc/mm/slice.c 2010-03-15 11:52:04.000000000 -0400
2566+++ linux-2.6.32.11/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400 2566+++ linux-2.6.32.12/arch/powerpc/mm/slice.c 2010-04-04 20:46:41.489273754 -0400
2567@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un 2567@@ -426,6 +426,11 @@ unsigned long slice_get_unmapped_area(un
2568 if (fixed && addr > (mm->task_size - len)) 2568 if (fixed && addr > (mm->task_size - len))
2569 return -EINVAL; 2569 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/
2576 /* If hint, make sure it matches our alignment restrictions */ 2576 /* If hint, make sure it matches our alignment restrictions */
2577 if (!fixed && addr) { 2577 if (!fixed && addr) {
2578 addr = _ALIGN_UP(addr, 1ul << pshift); 2578 addr = _ALIGN_UP(addr, 1ul << pshift);
2579diff -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 2579diff -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
2580--- linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400 2580--- linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-03-15 11:52:04.000000000 -0400
2581+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400 2581+++ linux-2.6.32.12/arch/powerpc/platforms/52xx/lite5200_pm.c 2010-04-04 20:46:41.489273754 -0400
2582@@ -235,7 +235,7 @@ static void lite5200_pm_end(void) 2582@@ -235,7 +235,7 @@ static void lite5200_pm_end(void)
2583 lite5200_pm_target_state = PM_SUSPEND_ON; 2583 lite5200_pm_target_state = PM_SUSPEND_ON;
2584 } 2584 }
@@ -2588,9 +2588,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/lite5200_pm.c linux-2.6.3
2588 .valid = lite5200_pm_valid, 2588 .valid = lite5200_pm_valid,
2589 .begin = lite5200_pm_begin, 2589 .begin = lite5200_pm_begin,
2590 .prepare = lite5200_pm_prepare, 2590 .prepare = lite5200_pm_prepare,
2591diff -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 2591diff -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
2592--- linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400 2592--- linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-03-15 11:52:04.000000000 -0400
2593+++ linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400 2593+++ linux-2.6.32.12/arch/powerpc/platforms/52xx/mpc52xx_pm.c 2010-04-04 20:46:41.489273754 -0400
2594@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void) 2594@@ -180,7 +180,7 @@ void mpc52xx_pm_finish(void)
2595 iounmap(mbar); 2595 iounmap(mbar);
2596 } 2596 }
@@ -2600,9 +2600,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/52xx/mpc52xx_pm.c linux-2.6.32
2600 .valid = mpc52xx_pm_valid, 2600 .valid = mpc52xx_pm_valid,
2601 .prepare = mpc52xx_pm_prepare, 2601 .prepare = mpc52xx_pm_prepare,
2602 .enter = mpc52xx_pm_enter, 2602 .enter = mpc52xx_pm_enter,
2603diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2603diff -urNp linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c
2604--- linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400 2604--- linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c 2010-03-15 11:52:04.000000000 -0400
2605+++ linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400 2605+++ linux-2.6.32.12/arch/powerpc/platforms/83xx/suspend.c 2010-04-04 20:46:41.489273754 -0400
2606@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void) 2606@@ -273,7 +273,7 @@ static int mpc83xx_is_pci_agent(void)
2607 return ret; 2607 return ret;
2608 } 2608 }
@@ -2612,9 +2612,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/83xx/suspend.c linux-2.6.32.11
2612 .valid = mpc83xx_suspend_valid, 2612 .valid = mpc83xx_suspend_valid,
2613 .begin = mpc83xx_suspend_begin, 2613 .begin = mpc83xx_suspend_begin,
2614 .enter = mpc83xx_suspend_enter, 2614 .enter = mpc83xx_suspend_enter,
2615diff -urNp linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2615diff -urNp linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c
2616--- linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400 2616--- linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c 2010-03-15 11:52:04.000000000 -0400
2617+++ linux-2.6.32.11/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -0400 2617+++ linux-2.6.32.12/arch/powerpc/platforms/cell/iommu.c 2010-04-04 20:46:41.489273754 -0400
2618@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc 2618@@ -642,7 +642,7 @@ static int dma_fixed_dma_supported(struc
2619 2619
2620 static int dma_set_mask_and_switch(struct device *dev, u64 dma_mask); 2620 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
2624 .alloc_coherent = dma_fixed_alloc_coherent, 2624 .alloc_coherent = dma_fixed_alloc_coherent,
2625 .free_coherent = dma_fixed_free_coherent, 2625 .free_coherent = dma_fixed_free_coherent,
2626 .map_sg = dma_fixed_map_sg, 2626 .map_sg = dma_fixed_map_sg,
2627diff -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 2627diff -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
2628--- linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400 2628--- linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c 2010-03-15 11:52:04.000000000 -0400
2629+++ linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400 2629+++ linux-2.6.32.12/arch/powerpc/platforms/ps3/system-bus.c 2010-04-04 20:46:41.489273754 -0400
2630@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi 2630@@ -694,7 +694,7 @@ static int ps3_dma_supported(struct devi
2631 return mask >= DMA_BIT_MASK(32); 2631 return mask >= DMA_BIT_MASK(32);
2632 } 2632 }
@@ -2645,9 +2645,9 @@ diff -urNp linux-2.6.32.11/arch/powerpc/platforms/ps3/system-bus.c linux-2.6.32.
2645 .alloc_coherent = ps3_alloc_coherent, 2645 .alloc_coherent = ps3_alloc_coherent,
2646 .free_coherent = ps3_free_coherent, 2646 .free_coherent = ps3_free_coherent,
2647 .map_sg = ps3_ioc0_map_sg, 2647 .map_sg = ps3_ioc0_map_sg,
2648diff -urNp linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2648diff -urNp linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig
2649--- linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400 2649--- linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig 2010-03-15 11:52:04.000000000 -0400
2650+++ linux-2.6.32.11/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400 2650+++ linux-2.6.32.12/arch/powerpc/platforms/pseries/Kconfig 2010-04-04 20:46:41.489273754 -0400
2651@@ -2,6 +2,8 @@ config PPC_PSERIES 2651@@ -2,6 +2,8 @@ config PPC_PSERIES
2652 depends on PPC64 && PPC_BOOK3S 2652 depends on PPC64 && PPC_BOOK3S
2653 bool "IBM pSeries & new (POWER5-based) iSeries" 2653 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
2657 select PPC_I8259 2657 select PPC_I8259
2658 select PPC_RTAS 2658 select PPC_RTAS
2659 select RTAS_ERROR_LOGGING 2659 select RTAS_ERROR_LOGGING
2660diff -urNp linux-2.6.32.11/arch/s390/include/asm/elf.h linux-2.6.32.11/arch/s390/include/asm/elf.h 2660diff -urNp linux-2.6.32.12/arch/s390/include/asm/elf.h linux-2.6.32.12/arch/s390/include/asm/elf.h
2661--- linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 2661--- linux-2.6.32.12/arch/s390/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
2662+++ linux-2.6.32.11/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -0400 2662+++ linux-2.6.32.12/arch/s390/include/asm/elf.h 2010-04-04 20:46:41.489273754 -0400
2663@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled; 2663@@ -164,6 +164,13 @@ extern unsigned int vdso_enabled;
2664 that it will "exec", and that there is sufficient room for the brk. */ 2664 that it will "exec", and that there is sufficient room for the brk. */
2665 #define ELF_ET_DYN_BASE (STACK_TOP / 3 * 2) 2665 #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
2674 /* This yields a mask that user programs can use to figure out what 2674 /* This yields a mask that user programs can use to figure out what
2675 instruction set this CPU supports. */ 2675 instruction set this CPU supports. */
2676 2676
2677diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s390/include/asm/setup.h 2677diff -urNp linux-2.6.32.12/arch/s390/include/asm/setup.h linux-2.6.32.12/arch/s390/include/asm/setup.h
2678--- linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400 2678--- linux-2.6.32.12/arch/s390/include/asm/setup.h 2010-03-15 11:52:04.000000000 -0400
2679+++ linux-2.6.32.11/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400 2679+++ linux-2.6.32.12/arch/s390/include/asm/setup.h 2010-04-04 20:46:41.489273754 -0400
2680@@ -50,13 +50,13 @@ extern unsigned long memory_end; 2680@@ -50,13 +50,13 @@ extern unsigned long memory_end;
2681 void detect_memory_layout(struct mem_chunk chunk[]); 2681 void detect_memory_layout(struct mem_chunk chunk[]);
2682 2682
@@ -2693,9 +2693,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/setup.h linux-2.6.32.11/arch/s3
2693 #else 2693 #else
2694 #define s390_noexec (0) 2694 #define s390_noexec (0)
2695 #endif 2695 #endif
2696diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2696diff -urNp linux-2.6.32.12/arch/s390/include/asm/uaccess.h linux-2.6.32.12/arch/s390/include/asm/uaccess.h
2697--- linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 2697--- linux-2.6.32.12/arch/s390/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
2698+++ linux-2.6.32.11/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400 2698+++ linux-2.6.32.12/arch/s390/include/asm/uaccess.h 2010-04-04 20:46:41.489273754 -0400
2699@@ -232,6 +232,10 @@ static inline unsigned long __must_check 2699@@ -232,6 +232,10 @@ static inline unsigned long __must_check
2700 copy_to_user(void __user *to, const void *from, unsigned long n) 2700 copy_to_user(void __user *to, const void *from, unsigned long n)
2701 { 2701 {
@@ -2728,9 +2728,9 @@ diff -urNp linux-2.6.32.11/arch/s390/include/asm/uaccess.h linux-2.6.32.11/arch/
2728 if (access_ok(VERIFY_READ, from, n)) 2728 if (access_ok(VERIFY_READ, from, n))
2729 n = __copy_from_user(to, from, n); 2729 n = __copy_from_user(to, from, n);
2730 else 2730 else
2731diff -urNp linux-2.6.32.11/arch/s390/Kconfig linux-2.6.32.11/arch/s390/Kconfig 2731diff -urNp linux-2.6.32.12/arch/s390/Kconfig linux-2.6.32.12/arch/s390/Kconfig
2732--- linux-2.6.32.11/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400 2732--- linux-2.6.32.12/arch/s390/Kconfig 2010-03-15 11:52:04.000000000 -0400
2733+++ linux-2.6.32.11/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400 2733+++ linux-2.6.32.12/arch/s390/Kconfig 2010-04-04 20:46:41.489273754 -0400
2734@@ -194,28 +194,26 @@ config AUDIT_ARCH 2734@@ -194,28 +194,26 @@ config AUDIT_ARCH
2735 2735
2736 config S390_SWITCH_AMODE 2736 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
2768 2768
2769 comment "Code generation options" 2769 comment "Code generation options"
2770 2770
2771diff -urNp linux-2.6.32.11/arch/s390/kernel/module.c linux-2.6.32.11/arch/s390/kernel/module.c 2771diff -urNp linux-2.6.32.12/arch/s390/kernel/module.c linux-2.6.32.12/arch/s390/kernel/module.c
2772--- linux-2.6.32.11/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 2772--- linux-2.6.32.12/arch/s390/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
2773+++ linux-2.6.32.11/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400 2773+++ linux-2.6.32.12/arch/s390/kernel/module.c 2010-04-04 20:46:41.492578989 -0400
2774@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, 2774@@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
2775 2775
2776 /* Increase core size by size of got & plt and set start 2776 /* 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
2842 rela->r_addend - loc; 2842 rela->r_addend - loc;
2843 if (r_type == R_390_GOTPC) 2843 if (r_type == R_390_GOTPC)
2844 *(unsigned int *) loc = val; 2844 *(unsigned int *) loc = val;
2845diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/kernel/setup.c 2845diff -urNp linux-2.6.32.12/arch/s390/kernel/setup.c linux-2.6.32.12/arch/s390/kernel/setup.c
2846--- linux-2.6.32.11/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 2846--- linux-2.6.32.12/arch/s390/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
2847+++ linux-2.6.32.11/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400 2847+++ linux-2.6.32.12/arch/s390/kernel/setup.c 2010-04-04 20:46:41.492578989 -0400
2848@@ -306,9 +306,6 @@ static int __init early_parse_mem(char * 2848@@ -306,9 +306,6 @@ static int __init early_parse_mem(char *
2849 early_param("mem", early_parse_mem); 2849 early_param("mem", early_parse_mem);
2850 2850
@@ -2898,9 +2898,9 @@ diff -urNp linux-2.6.32.11/arch/s390/kernel/setup.c linux-2.6.32.11/arch/s390/ke
2898 static void setup_addressing_mode(void) 2898 static void setup_addressing_mode(void)
2899 { 2899 {
2900 if (s390_noexec) { 2900 if (s390_noexec) {
2901diff -urNp linux-2.6.32.11/arch/s390/mm/mmap.c linux-2.6.32.11/arch/s390/mm/mmap.c 2901diff -urNp linux-2.6.32.12/arch/s390/mm/mmap.c linux-2.6.32.12/arch/s390/mm/mmap.c
2902--- linux-2.6.32.11/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 2902--- linux-2.6.32.12/arch/s390/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
2903+++ linux-2.6.32.11/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400 2903+++ linux-2.6.32.12/arch/s390/mm/mmap.c 2010-04-04 20:46:41.492578989 -0400
2904@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str 2904@@ -78,10 +78,22 @@ void arch_pick_mmap_layout(struct mm_str
2905 */ 2905 */
2906 if (mmap_is_legacy()) { 2906 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
2947 mm->get_unmapped_area = s390_get_unmapped_area_topdown; 2947 mm->get_unmapped_area = s390_get_unmapped_area_topdown;
2948 mm->unmap_area = arch_unmap_area_topdown; 2948 mm->unmap_area = arch_unmap_area_topdown;
2949 } 2949 }
2950diff -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 2950diff -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
2951--- linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400 2951--- linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c 2010-03-15 11:52:04.000000000 -0400
2952+++ linux-2.6.32.11/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400 2952+++ linux-2.6.32.12/arch/sh/boards/mach-hp6xx/pm.c 2010-04-04 20:46:41.492578989 -0400
2953@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_ 2953@@ -143,7 +143,7 @@ static int hp6x0_pm_enter(suspend_state_
2954 return 0; 2954 return 0;
2955 } 2955 }
@@ -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
2959 .enter = hp6x0_pm_enter, 2959 .enter = hp6x0_pm_enter,
2960 .valid = suspend_valid_only_mem, 2960 .valid = suspend_valid_only_mem,
2961 }; 2961 };
2962diff -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 2962diff -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
2963--- linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400 2963--- linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c 2010-03-15 11:52:04.000000000 -0400
2964+++ linux-2.6.32.11/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400 2964+++ linux-2.6.32.12/arch/sh/kernel/cpu/sh4/sq.c 2010-04-04 20:46:41.492578989 -0400
2965@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[ 2965@@ -327,7 +327,7 @@ static struct attribute *sq_sysfs_attrs[
2966 NULL, 2966 NULL,
2967 }; 2967 };
@@ -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
2971 .show = sq_sysfs_show, 2971 .show = sq_sysfs_show,
2972 .store = sq_sysfs_store, 2972 .store = sq_sysfs_store,
2973 }; 2973 };
2974diff -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 2974diff -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
2975--- linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400 2975--- linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c 2010-03-15 11:52:04.000000000 -0400
2976+++ linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400 2976+++ linux-2.6.32.12/arch/sh/kernel/cpu/shmobile/pm.c 2010-04-04 20:46:41.492578989 -0400
2977@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s 2977@@ -58,7 +58,7 @@ static int sh_pm_enter(suspend_state_t s
2978 return 0; 2978 return 0;
2979 } 2979 }
@@ -2983,9 +2983,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/cpu/shmobile/pm.c linux-2.6.32.11/arch
2983 .enter = sh_pm_enter, 2983 .enter = sh_pm_enter,
2984 .valid = suspend_valid_only_mem, 2984 .valid = suspend_valid_only_mem,
2985 }; 2985 };
2986diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/kgdb.c 2986diff -urNp linux-2.6.32.12/arch/sh/kernel/kgdb.c linux-2.6.32.12/arch/sh/kernel/kgdb.c
2987--- linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 2987--- linux-2.6.32.12/arch/sh/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
2988+++ linux-2.6.32.11/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400 2988+++ linux-2.6.32.12/arch/sh/kernel/kgdb.c 2010-04-04 20:46:41.492578989 -0400
2989@@ -271,7 +271,7 @@ void kgdb_arch_exit(void) 2989@@ -271,7 +271,7 @@ void kgdb_arch_exit(void)
2990 { 2990 {
2991 } 2991 }
@@ -2995,9 +2995,9 @@ diff -urNp linux-2.6.32.11/arch/sh/kernel/kgdb.c linux-2.6.32.11/arch/sh/kernel/
2995 /* Breakpoint instruction: trapa #0x3c */ 2995 /* Breakpoint instruction: trapa #0x3c */
2996 #ifdef CONFIG_CPU_LITTLE_ENDIAN 2996 #ifdef CONFIG_CPU_LITTLE_ENDIAN
2997 .gdb_bpt_instr = { 0x3c, 0xc3 }, 2997 .gdb_bpt_instr = { 0x3c, 0xc3 },
2998diff -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 2998diff -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
2999--- linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 2999--- linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
3000+++ linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400 3000+++ linux-2.6.32.12/arch/sparc/include/asm/atomic_64.h 2010-04-04 20:46:41.492578989 -0400
3001@@ -14,18 +14,38 @@ 3001@@ -14,18 +14,38 @@
3002 #define ATOMIC64_INIT(i) { (i) } 3002 #define ATOMIC64_INIT(i) { (i) }
3003 3003
@@ -3127,9 +3127,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/include/asm/atomic_64.h linux-2.6.32.11/ar
3127 } 3127 }
3128 3128
3129 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0) 3129 #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
3130diff -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 3130diff -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
3131--- linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 3131--- linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
3132+++ linux-2.6.32.11/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -0400 3132+++ linux-2.6.32.12/arch/sparc/include/asm/dma-mapping.h 2010-04-04 20:46:41.492578989 -0400
3133@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d 3133@@ -14,10 +14,10 @@ extern int dma_set_mask(struct device *d
3134 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h) 3134 #define dma_free_noncoherent(d, s, v, h) dma_free_coherent(d, s, v, h)
3135 #define dma_is_consistent(d, h) (1) 3135 #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/
3161 3161
3162 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle); 3162 debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
3163 ops->free_coherent(dev, size, cpu_addr, dma_handle); 3163 ops->free_coherent(dev, size, cpu_addr, dma_handle);
3164diff -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 3164diff -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
3165--- linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400 3165--- linux-2.6.32.12/arch/sparc/include/asm/elf_32.h 2010-03-15 11:52:04.000000000 -0400
3166+++ linux-2.6.32.11/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400 3166+++ linux-2.6.32.12/arch/sparc/include/asm/elf_32.h 2010-04-04 20:46:41.492578989 -0400
3167@@ -116,6 +116,13 @@ typedef struct { 3167@@ -116,6 +116,13 @@ typedef struct {
3168 3168
3169 #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) 3169 #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/
3178 /* This yields a mask that user programs can use to figure out what 3178 /* This yields a mask that user programs can use to figure out what
3179 instruction set this cpu supports. This can NOT be done in userspace 3179 instruction set this cpu supports. This can NOT be done in userspace
3180 on Sparc. */ 3180 on Sparc. */
3181diff -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 3181diff -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
3182--- linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400 3182--- linux-2.6.32.12/arch/sparc/include/asm/elf_64.h 2010-03-15 11:52:04.000000000 -0400
3183+++ linux-2.6.32.11/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400 3183+++ linux-2.6.32.12/arch/sparc/include/asm/elf_64.h 2010-04-04 20:46:41.492578989 -0400
3184@@ -163,6 +163,12 @@ typedef struct { 3184@@ -163,6 +163,12 @@ typedef struct {
3185 #define ELF_ET_DYN_BASE 0x0000010000000000UL 3185 #define ELF_ET_DYN_BASE 0x0000010000000000UL
3186 #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL 3186 #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/
3194 3194
3195 /* This yields a mask that user programs can use to figure out what 3195 /* This yields a mask that user programs can use to figure out what
3196 instruction set this cpu supports. */ 3196 instruction set this cpu supports. */
3197diff -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 3197diff -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
3198--- linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 3198--- linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
3199+++ linux-2.6.32.11/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400 3199+++ linux-2.6.32.12/arch/sparc/include/asm/pgtable_32.h 2010-04-04 20:46:41.492578989 -0400
3200@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) 3200@@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
3201 BTFIXUPDEF_INT(page_none) 3201 BTFIXUPDEF_INT(page_none)
3202 BTFIXUPDEF_INT(page_copy) 3202 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
3228 extern unsigned long page_kernel; 3228 extern unsigned long page_kernel;
3229 3229
3230 #ifdef MODULE 3230 #ifdef MODULE
3231diff -urNp linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 3231diff -urNp linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h
3232--- linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400 3232--- linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h 2010-03-15 11:52:04.000000000 -0400
3233+++ linux-2.6.32.11/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400 3233+++ linux-2.6.32.12/arch/sparc/include/asm/pgtsrmmu.h 2010-04-04 20:46:41.492578989 -0400
3234@@ -115,6 +115,13 @@ 3234@@ -115,6 +115,13 @@
3235 SRMMU_EXEC | SRMMU_REF) 3235 SRMMU_EXEC | SRMMU_REF)
3236 #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ 3236 #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
3245 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ 3245 #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
3246 SRMMU_DIRTY | SRMMU_REF) 3246 SRMMU_DIRTY | SRMMU_REF)
3247 3247
3248diff -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 3248diff -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
3249--- linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400 3249--- linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h 2010-03-15 11:52:04.000000000 -0400
3250+++ linux-2.6.32.11/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400 3250+++ linux-2.6.32.12/arch/sparc/include/asm/spinlock_64.h 2010-04-04 20:46:41.492578989 -0400
3251@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw 3251@@ -99,7 +99,12 @@ static void inline arch_read_lock(raw_rw
3252 __asm__ __volatile__ ( 3252 __asm__ __volatile__ (
3253 "1: ldsw [%2], %0\n" 3253 "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/
3299 " cas [%2], %0, %1\n" 3299 " cas [%2], %0, %1\n"
3300 " cmp %0, %1\n" 3300 " cmp %0, %1\n"
3301 " bne,pn %%xcc, 1b\n" 3301 " bne,pn %%xcc, 1b\n"
3302diff -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 3302diff -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
3303--- linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 3303--- linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
3304+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -0400 3304+++ linux-2.6.32.12/arch/sparc/include/asm/uaccess_32.h 2010-04-04 20:46:41.492578989 -0400
3305@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __ 3305@@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
3306 3306
3307 static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) 3307 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
3353 return __copy_user((__force void __user *) to, from, n); 3353 return __copy_user((__force void __user *) to, from, n);
3354 } 3354 }
3355 3355
3356diff -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 3356diff -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
3357--- linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 3357--- linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
3358+++ linux-2.6.32.11/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400 3358+++ linux-2.6.32.12/arch/sparc/include/asm/uaccess_64.h 2010-04-04 20:46:41.492578989 -0400
3359@@ -9,6 +9,7 @@ 3359@@ -9,6 +9,7 @@
3360 #include <linux/compiler.h> 3360 #include <linux/compiler.h>
3361 #include <linux/string.h> 3361 #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
3406 if (unlikely(ret)) 3406 if (unlikely(ret))
3407 ret = copy_to_user_fixup(to, from, size); 3407 ret = copy_to_user_fixup(to, from, size);
3408 return ret; 3408 return ret;
3409diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/kernel/iommu.c 3409diff -urNp linux-2.6.32.12/arch/sparc/kernel/iommu.c linux-2.6.32.12/arch/sparc/kernel/iommu.c
3410--- linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400 3410--- linux-2.6.32.12/arch/sparc/kernel/iommu.c 2010-03-15 11:52:04.000000000 -0400
3411+++ linux-2.6.32.11/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400 3411+++ linux-2.6.32.12/arch/sparc/kernel/iommu.c 2010-04-04 20:46:41.492578989 -0400
3412@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc 3412@@ -826,7 +826,7 @@ static void dma_4u_sync_sg_for_cpu(struc
3413 spin_unlock_irqrestore(&iommu->lock, flags); 3413 spin_unlock_irqrestore(&iommu->lock, flags);
3414 } 3414 }
@@ -3427,9 +3427,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/iommu.c linux-2.6.32.11/arch/sparc/
3427 EXPORT_SYMBOL(dma_ops); 3427 EXPORT_SYMBOL(dma_ops);
3428 3428
3429 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask); 3429 extern int pci64_dma_supported(struct pci_dev *pdev, u64 device_mask);
3430diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc/kernel/ioport.c 3430diff -urNp linux-2.6.32.12/arch/sparc/kernel/ioport.c linux-2.6.32.12/arch/sparc/kernel/ioport.c
3431--- linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 3431--- linux-2.6.32.12/arch/sparc/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
3432+++ linux-2.6.32.11/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400 3432+++ linux-2.6.32.12/arch/sparc/kernel/ioport.c 2010-04-04 20:46:41.492578989 -0400
3433@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru 3433@@ -392,7 +392,7 @@ static void sbus_sync_sg_for_device(stru
3434 BUG(); 3434 BUG();
3435 } 3435 }
@@ -3457,9 +3457,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/ioport.c linux-2.6.32.11/arch/sparc
3457 .alloc_coherent = pci32_alloc_coherent, 3457 .alloc_coherent = pci32_alloc_coherent,
3458 .free_coherent = pci32_free_coherent, 3458 .free_coherent = pci32_free_coherent,
3459 .map_page = pci32_map_page, 3459 .map_page = pci32_map_page,
3460diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 3460diff -urNp linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c
3461--- linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400 3461--- linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c 2010-03-15 11:52:04.000000000 -0400
3462+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400 3462+++ linux-2.6.32.12/arch/sparc/kernel/kgdb_32.c 2010-04-04 20:46:41.492578989 -0400
3463@@ -158,7 +158,7 @@ void kgdb_arch_exit(void) 3463@@ -158,7 +158,7 @@ void kgdb_arch_exit(void)
3464 { 3464 {
3465 } 3465 }
@@ -3469,9 +3469,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_32.c linux-2.6.32.11/arch/spar
3469 /* Breakpoint instruction: ta 0x7d */ 3469 /* Breakpoint instruction: ta 0x7d */
3470 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d }, 3470 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x7d },
3471 }; 3471 };
3472diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 3472diff -urNp linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c
3473--- linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400 3473--- linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c 2010-03-15 11:52:04.000000000 -0400
3474+++ linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400 3474+++ linux-2.6.32.12/arch/sparc/kernel/kgdb_64.c 2010-04-04 20:46:41.492578989 -0400
3475@@ -180,7 +180,7 @@ void kgdb_arch_exit(void) 3475@@ -180,7 +180,7 @@ void kgdb_arch_exit(void)
3476 { 3476 {
3477 } 3477 }
@@ -3481,9 +3481,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/kgdb_64.c linux-2.6.32.11/arch/spar
3481 /* Breakpoint instruction: ta 0x72 */ 3481 /* Breakpoint instruction: ta 0x72 */
3482 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 }, 3482 .gdb_bpt_instr = { 0x91, 0xd0, 0x20, 0x72 },
3483 }; 3483 };
3484diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc/kernel/Makefile 3484diff -urNp linux-2.6.32.12/arch/sparc/kernel/Makefile linux-2.6.32.12/arch/sparc/kernel/Makefile
3485--- linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400 3485--- linux-2.6.32.12/arch/sparc/kernel/Makefile 2010-03-15 11:52:04.000000000 -0400
3486+++ linux-2.6.32.11/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400 3486+++ linux-2.6.32.12/arch/sparc/kernel/Makefile 2010-04-04 20:46:41.492578989 -0400
3487@@ -3,7 +3,7 @@ 3487@@ -3,7 +3,7 @@
3488 # 3488 #
3489 3489
@@ -3493,9 +3493,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/Makefile linux-2.6.32.11/arch/sparc
3493 3493
3494 extra-y := head_$(BITS).o 3494 extra-y := head_$(BITS).o
3495 extra-y += init_task.o 3495 extra-y += init_task.o
3496diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 3496diff -urNp linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c
3497--- linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400 3497--- linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c 2010-03-15 11:52:04.000000000 -0400
3498+++ linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400 3498+++ linux-2.6.32.12/arch/sparc/kernel/pci_sun4v.c 2010-04-04 20:46:41.492578989 -0400
3499@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic 3499@@ -525,7 +525,7 @@ static void dma_4v_unmap_sg(struct devic
3500 spin_unlock_irqrestore(&iommu->lock, flags); 3500 spin_unlock_irqrestore(&iommu->lock, flags);
3501 } 3501 }
@@ -3505,9 +3505,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/kernel/pci_sun4v.c linux-2.6.32.11/arch/sp
3505 .alloc_coherent = dma_4v_alloc_coherent, 3505 .alloc_coherent = dma_4v_alloc_coherent,
3506 .free_coherent = dma_4v_free_coherent, 3506 .free_coherent = dma_4v_free_coherent,
3507 .map_page = dma_4v_map_page, 3507 .map_page = dma_4v_map_page,
3508diff -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 3508diff -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
3509--- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400 3509--- linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c 2010-03-15 11:52:04.000000000 -0400
3510+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400 3510+++ linux-2.6.32.12/arch/sparc/kernel/sys_sparc_32.c 2010-04-04 20:46:41.492578989 -0400
3511@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str 3511@@ -57,7 +57,7 @@ unsigned long arch_get_unmapped_area(str
3512 if (ARCH_SUN4C && len > 0x20000000) 3512 if (ARCH_SUN4C && len > 0x20000000)
3513 return -ENOMEM; 3513 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
3517 3517
3518 if (flags & MAP_SHARED) 3518 if (flags & MAP_SHARED)
3519 addr = COLOUR_ALIGN(addr); 3519 addr = COLOUR_ALIGN(addr);
3520diff -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 3520diff -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
3521--- linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400 3521--- linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c 2010-03-15 11:52:04.000000000 -0400
3522+++ linux-2.6.32.11/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -0400 3522+++ linux-2.6.32.12/arch/sparc/kernel/sys_sparc_64.c 2010-04-04 20:46:41.492578989 -0400
3523@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str 3523@@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str
3524 /* We do not accept a shared mapping if it would violate 3524 /* We do not accept a shared mapping if it would violate
3525 * cache aliasing constraints. 3525 * 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
3598 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 3598 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
3599 mm->unmap_area = arch_unmap_area_topdown; 3599 mm->unmap_area = arch_unmap_area_topdown;
3600 } 3600 }
3601diff -urNp linux-2.6.32.11/arch/sparc/kernel/traps_64.c linux-2.6.32.11/arch/sparc/kernel/traps_64.c 3601diff -urNp linux-2.6.32.12/arch/sparc/kernel/traps_64.c linux-2.6.32.12/arch/sparc/kernel/traps_64.c
3602--- linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400 3602--- linux-2.6.32.12/arch/sparc/kernel/traps_64.c 2010-03-15 11:52:04.000000000 -0400
3603+++ linux-2.6.32.11/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400 3603+++ linux-2.6.32.12/arch/sparc/kernel/traps_64.c 2010-04-04 20:46:41.496772577 -0400
3604@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long 3604@@ -93,6 +93,12 @@ void bad_trap(struct pt_regs *regs, long
3605 3605
3606 lvl -= 0x100; 3606 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
3632 dump_tl1_traplog((struct tl1_traplog *)(regs + 1)); 3632 dump_tl1_traplog((struct tl1_traplog *)(regs + 1));
3633 3633
3634 sprintf (buffer, "Bad trap %lx at tl>0", lvl); 3634 sprintf (buffer, "Bad trap %lx at tl>0", lvl);
3635diff -urNp linux-2.6.32.11/arch/sparc/lib/atomic_64.S linux-2.6.32.11/arch/sparc/lib/atomic_64.S 3635diff -urNp linux-2.6.32.12/arch/sparc/lib/atomic_64.S linux-2.6.32.12/arch/sparc/lib/atomic_64.S
3636--- linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400 3636--- linux-2.6.32.12/arch/sparc/lib/atomic_64.S 2010-03-15 11:52:04.000000000 -0400
3637+++ linux-2.6.32.11/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400 3637+++ linux-2.6.32.12/arch/sparc/lib/atomic_64.S 2010-04-04 20:46:41.496772577 -0400
3638@@ -18,7 +18,12 @@ 3638@@ -18,7 +18,12 @@
3639 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */ 3639 atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
3640 BACKOFF_SETUP(%o2) 3640 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
3828 casx [%o1], %g1, %g7 3828 casx [%o1], %g1, %g7
3829 cmp %g1, %g7 3829 cmp %g1, %g7
3830 bne,pn %xcc, 2f 3830 bne,pn %xcc, 2f
3831diff -urNp linux-2.6.32.11/arch/sparc/lib/ksyms.c linux-2.6.32.11/arch/sparc/lib/ksyms.c 3831diff -urNp linux-2.6.32.12/arch/sparc/lib/ksyms.c linux-2.6.32.12/arch/sparc/lib/ksyms.c
3832--- linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400 3832--- linux-2.6.32.12/arch/sparc/lib/ksyms.c 2010-03-15 11:52:04.000000000 -0400
3833+++ linux-2.6.32.11/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400 3833+++ linux-2.6.32.12/arch/sparc/lib/ksyms.c 2010-04-04 20:46:41.496772577 -0400
3834@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write); 3834@@ -144,8 +144,10 @@ EXPORT_SYMBOL(__downgrade_write);
3835 3835
3836 /* Atomic counter implementation. */ 3836 /* 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
3842 EXPORT_SYMBOL(atomic_sub_ret); 3842 EXPORT_SYMBOL(atomic_sub_ret);
3843 EXPORT_SYMBOL(atomic64_add); 3843 EXPORT_SYMBOL(atomic64_add);
3844 EXPORT_SYMBOL(atomic64_add_ret); 3844 EXPORT_SYMBOL(atomic64_add_ret);
3845diff -urNp linux-2.6.32.11/arch/sparc/lib/rwsem_64.S linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 3845diff -urNp linux-2.6.32.12/arch/sparc/lib/rwsem_64.S linux-2.6.32.12/arch/sparc/lib/rwsem_64.S
3846--- linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400 3846--- linux-2.6.32.12/arch/sparc/lib/rwsem_64.S 2010-03-15 11:52:04.000000000 -0400
3847+++ linux-2.6.32.11/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400 3847+++ linux-2.6.32.12/arch/sparc/lib/rwsem_64.S 2010-04-04 20:46:41.496772577 -0400
3848@@ -11,7 +11,12 @@ 3848@@ -11,7 +11,12 @@
3849 .globl __down_read 3849 .globl __down_read
3850 __down_read: 3850 __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/
3943 cas [%o0], %g3, %g7 3943 cas [%o0], %g3, %g7
3944 cmp %g3, %g7 3944 cmp %g3, %g7
3945 bne,pn %icc, 1b 3945 bne,pn %icc, 1b
3946diff -urNp linux-2.6.32.11/arch/sparc/Makefile linux-2.6.32.11/arch/sparc/Makefile 3946diff -urNp linux-2.6.32.12/arch/sparc/Makefile linux-2.6.32.12/arch/sparc/Makefile
3947--- linux-2.6.32.11/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400 3947--- linux-2.6.32.12/arch/sparc/Makefile 2010-03-15 11:52:04.000000000 -0400
3948+++ linux-2.6.32.11/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400 3948+++ linux-2.6.32.12/arch/sparc/Makefile 2010-04-04 20:46:41.496772577 -0400
3949@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc 3949@@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc
3950 # Export what is needed by arch/sparc/boot/Makefile 3950 # Export what is needed by arch/sparc/boot/Makefile
3951 export VMLINUX_INIT VMLINUX_MAIN 3951 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
3955 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) 3955 VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
3956 VMLINUX_MAIN += $(drivers-y) $(net-y) 3956 VMLINUX_MAIN += $(drivers-y) $(net-y)
3957 3957
3958diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_32.c linux-2.6.32.11/arch/sparc/mm/fault_32.c 3958diff -urNp linux-2.6.32.12/arch/sparc/mm/fault_32.c linux-2.6.32.12/arch/sparc/mm/fault_32.c
3959--- linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400 3959--- linux-2.6.32.12/arch/sparc/mm/fault_32.c 2010-03-15 11:52:04.000000000 -0400
3960+++ linux-2.6.32.11/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400 3960+++ linux-2.6.32.12/arch/sparc/mm/fault_32.c 2010-04-04 20:46:41.496772577 -0400
3961@@ -21,6 +21,9 @@ 3961@@ -21,6 +21,9 @@
3962 #include <linux/interrupt.h> 3962 #include <linux/interrupt.h>
3963 #include <linux/module.h> 3963 #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
4261 /* Allow reads even for write-only mappings */ 4261 /* Allow reads even for write-only mappings */
4262 if(!(vma->vm_flags & (VM_READ | VM_EXEC))) 4262 if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
4263 goto bad_area; 4263 goto bad_area;
4264diff -urNp linux-2.6.32.11/arch/sparc/mm/fault_64.c linux-2.6.32.11/arch/sparc/mm/fault_64.c 4264diff -urNp linux-2.6.32.12/arch/sparc/mm/fault_64.c linux-2.6.32.12/arch/sparc/mm/fault_64.c
4265--- linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400 4265--- linux-2.6.32.12/arch/sparc/mm/fault_64.c 2010-03-15 11:52:04.000000000 -0400
4266+++ linux-2.6.32.11/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400 4266+++ linux-2.6.32.12/arch/sparc/mm/fault_64.c 2010-04-04 20:46:41.496772577 -0400
4267@@ -20,6 +20,9 @@ 4267@@ -20,6 +20,9 @@
4268 #include <linux/kprobes.h> 4268 #include <linux/kprobes.h>
4269 #include <linux/kdebug.h> 4269 #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
4761 /* Pure DTLB misses do not tell us whether the fault causing 4761 /* Pure DTLB misses do not tell us whether the fault causing
4762 * load/store/atomic was a write or not, it only says that there 4762 * load/store/atomic was a write or not, it only says that there
4763 * was no match. So in such a case we (carefully) read the 4763 * was no match. So in such a case we (carefully) read the
4764diff -urNp linux-2.6.32.11/arch/sparc/mm/init_32.c linux-2.6.32.11/arch/sparc/mm/init_32.c 4764diff -urNp linux-2.6.32.12/arch/sparc/mm/init_32.c linux-2.6.32.12/arch/sparc/mm/init_32.c
4765--- linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 4765--- linux-2.6.32.12/arch/sparc/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
4766+++ linux-2.6.32.11/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400 4766+++ linux-2.6.32.12/arch/sparc/mm/init_32.c 2010-04-04 20:46:41.496772577 -0400
4767@@ -317,6 +317,9 @@ extern void device_scan(void); 4767@@ -317,6 +317,9 @@ extern void device_scan(void);
4768 pgprot_t PAGE_SHARED __read_mostly; 4768 pgprot_t PAGE_SHARED __read_mostly;
4769 EXPORT_SYMBOL(PAGE_SHARED); 4769 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
4798 protection_map[12] = PAGE_READONLY; 4798 protection_map[12] = PAGE_READONLY;
4799 protection_map[13] = PAGE_READONLY; 4799 protection_map[13] = PAGE_READONLY;
4800 protection_map[14] = PAGE_SHARED; 4800 protection_map[14] = PAGE_SHARED;
4801diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/Makefile 4801diff -urNp linux-2.6.32.12/arch/sparc/mm/Makefile linux-2.6.32.12/arch/sparc/mm/Makefile
4802--- linux-2.6.32.11/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400 4802--- linux-2.6.32.12/arch/sparc/mm/Makefile 2010-03-15 11:52:04.000000000 -0400
4803+++ linux-2.6.32.11/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400 4803+++ linux-2.6.32.12/arch/sparc/mm/Makefile 2010-04-04 20:46:41.496772577 -0400
4804@@ -2,7 +2,7 @@ 4804@@ -2,7 +2,7 @@
4805 # 4805 #
4806 4806
@@ -4810,9 +4810,9 @@ diff -urNp linux-2.6.32.11/arch/sparc/mm/Makefile linux-2.6.32.11/arch/sparc/mm/
4810 4810
4811 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o 4811 obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o
4812 obj-y += fault_$(BITS).o 4812 obj-y += fault_$(BITS).o
4813diff -urNp linux-2.6.32.11/arch/sparc/mm/srmmu.c linux-2.6.32.11/arch/sparc/mm/srmmu.c 4813diff -urNp linux-2.6.32.12/arch/sparc/mm/srmmu.c linux-2.6.32.12/arch/sparc/mm/srmmu.c
4814--- linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400 4814--- linux-2.6.32.12/arch/sparc/mm/srmmu.c 2010-03-15 11:52:04.000000000 -0400
4815+++ linux-2.6.32.11/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -0400 4815+++ linux-2.6.32.12/arch/sparc/mm/srmmu.c 2010-04-04 20:46:41.496772577 -0400
4816@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void) 4816@@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
4817 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); 4817 PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
4818 BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); 4818 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
4827 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); 4827 BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
4828 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); 4828 page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
4829 4829
4830diff -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 4830diff -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
4831--- linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 4831--- linux-2.6.32.12/arch/um/include/asm/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
4832+++ linux-2.6.32.11/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400 4832+++ linux-2.6.32.12/arch/um/include/asm/kmap_types.h 2010-04-04 20:46:41.496772577 -0400
4833@@ -23,6 +23,7 @@ enum km_type { 4833@@ -23,6 +23,7 @@ enum km_type {
4834 KM_IRQ1, 4834 KM_IRQ1,
4835 KM_SOFTIRQ0, 4835 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
4838 KM_TYPE_NR 4838 KM_TYPE_NR
4839 }; 4839 };
4840 4840
4841diff -urNp linux-2.6.32.11/arch/um/include/asm/page.h linux-2.6.32.11/arch/um/include/asm/page.h 4841diff -urNp linux-2.6.32.12/arch/um/include/asm/page.h linux-2.6.32.12/arch/um/include/asm/page.h
4842--- linux-2.6.32.11/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400 4842--- linux-2.6.32.12/arch/um/include/asm/page.h 2010-03-15 11:52:04.000000000 -0400
4843+++ linux-2.6.32.11/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400 4843+++ linux-2.6.32.12/arch/um/include/asm/page.h 2010-04-04 20:46:41.496772577 -0400
4844@@ -14,6 +14,9 @@ 4844@@ -14,6 +14,9 @@
4845 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) 4845 #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
4846 #define PAGE_MASK (~(PAGE_SIZE-1)) 4846 #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
4851 #ifndef __ASSEMBLY__ 4851 #ifndef __ASSEMBLY__
4852 4852
4853 struct page; 4853 struct page;
4854diff -urNp linux-2.6.32.11/arch/um/sys-i386/syscalls.c linux-2.6.32.11/arch/um/sys-i386/syscalls.c 4854diff -urNp linux-2.6.32.12/arch/um/sys-i386/syscalls.c linux-2.6.32.12/arch/um/sys-i386/syscalls.c
4855--- linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400 4855--- linux-2.6.32.12/arch/um/sys-i386/syscalls.c 2010-03-15 11:52:04.000000000 -0400
4856+++ linux-2.6.32.11/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400 4856+++ linux-2.6.32.12/arch/um/sys-i386/syscalls.c 2010-04-04 20:46:41.496772577 -0400
4857@@ -11,6 +11,21 @@ 4857@@ -11,6 +11,21 @@
4858 #include "asm/uaccess.h" 4858 #include "asm/uaccess.h"
4859 #include "asm/unistd.h" 4859 #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
4876 /* 4876 /*
4877 * Perform the select(nd, in, out, ex, tv) and mmap() system 4877 * Perform the select(nd, in, out, ex, tv) and mmap() system
4878 * calls. Linux/i386 didn't use to be able to handle more than 4878 * calls. Linux/i386 didn't use to be able to handle more than
4879diff -urNp linux-2.6.32.11/arch/x86/boot/bitops.h linux-2.6.32.11/arch/x86/boot/bitops.h 4879diff -urNp linux-2.6.32.12/arch/x86/boot/bitops.h linux-2.6.32.12/arch/x86/boot/bitops.h
4880--- linux-2.6.32.11/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400 4880--- linux-2.6.32.12/arch/x86/boot/bitops.h 2010-03-15 11:52:04.000000000 -0400
4881+++ linux-2.6.32.11/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400 4881+++ linux-2.6.32.12/arch/x86/boot/bitops.h 2010-04-04 20:46:41.496772577 -0400
4882@@ -26,7 +26,7 @@ static inline int variable_test_bit(int 4882@@ -26,7 +26,7 @@ static inline int variable_test_bit(int
4883 u8 v; 4883 u8 v;
4884 const u32 *p = (const u32 *)addr; 4884 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/
4897 } 4897 }
4898 4898
4899 #endif /* BOOT_BITOPS_H */ 4899 #endif /* BOOT_BITOPS_H */
4900diff -urNp linux-2.6.32.11/arch/x86/boot/boot.h linux-2.6.32.11/arch/x86/boot/boot.h 4900diff -urNp linux-2.6.32.12/arch/x86/boot/boot.h linux-2.6.32.12/arch/x86/boot/boot.h
4901--- linux-2.6.32.11/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400 4901--- linux-2.6.32.12/arch/x86/boot/boot.h 2010-03-15 11:52:04.000000000 -0400
4902+++ linux-2.6.32.11/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400 4902+++ linux-2.6.32.12/arch/x86/boot/boot.h 2010-04-04 20:46:41.496772577 -0400
4903@@ -82,7 +82,7 @@ static inline void io_delay(void) 4903@@ -82,7 +82,7 @@ static inline void io_delay(void)
4904 static inline u16 ds(void) 4904 static inline u16 ds(void)
4905 { 4905 {
@@ -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
4918 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); 4918 : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
4919 return diff; 4919 return diff;
4920 } 4920 }
4921diff -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 4921diff -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
4922--- linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400 4922--- linux-2.6.32.12/arch/x86/boot/compressed/head_32.S 2010-03-15 11:52:04.000000000 -0400
4923+++ linux-2.6.32.11/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400 4923+++ linux-2.6.32.12/arch/x86/boot/compressed/head_32.S 2010-04-04 20:46:41.496772577 -0400
4924@@ -76,7 +76,7 @@ ENTRY(startup_32) 4924@@ -76,7 +76,7 @@ ENTRY(startup_32)
4925 notl %eax 4925 notl %eax
4926 andl %eax, %ebx 4926 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
4949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) 4949 addl %ebx, -__PAGE_OFFSET(%ebx, %ecx)
4950 jmp 1b 4950 jmp 1b
4951 2: 4951 2:
4952diff -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 4952diff -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
4953--- linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400 4953--- linux-2.6.32.12/arch/x86/boot/compressed/head_64.S 2010-03-15 11:52:04.000000000 -0400
4954+++ linux-2.6.32.11/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400 4954+++ linux-2.6.32.12/arch/x86/boot/compressed/head_64.S 2010-04-04 20:46:41.496772577 -0400
4955@@ -91,7 +91,7 @@ ENTRY(startup_32) 4955@@ -91,7 +91,7 @@ ENTRY(startup_32)
4956 notl %eax 4956 notl %eax
4957 andl %eax, %ebx 4957 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
4970 #endif 4970 #endif
4971 4971
4972 /* Target address to relocate to for decompression */ 4972 /* Target address to relocate to for decompression */
4973diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/misc.c linux-2.6.32.11/arch/x86/boot/compressed/misc.c 4973diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/misc.c linux-2.6.32.12/arch/x86/boot/compressed/misc.c
4974--- linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400 4974--- linux-2.6.32.12/arch/x86/boot/compressed/misc.c 2010-03-15 11:52:04.000000000 -0400
4975+++ linux-2.6.32.11/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400 4975+++ linux-2.6.32.12/arch/x86/boot/compressed/misc.c 2010-04-04 20:46:41.496772577 -0400
4976@@ -288,7 +288,7 @@ static void parse_elf(void *output) 4976@@ -288,7 +288,7 @@ static void parse_elf(void *output)
4977 case PT_LOAD: 4977 case PT_LOAD:
4978 #ifdef CONFIG_RELOCATABLE 4978 #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/
4991 error("Wrong destination address"); 4991 error("Wrong destination address");
4992 #endif 4992 #endif
4993 4993
4994diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 4994diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c
4995--- linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400 4995--- linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c 2010-03-15 11:52:04.000000000 -0400
4996+++ linux-2.6.32.11/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400 4996+++ linux-2.6.32.12/arch/x86/boot/compressed/mkpiggy.c 2010-04-04 20:46:41.496772577 -0400
4997@@ -74,7 +74,7 @@ int main(int argc, char *argv[]) 4997@@ -74,7 +74,7 @@ int main(int argc, char *argv[])
4998 4998
4999 offs = (olen > ilen) ? olen - ilen : 0; 4999 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
5003 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */ 5003 offs = (offs+4095) & ~4095; /* Round to a 4K boundary */
5004 5004
5005 printf(".section \".rodata.compressed\",\"a\",@progbits\n"); 5005 printf(".section \".rodata.compressed\",\"a\",@progbits\n");
5006diff -urNp linux-2.6.32.11/arch/x86/boot/compressed/relocs.c linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 5006diff -urNp linux-2.6.32.12/arch/x86/boot/compressed/relocs.c linux-2.6.32.12/arch/x86/boot/compressed/relocs.c
5007--- linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400 5007--- linux-2.6.32.12/arch/x86/boot/compressed/relocs.c 2010-03-15 11:52:04.000000000 -0400
5008+++ linux-2.6.32.11/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400 5008+++ linux-2.6.32.12/arch/x86/boot/compressed/relocs.c 2010-04-04 20:46:41.500459645 -0400
5009@@ -10,8 +10,11 @@ 5009@@ -10,8 +10,11 @@
5010 #define USE_BSD 5010 #define USE_BSD
5011 #include <endian.h> 5011 #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
5206 read_shdrs(fp); 5206 read_shdrs(fp);
5207 read_strtabs(fp); 5207 read_strtabs(fp);
5208 read_symtabs(fp); 5208 read_symtabs(fp);
5209diff -urNp linux-2.6.32.11/arch/x86/boot/cpucheck.c linux-2.6.32.11/arch/x86/boot/cpucheck.c 5209diff -urNp linux-2.6.32.12/arch/x86/boot/cpucheck.c linux-2.6.32.12/arch/x86/boot/cpucheck.c
5210--- linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400 5210--- linux-2.6.32.12/arch/x86/boot/cpucheck.c 2010-03-15 11:52:04.000000000 -0400
5211+++ linux-2.6.32.11/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400 5211+++ linux-2.6.32.12/arch/x86/boot/cpucheck.c 2010-04-04 20:46:41.500459645 -0400
5212@@ -74,7 +74,7 @@ static int has_fpu(void) 5212@@ -74,7 +74,7 @@ static int has_fpu(void)
5213 u16 fcw = -1, fsw = -1; 5213 u16 fcw = -1, fsw = -1;
5214 u32 cr0; 5214 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
5304 5304
5305 err = check_flags(); 5305 err = check_flags();
5306 } 5306 }
5307diff -urNp linux-2.6.32.11/arch/x86/boot/header.S linux-2.6.32.11/arch/x86/boot/header.S 5307diff -urNp linux-2.6.32.12/arch/x86/boot/header.S linux-2.6.32.12/arch/x86/boot/header.S
5308--- linux-2.6.32.11/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400 5308--- linux-2.6.32.12/arch/x86/boot/header.S 2010-03-15 11:52:04.000000000 -0400
5309+++ linux-2.6.32.11/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400 5309+++ linux-2.6.32.12/arch/x86/boot/header.S 2010-04-04 20:46:41.500459645 -0400
5310@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical 5310@@ -224,7 +224,7 @@ setup_data: .quad 0 # 64-bit physical
5311 # single linked list of 5311 # single linked list of
5312 # struct setup_data 5312 # 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/
5316 5316
5317 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset) 5317 #define ZO_INIT_SIZE (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
5318 #define VO_INIT_SIZE (VO__end - VO__text) 5318 #define VO_INIT_SIZE (VO__end - VO__text)
5319diff -urNp linux-2.6.32.11/arch/x86/boot/video-vesa.c linux-2.6.32.11/arch/x86/boot/video-vesa.c 5319diff -urNp linux-2.6.32.12/arch/x86/boot/memory.c linux-2.6.32.12/arch/x86/boot/memory.c
5320--- linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400 5320--- linux-2.6.32.12/arch/x86/boot/memory.c 2010-03-15 11:52:04.000000000 -0400
5321+++ linux-2.6.32.11/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400 5321+++ linux-2.6.32.12/arch/x86/boot/memory.c 2010-04-29 17:46:37.065247062 -0400
5322@@ -19,7 +19,7 @@
5323
5324 static int detect_memory_e820(void)
5325 {
5326- int count = 0;
5327+ unsigned int count = 0;
5328 struct biosregs ireg, oreg;
5329 struct e820entry *desc = boot_params.e820_map;
5330 static struct e820entry buf; /* static so it is zeroed */
5331diff -urNp linux-2.6.32.12/arch/x86/boot/video.c linux-2.6.32.12/arch/x86/boot/video.c
5332--- linux-2.6.32.12/arch/x86/boot/video.c 2010-03-15 11:52:04.000000000 -0400
5333+++ linux-2.6.32.12/arch/x86/boot/video.c 2010-04-29 17:46:37.069058404 -0400
5334@@ -90,7 +90,7 @@ static void store_mode_params(void)
5335 static unsigned int get_entry(void)
5336 {
5337 char entry_buf[4];
5338- int i, len = 0;
5339+ unsigned int i, len = 0;
5340 int key;
5341 unsigned int v;
5342
5343diff -urNp linux-2.6.32.12/arch/x86/boot/video-vesa.c linux-2.6.32.12/arch/x86/boot/video-vesa.c
5344--- linux-2.6.32.12/arch/x86/boot/video-vesa.c 2010-03-15 11:52:04.000000000 -0400
5345+++ linux-2.6.32.12/arch/x86/boot/video-vesa.c 2010-04-04 20:46:41.500459645 -0400
5322@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void) 5346@@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
5323 5347
5324 boot_params.screen_info.vesapm_seg = oreg.es; 5348 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
5327 } 5351 }
5328 5352
5329 /* 5353 /*
5330diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32entry.S linux-2.6.32.11/arch/x86/ia32/ia32entry.S 5354diff -urNp linux-2.6.32.12/arch/x86/ia32/ia32entry.S linux-2.6.32.12/arch/x86/ia32/ia32entry.S
5331--- linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400 5355--- linux-2.6.32.12/arch/x86/ia32/ia32entry.S 2010-03-15 11:52:04.000000000 -0400
5332+++ linux-2.6.32.11/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400 5356+++ linux-2.6.32.12/arch/x86/ia32/ia32entry.S 2010-04-04 20:58:33.225084964 -0400
5333@@ -13,6 +13,7 @@ 5357@@ -13,6 +13,7 @@
5334 #include <asm/thread_info.h> 5358 #include <asm/thread_info.h>
5335 #include <asm/segment.h> 5359 #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
5424 /* 5448 /*
5425 * No need to follow this irqs on/off section: the syscall 5449 * No need to follow this irqs on/off section: the syscall
5426 * disabled irqs and here we enable it straight after entry: 5450 * disabled irqs and here we enable it straight after entry:
5427diff -urNp linux-2.6.32.11/arch/x86/ia32/ia32_signal.c linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 5451diff -urNp linux-2.6.32.12/arch/x86/ia32/ia32_signal.c linux-2.6.32.12/arch/x86/ia32/ia32_signal.c
5428--- linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400 5452--- linux-2.6.32.12/arch/x86/ia32/ia32_signal.c 2010-03-15 11:52:04.000000000 -0400
5429+++ linux-2.6.32.11/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400 5453+++ linux-2.6.32.12/arch/x86/ia32/ia32_signal.c 2010-04-04 20:46:41.500459645 -0400
5430@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 5454@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct
5431 sp -= frame_size; 5455 sp -= frame_size;
5432 /* Align the stack pointer according to the i386 ABI, 5456 /* 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/
5445 }; 5469 };
5446 5470
5447 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); 5471 frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate);
5448diff -urNp linux-2.6.32.11/arch/x86/include/asm/alternative.h linux-2.6.32.11/arch/x86/include/asm/alternative.h 5472diff -urNp linux-2.6.32.12/arch/x86/include/asm/alternative.h linux-2.6.32.12/arch/x86/include/asm/alternative.h
5449--- linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400 5473--- linux-2.6.32.12/arch/x86/include/asm/alternative.h 2010-03-15 11:52:04.000000000 -0400
5450+++ linux-2.6.32.11/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400 5474+++ linux-2.6.32.12/arch/x86/include/asm/alternative.h 2010-04-04 20:46:41.500459645 -0400
5451@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit 5475@@ -85,7 +85,7 @@ static inline void alternatives_smp_swit
5452 " .byte 662b-661b\n" /* sourcelen */ \ 5476 " .byte 662b-661b\n" /* sourcelen */ \
5453 " .byte 664f-663f\n" /* replacementlen */ \ 5477 " .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
5457 "663:\n\t" newinstr "\n664:\n" /* replacement */ \ 5481 "663:\n\t" newinstr "\n664:\n" /* replacement */ \
5458 ".previous" 5482 ".previous"
5459 5483
5460diff -urNp linux-2.6.32.11/arch/x86/include/asm/apm.h linux-2.6.32.11/arch/x86/include/asm/apm.h 5484diff -urNp linux-2.6.32.12/arch/x86/include/asm/apm.h linux-2.6.32.12/arch/x86/include/asm/apm.h
5461--- linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400 5485--- linux-2.6.32.12/arch/x86/include/asm/apm.h 2010-03-15 11:52:04.000000000 -0400
5462+++ linux-2.6.32.11/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400 5486+++ linux-2.6.32.12/arch/x86/include/asm/apm.h 2010-04-04 20:46:41.500459645 -0400
5463@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 5487@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
5464 __asm__ __volatile__(APM_DO_ZERO_SEGS 5488 __asm__ __volatile__(APM_DO_ZERO_SEGS
5465 "pushl %%edi\n\t" 5489 "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
5478 "setc %%bl\n\t" 5502 "setc %%bl\n\t"
5479 "popl %%ebp\n\t" 5503 "popl %%ebp\n\t"
5480 "popl %%edi\n\t" 5504 "popl %%edi\n\t"
5481diff -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 5505diff -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
5482--- linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400 5506--- linux-2.6.32.12/arch/x86/include/asm/atomic_32.h 2010-03-15 11:52:04.000000000 -0400
5483+++ linux-2.6.32.11/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400 5507+++ linux-2.6.32.12/arch/x86/include/asm/atomic_32.h 2010-04-04 20:46:41.500459645 -0400
5484@@ -25,6 +25,17 @@ static inline int atomic_read(const atom 5508@@ -25,6 +25,17 @@ static inline int atomic_read(const atom
5485 } 5509 }
5486 5510
@@ -5811,9 +5835,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_32.h linux-2.6.32.11/arch
5811 #define ATOMIC64_INIT(val) { (val) } 5835 #define ATOMIC64_INIT(val) { (val) }
5812 5836
5813 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val); 5837 extern u64 atomic64_cmpxchg(atomic64_t *ptr, u64 old_val, u64 new_val);
5814diff -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 5838diff -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
5815--- linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400 5839--- linux-2.6.32.12/arch/x86/include/asm/atomic_64.h 2010-03-15 11:52:04.000000000 -0400
5816+++ linux-2.6.32.11/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400 5840+++ linux-2.6.32.12/arch/x86/include/asm/atomic_64.h 2010-04-04 20:46:41.500459645 -0400
5817@@ -24,6 +24,17 @@ static inline int atomic_read(const atom 5841@@ -24,6 +24,17 @@ static inline int atomic_read(const atom
5818 } 5842 }
5819 5843
@@ -6391,9 +6415,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/atomic_64.h linux-2.6.32.11/arch
6391 } 6415 }
6392 6416
6393 /** 6417 /**
6394diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/include/asm/boot.h 6418diff -urNp linux-2.6.32.12/arch/x86/include/asm/boot.h linux-2.6.32.12/arch/x86/include/asm/boot.h
6395--- linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400 6419--- linux-2.6.32.12/arch/x86/include/asm/boot.h 2010-03-15 11:52:04.000000000 -0400
6396+++ linux-2.6.32.11/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400 6420+++ linux-2.6.32.12/arch/x86/include/asm/boot.h 2010-04-04 20:46:41.500459645 -0400
6397@@ -11,10 +11,15 @@ 6421@@ -11,10 +11,15 @@
6398 #include <asm/pgtable_types.h> 6422 #include <asm/pgtable_types.h>
6399 6423
@@ -6411,9 +6435,30 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/boot.h linux-2.6.32.11/arch/x86/
6411 /* Minimum kernel alignment, as a power of two */ 6435 /* Minimum kernel alignment, as a power of two */
6412 #ifdef CONFIG_X86_64 6436 #ifdef CONFIG_X86_64
6413 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT 6437 #define MIN_KERNEL_ALIGN_LG2 PMD_SHIFT
6414diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86/include/asm/cache.h 6438diff -urNp linux-2.6.32.12/arch/x86/include/asm/cacheflush.h linux-2.6.32.12/arch/x86/include/asm/cacheflush.h
6415--- linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400 6439--- linux-2.6.32.12/arch/x86/include/asm/cacheflush.h 2010-03-15 11:52:04.000000000 -0400
6416+++ linux-2.6.32.11/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400 6440+++ linux-2.6.32.12/arch/x86/include/asm/cacheflush.h 2010-04-29 17:46:37.069058404 -0400
6441@@ -60,7 +60,7 @@ PAGEFLAG(WC, WC)
6442 static inline unsigned long get_page_memtype(struct page *pg)
6443 {
6444 if (!PageUncached(pg) && !PageWC(pg))
6445- return -1;
6446+ return ~0UL;
6447 else if (!PageUncached(pg) && PageWC(pg))
6448 return _PAGE_CACHE_WC;
6449 else if (PageUncached(pg) && !PageWC(pg))
6450@@ -85,7 +85,7 @@ static inline void set_page_memtype(stru
6451 SetPageWC(pg);
6452 break;
6453 default:
6454- case -1:
6455+ case ~0UL:
6456 ClearPageUncached(pg);
6457 ClearPageWC(pg);
6458 break;
6459diff -urNp linux-2.6.32.12/arch/x86/include/asm/cache.h linux-2.6.32.12/arch/x86/include/asm/cache.h
6460--- linux-2.6.32.12/arch/x86/include/asm/cache.h 2010-03-15 11:52:04.000000000 -0400
6461+++ linux-2.6.32.12/arch/x86/include/asm/cache.h 2010-04-04 20:46:41.500459645 -0400
6417@@ -8,6 +8,7 @@ 6462@@ -8,6 +8,7 @@
6418 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) 6463 #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT)
6419 6464
@@ -6422,9 +6467,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/cache.h linux-2.6.32.11/arch/x86
6422 6467
6423 #ifdef CONFIG_X86_VSMP 6468 #ifdef CONFIG_X86_VSMP
6424 /* vSMP Internode cacheline shift */ 6469 /* vSMP Internode cacheline shift */
6425diff -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 6470diff -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
6426--- linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400 6471--- linux-2.6.32.12/arch/x86/include/asm/checksum_32.h 2010-03-15 11:52:04.000000000 -0400
6427+++ linux-2.6.32.11/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400 6472+++ linux-2.6.32.12/arch/x86/include/asm/checksum_32.h 2010-04-04 20:46:41.500459645 -0400
6428@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene 6473@@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
6429 int len, __wsum sum, 6474 int len, __wsum sum,
6430 int *src_err_ptr, int *dst_err_ptr); 6475 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
6458 len, sum, NULL, err_ptr); 6503 len, sum, NULL, err_ptr);
6459 6504
6460 if (len) 6505 if (len)
6461diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/include/asm/desc.h 6506diff -urNp linux-2.6.32.12/arch/x86/include/asm/desc.h linux-2.6.32.12/arch/x86/include/asm/desc.h
6462--- linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400 6507--- linux-2.6.32.12/arch/x86/include/asm/desc.h 2010-03-15 11:52:04.000000000 -0400
6463+++ linux-2.6.32.11/arch/x86/include/asm/desc.h 2010-04-04 20:46:41.500459645 -0400 6508+++ linux-2.6.32.12/arch/x86/include/asm/desc.h 2010-04-29 17:46:36.819981711 -0400
6464@@ -4,6 +4,7 @@ 6509@@ -4,6 +4,7 @@
6465 #include <asm/desc_defs.h> 6510 #include <asm/desc_defs.h>
6466 #include <asm/ldt.h> 6511 #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/
6554 } 6599 }
6555 6600
6556 #define _LDT_empty(info) \ 6601 #define _LDT_empty(info) \
6557@@ -392,4 +402,16 @@ static inline void set_system_intr_gate_ 6602@@ -309,7 +319,7 @@ static inline void set_desc_limit(struct
6603 desc->limit = (limit >> 16) & 0xf;
6604 }
6605
6606-static inline void _set_gate(int gate, unsigned type, void *addr,
6607+static inline void _set_gate(int gate, unsigned type, const void *addr,
6608 unsigned dpl, unsigned ist, unsigned seg)
6609 {
6610 gate_desc s;
6611@@ -327,7 +337,7 @@ static inline void _set_gate(int gate, u
6612 * Pentium F0 0F bugfix can have resulted in the mapped
6613 * IDT being write-protected.
6614 */
6615-static inline void set_intr_gate(unsigned int n, void *addr)
6616+static inline void set_intr_gate(unsigned int n, const void *addr)
6617 {
6618 BUG_ON((unsigned)n > 0xFF);
6619 _set_gate(n, GATE_INTERRUPT, addr, 0, 0, __KERNEL_CS);
6620@@ -356,19 +366,19 @@ static inline void alloc_intr_gate(unsig
6621 /*
6622 * This routine sets up an interrupt gate at directory privilege level 3.
6623 */
6624-static inline void set_system_intr_gate(unsigned int n, void *addr)
6625+static inline void set_system_intr_gate(unsigned int n, const void *addr)
6626 {
6627 BUG_ON((unsigned)n > 0xFF);
6628 _set_gate(n, GATE_INTERRUPT, addr, 0x3, 0, __KERNEL_CS);
6629 }
6630
6631-static inline void set_system_trap_gate(unsigned int n, void *addr)
6632+static inline void set_system_trap_gate(unsigned int n, const void *addr)
6633 {
6634 BUG_ON((unsigned)n > 0xFF);
6635 _set_gate(n, GATE_TRAP, addr, 0x3, 0, __KERNEL_CS);
6636 }
6637
6638-static inline void set_trap_gate(unsigned int n, void *addr)
6639+static inline void set_trap_gate(unsigned int n, const void *addr)
6640 {
6641 BUG_ON((unsigned)n > 0xFF);
6642 _set_gate(n, GATE_TRAP, addr, 0, 0, __KERNEL_CS);
6643@@ -377,19 +387,31 @@ static inline void set_trap_gate(unsigne
6644 static inline void set_task_gate(unsigned int n, unsigned int gdt_entry)
6645 {
6646 BUG_ON((unsigned)n > 0xFF);
6647- _set_gate(n, GATE_TASK, (void *)0, 0, 0, (gdt_entry<<3));
6648+ _set_gate(n, GATE_TASK, (const void *)0, 0, 0, (gdt_entry<<3));
6649 }
6650
6651-static inline void set_intr_gate_ist(int n, void *addr, unsigned ist)
6652+static inline void set_intr_gate_ist(int n, const void *addr, unsigned ist)
6653 {
6654 BUG_ON((unsigned)n > 0xFF);
6655 _set_gate(n, GATE_INTERRUPT, addr, 0, ist, __KERNEL_CS);
6656 }
6657
6658-static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
6659+static inline void set_system_intr_gate_ist(int n, const void *addr, unsigned ist)
6660 {
6661 BUG_ON((unsigned)n > 0xFF);
6558 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); 6662 _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS);
6559 } 6663 }
6560 6664
@@ -6571,9 +6675,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/desc.h linux-2.6.32.11/arch/x86/
6571+#endif 6675+#endif
6572+ 6676+
6573 #endif /* _ASM_X86_DESC_H */ 6677 #endif /* _ASM_X86_DESC_H */
6574diff -urNp linux-2.6.32.11/arch/x86/include/asm/device.h linux-2.6.32.11/arch/x86/include/asm/device.h 6678diff -urNp linux-2.6.32.12/arch/x86/include/asm/device.h linux-2.6.32.12/arch/x86/include/asm/device.h
6575--- linux-2.6.32.11/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400 6679--- linux-2.6.32.12/arch/x86/include/asm/device.h 2010-03-15 11:52:04.000000000 -0400
6576+++ linux-2.6.32.11/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400 6680+++ linux-2.6.32.12/arch/x86/include/asm/device.h 2010-04-04 20:46:41.500459645 -0400
6577@@ -6,7 +6,7 @@ struct dev_archdata { 6681@@ -6,7 +6,7 @@ struct dev_archdata {
6578 void *acpi_handle; 6682 void *acpi_handle;
6579 #endif 6683 #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
6583 #endif 6687 #endif
6584 #ifdef CONFIG_DMAR 6688 #ifdef CONFIG_DMAR
6585 void *iommu; /* hook for IOMMU specific extension */ 6689 void *iommu; /* hook for IOMMU specific extension */
6586diff -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 6690diff -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
6587--- linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 6691--- linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
6588+++ linux-2.6.32.11/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400 6692+++ linux-2.6.32.12/arch/x86/include/asm/dma-mapping.h 2010-04-04 20:46:41.500459645 -0400
6589@@ -25,9 +25,9 @@ extern int iommu_merge; 6693@@ -25,9 +25,9 @@ extern int iommu_merge;
6590 extern struct device x86_dma_fallback_dev; 6694 extern struct device x86_dma_fallback_dev;
6591 extern int panic_on_overflow; 6695 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
6625 6729
6626 WARN_ON(irqs_disabled()); /* for portability */ 6730 WARN_ON(irqs_disabled()); /* for portability */
6627 6731
6628diff -urNp linux-2.6.32.11/arch/x86/include/asm/e820.h linux-2.6.32.11/arch/x86/include/asm/e820.h 6732diff -urNp linux-2.6.32.12/arch/x86/include/asm/e820.h linux-2.6.32.12/arch/x86/include/asm/e820.h
6629--- linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400 6733--- linux-2.6.32.12/arch/x86/include/asm/e820.h 2010-03-15 11:52:04.000000000 -0400
6630+++ linux-2.6.32.11/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -0400 6734+++ linux-2.6.32.12/arch/x86/include/asm/e820.h 2010-04-04 20:46:41.500459645 -0400
6631@@ -133,7 +133,7 @@ extern char *default_machine_specific_me 6735@@ -133,7 +133,7 @@ extern char *default_machine_specific_me
6632 #define ISA_END_ADDRESS 0x100000 6736 #define ISA_END_ADDRESS 0x100000
6633 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) 6737 #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/
6637 #define BIOS_END 0x00100000 6741 #define BIOS_END 0x00100000
6638 6742
6639 #ifdef __KERNEL__ 6743 #ifdef __KERNEL__
6640diff -urNp linux-2.6.32.11/arch/x86/include/asm/elf.h linux-2.6.32.11/arch/x86/include/asm/elf.h 6744diff -urNp linux-2.6.32.12/arch/x86/include/asm/elf.h linux-2.6.32.12/arch/x86/include/asm/elf.h
6641--- linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400 6745--- linux-2.6.32.12/arch/x86/include/asm/elf.h 2010-03-15 11:52:04.000000000 -0400
6642+++ linux-2.6.32.11/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -0400 6746+++ linux-2.6.32.12/arch/x86/include/asm/elf.h 2010-04-04 20:58:33.220592413 -0400
6643@@ -257,7 +257,25 @@ extern int force_personality32; 6747@@ -257,7 +257,25 @@ extern int force_personality32;
6644 the loader. We need to make sure that it is out of the way of the program 6748 the loader. We need to make sure that it is out of the way of the program
6645 that it will "exec", and that there is sufficient room for the brk. */ 6749 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
6693-#define arch_randomize_brk arch_randomize_brk 6797-#define arch_randomize_brk arch_randomize_brk
6694- 6798-
6695 #endif /* _ASM_X86_ELF_H */ 6799 #endif /* _ASM_X86_ELF_H */
6696diff -urNp linux-2.6.32.11/arch/x86/include/asm/futex.h linux-2.6.32.11/arch/x86/include/asm/futex.h 6800diff -urNp linux-2.6.32.12/arch/x86/include/asm/futex.h linux-2.6.32.12/arch/x86/include/asm/futex.h
6697--- linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400 6801--- linux-2.6.32.12/arch/x86/include/asm/futex.h 2010-03-15 11:52:04.000000000 -0400
6698+++ linux-2.6.32.11/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400 6802+++ linux-2.6.32.12/arch/x86/include/asm/futex.h 2010-04-04 20:58:33.220592413 -0400
6699@@ -11,17 +11,54 @@ 6803@@ -11,17 +11,54 @@
6700 #include <asm/processor.h> 6804 #include <asm/processor.h>
6701 #include <asm/system.h> 6805 #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
6832 : "memory" 6936 : "memory"
6833 ); 6937 );
6834 6938
6835diff -urNp linux-2.6.32.11/arch/x86/include/asm/i387.h linux-2.6.32.11/arch/x86/include/asm/i387.h 6939diff -urNp linux-2.6.32.12/arch/x86/include/asm/i387.h linux-2.6.32.12/arch/x86/include/asm/i387.h
6836--- linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400 6940--- linux-2.6.32.12/arch/x86/include/asm/i387.h 2010-03-15 11:52:04.000000000 -0400
6837+++ linux-2.6.32.11/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400 6941+++ linux-2.6.32.12/arch/x86/include/asm/i387.h 2010-04-04 20:58:33.220592413 -0400
6838@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc 6942@@ -60,6 +60,11 @@ static inline int fxrstor_checking(struc
6839 { 6943 {
6840 int err; 6944 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/
6875 6979
6876 /* 6980 /*
6877 * These must be called with preempt disabled 6981 * These must be called with preempt disabled
6878diff -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 6982diff -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
6879--- linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400 6983--- linux-2.6.32.12/arch/x86/include/asm/io_64.h 2010-03-15 11:52:04.000000000 -0400
6880+++ linux-2.6.32.11/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400 6984+++ linux-2.6.32.12/arch/x86/include/asm/io_64.h 2010-04-04 20:46:41.500459645 -0400
6881@@ -140,6 +140,17 @@ __OUTS(l) 6985@@ -140,6 +140,17 @@ __OUTS(l)
6882 6986
6883 #include <linux/vmalloc.h> 6987 #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
6896 #include <asm-generic/iomap.h> 7000 #include <asm-generic/iomap.h>
6897 7001
6898 void __memcpy_fromio(void *, unsigned long, unsigned); 7002 void __memcpy_fromio(void *, unsigned long, unsigned);
6899diff -urNp linux-2.6.32.11/arch/x86/include/asm/iommu.h linux-2.6.32.11/arch/x86/include/asm/iommu.h 7003diff -urNp linux-2.6.32.12/arch/x86/include/asm/iommu.h linux-2.6.32.12/arch/x86/include/asm/iommu.h
6900--- linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400 7004--- linux-2.6.32.12/arch/x86/include/asm/iommu.h 2010-03-15 11:52:04.000000000 -0400
6901+++ linux-2.6.32.11/arch/x86/include/asm/iommu.h 2010-04-04 20:46:41.500459645 -0400 7005+++ linux-2.6.32.12/arch/x86/include/asm/iommu.h 2010-04-04 20:46:41.500459645 -0400
6902@@ -3,7 +3,7 @@ 7006@@ -3,7 +3,7 @@
6903 7007
6904 extern void pci_iommu_shutdown(void); 7008 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
6908 extern int force_iommu, no_iommu; 7012 extern int force_iommu, no_iommu;
6909 extern int iommu_detected; 7013 extern int iommu_detected;
6910 extern int iommu_pass_through; 7014 extern int iommu_pass_through;
6911diff -urNp linux-2.6.32.11/arch/x86/include/asm/irqflags.h linux-2.6.32.11/arch/x86/include/asm/irqflags.h 7015diff -urNp linux-2.6.32.12/arch/x86/include/asm/irqflags.h linux-2.6.32.12/arch/x86/include/asm/irqflags.h
6912--- linux-2.6.32.11/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400 7016--- linux-2.6.32.12/arch/x86/include/asm/irqflags.h 2010-03-15 11:52:04.000000000 -0400
6913+++ linux-2.6.32.11/arch/x86/include/asm/irqflags.h 2010-04-07 19:33:06.601891934 -0400 7017+++ linux-2.6.32.12/arch/x86/include/asm/irqflags.h 2010-04-07 19:33:06.601891934 -0400
6914@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_ 7018@@ -142,6 +142,11 @@ static inline unsigned long __raw_local_
6915 sti; \ 7019 sti; \
6916 sysexit 7020 sysexit
@@ -6923,10 +7027,10 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/irqflags.h linux-2.6.32.11/arch/
6923 #else 7027 #else
6924 #define INTERRUPT_RETURN iret 7028 #define INTERRUPT_RETURN iret
6925 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit 7029 #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit
6926diff -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 7030diff -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
6927--- linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-03-15 11:52:04.000000000 -0400 7031--- linux-2.6.32.12/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:37.497949072 -0400
6928+++ linux-2.6.32.11/arch/x86/include/asm/kvm_host.h 2010-04-04 20:46:41.500459645 -0400 7032+++ linux-2.6.32.12/arch/x86/include/asm/kvm_host.h 2010-04-29 17:49:57.941485514 -0400
6929@@ -531,7 +531,7 @@ struct kvm_x86_ops { 7033@@ -532,7 +532,7 @@ struct kvm_x86_ops {
6930 const struct trace_print_flags *exit_reasons_str; 7034 const struct trace_print_flags *exit_reasons_str;
6931 }; 7035 };
6932 7036
@@ -6935,9 +7039,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/kvm_host.h linux-2.6.32.11/arch/
6935 7039
6936 int kvm_mmu_module_init(void); 7040 int kvm_mmu_module_init(void);
6937 void kvm_mmu_module_exit(void); 7041 void kvm_mmu_module_exit(void);
6938diff -urNp linux-2.6.32.11/arch/x86/include/asm/local.h linux-2.6.32.11/arch/x86/include/asm/local.h 7042diff -urNp linux-2.6.32.12/arch/x86/include/asm/local.h linux-2.6.32.12/arch/x86/include/asm/local.h
6939--- linux-2.6.32.11/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400 7043--- linux-2.6.32.12/arch/x86/include/asm/local.h 2010-03-15 11:52:04.000000000 -0400
6940+++ linux-2.6.32.11/arch/x86/include/asm/local.h 2010-04-04 20:46:41.500459645 -0400 7044+++ linux-2.6.32.12/arch/x86/include/asm/local.h 2010-04-04 20:46:41.500459645 -0400
6941@@ -18,26 +18,90 @@ typedef struct { 7045@@ -18,26 +18,90 @@ typedef struct {
6942 7046
6943 static inline void local_inc(local_t *l) 7047 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
7162 : "+r" (i), "+m" (l->a.counter) 7266 : "+r" (i), "+m" (l->a.counter)
7163 : : "memory"); 7267 : : "memory");
7164 return i + __i; 7268 return i + __i;
7165diff -urNp linux-2.6.32.11/arch/x86/include/asm/microcode.h linux-2.6.32.11/arch/x86/include/asm/microcode.h 7269diff -urNp linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h
7166--- linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400 7270--- linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h 2010-03-15 11:52:04.000000000 -0400
7167+++ linux-2.6.32.11/arch/x86/include/asm/microcode.h 2010-04-04 20:46:41.500459645 -0400 7271+++ linux-2.6.32.12/arch/x86/include/asm/mc146818rtc.h 2010-04-29 17:46:37.069058404 -0400
7272@@ -81,8 +81,8 @@ static inline unsigned char current_lock
7273 #else
7274 #define lock_cmos_prefix(reg) do {} while (0)
7275 #define lock_cmos_suffix(reg) do {} while (0)
7276-#define lock_cmos(reg)
7277-#define unlock_cmos()
7278+#define lock_cmos(reg) do {} while (0)
7279+#define unlock_cmos() do {} while (0)
7280 #define do_i_have_lock_cmos() 0
7281 #define current_lock_cmos_reg() 0
7282 #endif
7283diff -urNp linux-2.6.32.12/arch/x86/include/asm/microcode.h linux-2.6.32.12/arch/x86/include/asm/microcode.h
7284--- linux-2.6.32.12/arch/x86/include/asm/microcode.h 2010-03-15 11:52:04.000000000 -0400
7285+++ linux-2.6.32.12/arch/x86/include/asm/microcode.h 2010-04-04 20:46:41.500459645 -0400
7168@@ -12,13 +12,13 @@ struct device; 7286@@ -12,13 +12,13 @@ struct device;
7169 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND }; 7287 enum ucode_state { UCODE_ERROR, UCODE_OK, UCODE_NFOUND };
7170 7288
@@ -7205,9 +7323,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/microcode.h linux-2.6.32.11/arch
7205 { 7323 {
7206 return NULL; 7324 return NULL;
7207 } 7325 }
7208diff -urNp linux-2.6.32.11/arch/x86/include/asm/mman.h linux-2.6.32.11/arch/x86/include/asm/mman.h 7326diff -urNp linux-2.6.32.12/arch/x86/include/asm/mman.h linux-2.6.32.12/arch/x86/include/asm/mman.h
7209--- linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400 7327--- linux-2.6.32.12/arch/x86/include/asm/mman.h 2010-03-15 11:52:04.000000000 -0400
7210+++ linux-2.6.32.11/arch/x86/include/asm/mman.h 2010-04-04 20:46:41.500459645 -0400 7328+++ linux-2.6.32.12/arch/x86/include/asm/mman.h 2010-04-04 20:46:41.500459645 -0400
7211@@ -5,4 +5,14 @@ 7329@@ -5,4 +5,14 @@
7212 7330
7213 #include <asm-generic/mman.h> 7331 #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/
7223+#endif 7341+#endif
7224+ 7342+
7225 #endif /* _ASM_X86_MMAN_H */ 7343 #endif /* _ASM_X86_MMAN_H */
7226diff -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 7344diff -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
7227--- linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400 7345--- linux-2.6.32.12/arch/x86/include/asm/mmu_context.h 2010-03-15 11:52:04.000000000 -0400
7228+++ linux-2.6.32.11/arch/x86/include/asm/mmu_context.h 2010-04-06 22:21:53.692294722 -0400 7346+++ linux-2.6.32.12/arch/x86/include/asm/mmu_context.h 2010-04-29 17:46:36.829235058 -0400
7229@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m 7347@@ -24,6 +24,21 @@ void destroy_context(struct mm_struct *m
7230 7348
7231 static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk) 7349 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
7248 #ifdef CONFIG_SMP 7366 #ifdef CONFIG_SMP
7249 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK) 7367 if (percpu_read(cpu_tlbstate.state) == TLBSTATE_OK)
7250 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY); 7368 percpu_write(cpu_tlbstate.state, TLBSTATE_LAZY);
7251@@ -34,37 +49,96 @@ static inline void switch_mm(struct mm_s 7369@@ -34,27 +49,70 @@ static inline void switch_mm(struct mm_s
7252 struct task_struct *tsk) 7370 struct task_struct *tsk)
7253 { 7371 {
7254 unsigned cpu = smp_processor_id(); 7372 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
7284 */ 7402 */
7285 if (unlikely(prev->context.ldt != next->context.ldt)) 7403 if (unlikely(prev->context.ldt != next->context.ldt))
7286 load_LDT_nolock(&next->context); 7404 load_LDT_nolock(&next->context);
7405- }
7287+ 7406+
7288+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) 7407+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP)
7289+ if (!nx_enabled) { 7408+ 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
7298+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base || 7417+ if (unlikely(prev->context.user_cs_base != next->context.user_cs_base ||
7299+ prev->context.user_cs_limit != next->context.user_cs_limit)) 7418+ prev->context.user_cs_limit != next->context.user_cs_limit))
7300+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); 7419+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
7301+#ifdef CONFIG_SMP 7420 #ifdef CONFIG_SMP
7302+ else if (unlikely(tlbstate != TLBSTATE_OK)) 7421+ else if (unlikely(tlbstate != TLBSTATE_OK))
7303+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu); 7422+ set_user_cs(next->context.user_cs_base, next->context.user_cs_limit, cpu);
7304+#endif 7423+#endif
7305+#endif 7424+#endif
7306+ 7425+
7307 } 7426+ }
7308 #ifdef CONFIG_SMP
7309 else { 7427 else {
7310 percpu_write(cpu_tlbstate.state, TLBSTATE_OK); 7428+
7311 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
7312
7313+#ifdef CONFIG_PAX_PER_CPU_PGD 7429+#ifdef CONFIG_PAX_PER_CPU_PGD
7314+ pax_open_kernel(); 7430+ pax_open_kernel();
7315+ __clone_user_pgds(get_cpu_pgd(cpu), next->pgd, USER_PGD_PTRS); 7431+ __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
7318+ load_cr3(get_cpu_pgd(cpu)); 7434+ load_cr3(get_cpu_pgd(cpu));
7319+#endif 7435+#endif
7320+ 7436+
7321 if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next))) { 7437+#ifdef CONFIG_SMP
7322 /* We were in lazy tlb mode and leave_mm disabled 7438 percpu_write(cpu_tlbstate.state, TLBSTATE_OK);
7439 BUG_ON(percpu_read(cpu_tlbstate.active_mm) != next);
7440
7441@@ -63,11 +121,28 @@ static inline void switch_mm(struct mm_s
7323 * tlb flush IPI delivery. We must reload CR3 7442 * tlb flush IPI delivery. We must reload CR3
7324 * to make sure to use no freed page tables. 7443 * to make sure to use no freed page tables.
7325 */ 7444 */
@@ -7343,11 +7462,15 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu_context.h linux-2.6.32.11/ar
7343+#endif 7462+#endif
7344+ 7463+
7345 } 7464 }
7346 } 7465- }
7347 #endif 7466 #endif
7348diff -urNp linux-2.6.32.11/arch/x86/include/asm/mmu.h linux-2.6.32.11/arch/x86/include/asm/mmu.h 7467+ }
7349--- linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400 7468 }
7350+++ linux-2.6.32.11/arch/x86/include/asm/mmu.h 2010-04-04 20:46:41.500459645 -0400 7469
7470 #define activate_mm(prev, next) \
7471diff -urNp linux-2.6.32.12/arch/x86/include/asm/mmu.h linux-2.6.32.12/arch/x86/include/asm/mmu.h
7472--- linux-2.6.32.12/arch/x86/include/asm/mmu.h 2010-03-15 11:52:04.000000000 -0400
7473+++ linux-2.6.32.12/arch/x86/include/asm/mmu.h 2010-04-04 20:46:41.500459645 -0400
7351@@ -9,10 +9,23 @@ 7474@@ -9,10 +9,23 @@
7352 * we put the segment information here. 7475 * we put the segment information here.
7353 */ 7476 */
@@ -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
7374 } mm_context_t; 7497 } mm_context_t;
7375 7498
7376 #ifdef CONFIG_SMP 7499 #ifdef CONFIG_SMP
7377diff -urNp linux-2.6.32.11/arch/x86/include/asm/module.h linux-2.6.32.11/arch/x86/include/asm/module.h 7500diff -urNp linux-2.6.32.12/arch/x86/include/asm/module.h linux-2.6.32.12/arch/x86/include/asm/module.h
7378--- linux-2.6.32.11/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400 7501--- linux-2.6.32.12/arch/x86/include/asm/module.h 2010-03-15 11:52:04.000000000 -0400
7379+++ linux-2.6.32.11/arch/x86/include/asm/module.h 2010-04-04 21:01:05.305858196 -0400 7502+++ linux-2.6.32.12/arch/x86/include/asm/module.h 2010-04-04 21:01:05.305858196 -0400
7380@@ -59,13 +59,31 @@ 7503@@ -59,13 +59,31 @@
7381 #error unknown processor family 7504 #error unknown processor family
7382 #endif 7505 #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
7410 #endif 7533 #endif
7411 7534
7412 #endif /* _ASM_X86_MODULE_H */ 7535 #endif /* _ASM_X86_MODULE_H */
7413diff -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 7536diff -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
7414--- linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400 7537--- linux-2.6.32.12/arch/x86/include/asm/page_32_types.h 2010-03-15 11:52:04.000000000 -0400
7415+++ linux-2.6.32.11/arch/x86/include/asm/page_32_types.h 2010-04-04 20:46:41.505526780 -0400 7538+++ linux-2.6.32.12/arch/x86/include/asm/page_32_types.h 2010-04-04 20:46:41.505526780 -0400
7416@@ -15,6 +15,10 @@ 7539@@ -15,6 +15,10 @@
7417 */ 7540 */
7418 #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) 7541 #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/
7424 #ifdef CONFIG_4KSTACKS 7547 #ifdef CONFIG_4KSTACKS
7425 #define THREAD_ORDER 0 7548 #define THREAD_ORDER 0
7426 #else 7549 #else
7427diff -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 7550diff -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
7428--- linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400 7551--- linux-2.6.32.12/arch/x86/include/asm/page_64_types.h 2010-03-15 11:52:04.000000000 -0400
7429+++ linux-2.6.32.11/arch/x86/include/asm/page_64_types.h 2010-04-04 20:46:41.505526780 -0400 7552+++ linux-2.6.32.12/arch/x86/include/asm/page_64_types.h 2010-04-04 20:46:41.505526780 -0400
7430@@ -39,6 +39,9 @@ 7553@@ -39,6 +39,9 @@
7431 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) 7554 #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START)
7432 #define __START_KERNEL_map _AC(0xffffffff80000000, UL) 7555 #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/
7437 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */ 7560 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
7438 #define __PHYSICAL_MASK_SHIFT 46 7561 #define __PHYSICAL_MASK_SHIFT 46
7439 #define __VIRTUAL_MASK_SHIFT 47 7562 #define __VIRTUAL_MASK_SHIFT 47
7440diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt.h linux-2.6.32.11/arch/x86/include/asm/paravirt.h 7563diff -urNp linux-2.6.32.12/arch/x86/include/asm/paravirt.h linux-2.6.32.12/arch/x86/include/asm/paravirt.h
7441--- linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400 7564--- linux-2.6.32.12/arch/x86/include/asm/paravirt.h 2010-03-15 11:52:04.000000000 -0400
7442+++ linux-2.6.32.11/arch/x86/include/asm/paravirt.h 2010-04-07 16:58:23.343008831 -0400 7565+++ linux-2.6.32.12/arch/x86/include/asm/paravirt.h 2010-04-07 16:58:23.343008831 -0400
7443@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned 7566@@ -729,6 +729,21 @@ static inline void __set_fixmap(unsigned
7444 pv_mmu_ops.set_fixmap(idx, phys, flags); 7567 pv_mmu_ops.set_fixmap(idx, phys, flags);
7445 } 7568 }
@@ -7493,9 +7616,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/paravirt.h linux-2.6.32.11/arch/
7493 #endif /* CONFIG_X86_32 */ 7616 #endif /* CONFIG_X86_32 */
7494 7617
7495 #endif /* __ASSEMBLY__ */ 7618 #endif /* __ASSEMBLY__ */
7496diff -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 7619diff -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
7497--- linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400 7620--- linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h 2010-03-15 11:52:04.000000000 -0400
7498+++ linux-2.6.32.11/arch/x86/include/asm/paravirt_types.h 2010-04-04 20:46:41.505526780 -0400 7621+++ linux-2.6.32.12/arch/x86/include/asm/paravirt_types.h 2010-04-04 20:46:41.505526780 -0400
7499@@ -316,6 +316,12 @@ struct pv_mmu_ops { 7622@@ -316,6 +316,12 @@ struct pv_mmu_ops {
7500 an mfn. We can tell which is which from the index. */ 7623 an mfn. We can tell which is which from the index. */
7501 void (*set_fixmap)(unsigned /* enum fixed_addresses */ idx, 7624 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
7509 }; 7632 };
7510 7633
7511 struct raw_spinlock; 7634 struct raw_spinlock;
7512diff -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 7635diff -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
7513--- linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400 7636--- linux-2.6.32.12/arch/x86/include/asm/pci_x86.h 2010-03-15 11:52:04.000000000 -0400
7514+++ linux-2.6.32.11/arch/x86/include/asm/pci_x86.h 2010-04-04 20:46:41.505526780 -0400 7637+++ linux-2.6.32.12/arch/x86/include/asm/pci_x86.h 2010-04-04 20:46:41.505526780 -0400
7515@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct 7638@@ -89,16 +89,16 @@ extern int (*pcibios_enable_irq)(struct
7516 extern void (*pcibios_disable_irq)(struct pci_dev *dev); 7639 extern void (*pcibios_disable_irq)(struct pci_dev *dev);
7517 7640
@@ -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
7534 extern bool port_cf9_safe; 7657 extern bool port_cf9_safe;
7535 7658
7536 /* arch_initcall level */ 7659 /* arch_initcall level */
7537diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgalloc.h linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 7660diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgalloc.h linux-2.6.32.12/arch/x86/include/asm/pgalloc.h
7538--- linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400 7661--- linux-2.6.32.12/arch/x86/include/asm/pgalloc.h 2010-03-15 11:52:04.000000000 -0400
7539+++ linux-2.6.32.11/arch/x86/include/asm/pgalloc.h 2010-04-04 20:46:41.505526780 -0400 7662+++ linux-2.6.32.12/arch/x86/include/asm/pgalloc.h 2010-04-04 20:46:41.505526780 -0400
7540@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s 7663@@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
7541 pmd_t *pmd, pte_t *pte) 7664 pmd_t *pmd, pte_t *pte)
7542 { 7665 {
@@ -7551,9 +7674,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgalloc.h linux-2.6.32.11/arch/x
7551 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE)); 7674 set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
7552 } 7675 }
7553 7676
7554diff -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 7677diff -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
7555--- linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400 7678--- linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h 2010-03-15 11:52:04.000000000 -0400
7556+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-2level.h 2010-04-04 20:46:41.505526780 -0400 7679+++ linux-2.6.32.12/arch/x86/include/asm/pgtable-2level.h 2010-04-04 20:46:41.505526780 -0400
7557@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 7680@@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t
7558 7681
7559 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7682 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
7564 } 7687 }
7565 7688
7566 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) 7689 static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
7567diff -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 7690diff -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
7568--- linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400 7691--- linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h 2010-03-15 11:52:04.000000000 -0400
7569+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32.h 2010-04-04 20:46:41.505526780 -0400 7692+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_32.h 2010-04-04 20:46:41.505526780 -0400
7570@@ -26,8 +26,6 @@ 7693@@ -26,8 +26,6 @@
7571 struct mm_struct; 7694 struct mm_struct;
7572 struct vm_area_struct; 7695 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
7608 /* 7731 /*
7609 * kern_addr_valid() is (1) for FLATMEM and (0) for 7732 * kern_addr_valid() is (1) for FLATMEM and (0) for
7610 * SPARSEMEM and DISCONTIGMEM 7733 * SPARSEMEM and DISCONTIGMEM
7611diff -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 7734diff -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
7612--- linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400 7735--- linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h 2010-03-15 11:52:04.000000000 -0400
7613+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_32_types.h 2010-04-04 20:46:41.505526780 -0400 7736+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_32_types.h 2010-04-04 20:46:41.505526780 -0400
7614@@ -8,7 +8,7 @@ 7737@@ -8,7 +8,7 @@
7615 */ 7738 */
7616 #ifdef CONFIG_X86_PAE 7739 #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.
7640 #define MODULES_VADDR VMALLOC_START 7763 #define MODULES_VADDR VMALLOC_START
7641 #define MODULES_END VMALLOC_END 7764 #define MODULES_END VMALLOC_END
7642 #define MODULES_LEN (MODULES_VADDR - MODULES_END) 7765 #define MODULES_LEN (MODULES_VADDR - MODULES_END)
7643diff -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 7766diff -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
7644--- linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400 7767--- linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h 2010-03-15 11:52:04.000000000 -0400
7645+++ linux-2.6.32.11/arch/x86/include/asm/pgtable-3level.h 2010-04-04 20:46:41.505526780 -0400 7768+++ linux-2.6.32.12/arch/x86/include/asm/pgtable-3level.h 2010-04-04 20:46:41.505526780 -0400
7646@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic 7769@@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
7647 7770
7648 static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) 7771 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
7660 } 7783 }
7661 7784
7662 /* 7785 /*
7663diff -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 7786diff -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
7664--- linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400 7787--- linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h 2010-03-15 11:52:04.000000000 -0400
7665+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_64.h 2010-04-04 20:58:33.220592413 -0400 7788+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_64.h 2010-04-04 20:58:33.220592413 -0400
7666@@ -16,10 +16,13 @@ 7789@@ -16,10 +16,13 @@
7667 7790
7668 extern pud_t level3_kernel_pgt[512]; 7791 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
7708 } 7831 }
7709 7832
7710 /* 7833 /*
7711diff -urNp linux-2.6.32.11/arch/x86/include/asm/pgtable.h linux-2.6.32.11/arch/x86/include/asm/pgtable.h 7834diff -urNp linux-2.6.32.12/arch/x86/include/asm/pgtable.h linux-2.6.32.12/arch/x86/include/asm/pgtable.h
7712--- linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400 7835--- linux-2.6.32.12/arch/x86/include/asm/pgtable.h 2010-03-15 11:52:04.000000000 -0400
7713+++ linux-2.6.32.11/arch/x86/include/asm/pgtable.h 2010-04-04 20:58:33.220592413 -0400 7836+++ linux-2.6.32.12/arch/x86/include/asm/pgtable.h 2010-04-04 20:58:33.220592413 -0400
7714@@ -74,12 +74,51 @@ extern struct list_head pgd_list; 7837@@ -74,12 +74,51 @@ extern struct list_head pgd_list;
7715 7838
7716 #define arch_end_context_switch(prev) do {} while(0) 7839 #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
7875 7998
7876 #include <asm-generic/pgtable.h> 7999 #include <asm-generic/pgtable.h>
7877 #endif /* __ASSEMBLY__ */ 8000 #endif /* __ASSEMBLY__ */
7878diff -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 8001diff -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
7879--- linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400 8002--- linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h 2010-03-15 11:52:04.000000000 -0400
7880+++ linux-2.6.32.11/arch/x86/include/asm/pgtable_types.h 2010-04-04 20:46:41.505526780 -0400 8003+++ linux-2.6.32.12/arch/x86/include/asm/pgtable_types.h 2010-04-04 20:46:41.505526780 -0400
7881@@ -16,12 +16,11 @@ 8004@@ -16,12 +16,11 @@
7882 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ 8005 #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */
7883 #define _PAGE_BIT_PAT 7 /* on 4KB pages */ 8006 #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/
7962 8085
7963 #define pgprot_writecombine pgprot_writecombine 8086 #define pgprot_writecombine pgprot_writecombine
7964 extern pgprot_t pgprot_writecombine(pgprot_t prot); 8087 extern pgprot_t pgprot_writecombine(pgprot_t prot);
7965diff -urNp linux-2.6.32.11/arch/x86/include/asm/processor.h linux-2.6.32.11/arch/x86/include/asm/processor.h 8088diff -urNp linux-2.6.32.12/arch/x86/include/asm/processor.h linux-2.6.32.12/arch/x86/include/asm/processor.h
7966--- linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400 8089--- linux-2.6.32.12/arch/x86/include/asm/processor.h 2010-03-15 11:52:04.000000000 -0400
7967+++ linux-2.6.32.11/arch/x86/include/asm/processor.h 2010-04-04 20:58:33.220592413 -0400 8090+++ linux-2.6.32.12/arch/x86/include/asm/processor.h 2010-04-04 20:58:33.220592413 -0400
7968@@ -272,7 +272,7 @@ struct tss_struct { 8091@@ -272,7 +272,7 @@ struct tss_struct {
7969 8092
7970 } ____cacheline_aligned; 8093 } ____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
8049 #define KSTK_EIP(task) (task_pt_regs(task)->ip) 8172 #define KSTK_EIP(task) (task_pt_regs(task)->ip)
8050 8173
8051 /* Get/set a process' ability to use the timestamp counter instruction */ 8174 /* Get/set a process' ability to use the timestamp counter instruction */
8052diff -urNp linux-2.6.32.11/arch/x86/include/asm/ptrace.h linux-2.6.32.11/arch/x86/include/asm/ptrace.h 8175diff -urNp linux-2.6.32.12/arch/x86/include/asm/ptrace.h linux-2.6.32.12/arch/x86/include/asm/ptrace.h
8053--- linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400 8176--- linux-2.6.32.12/arch/x86/include/asm/ptrace.h 2010-03-15 11:52:04.000000000 -0400
8054+++ linux-2.6.32.11/arch/x86/include/asm/ptrace.h 2010-04-04 20:46:41.505526780 -0400 8177+++ linux-2.6.32.12/arch/x86/include/asm/ptrace.h 2010-04-04 20:46:41.505526780 -0400
8055@@ -151,28 +151,29 @@ static inline unsigned long regs_return_ 8178@@ -151,28 +151,29 @@ static inline unsigned long regs_return_
8056 } 8179 }
8057 8180
@@ -8088,9 +8211,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/ptrace.h linux-2.6.32.11/arch/x8
8088 #endif 8211 #endif
8089 } 8212 }
8090 8213
8091diff -urNp linux-2.6.32.11/arch/x86/include/asm/reboot.h linux-2.6.32.11/arch/x86/include/asm/reboot.h 8214diff -urNp linux-2.6.32.12/arch/x86/include/asm/reboot.h linux-2.6.32.12/arch/x86/include/asm/reboot.h
8092--- linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400 8215--- linux-2.6.32.12/arch/x86/include/asm/reboot.h 2010-03-15 11:52:04.000000000 -0400
8093+++ linux-2.6.32.11/arch/x86/include/asm/reboot.h 2010-04-04 20:46:41.505526780 -0400 8216+++ linux-2.6.32.12/arch/x86/include/asm/reboot.h 2010-04-04 20:46:41.505526780 -0400
8094@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; 8217@@ -18,7 +18,7 @@ extern struct machine_ops machine_ops;
8095 8218
8096 void native_machine_crash_shutdown(struct pt_regs *regs); 8219 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
8100 8223
8101 typedef void (*nmi_shootdown_cb)(int, struct die_args*); 8224 typedef void (*nmi_shootdown_cb)(int, struct die_args*);
8102 void nmi_shootdown_cpus(nmi_shootdown_cb callback); 8225 void nmi_shootdown_cpus(nmi_shootdown_cb callback);
8103diff -urNp linux-2.6.32.11/arch/x86/include/asm/rwsem.h linux-2.6.32.11/arch/x86/include/asm/rwsem.h 8226diff -urNp linux-2.6.32.12/arch/x86/include/asm/rwsem.h linux-2.6.32.12/arch/x86/include/asm/rwsem.h
8104--- linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-03-15 11:52:04.000000000 -0400 8227--- linux-2.6.32.12/arch/x86/include/asm/rwsem.h 2010-04-29 17:49:37.501451369 -0400
8105+++ linux-2.6.32.11/arch/x86/include/asm/rwsem.h 2010-04-04 20:46:41.505526780 -0400 8228+++ linux-2.6.32.12/arch/x86/include/asm/rwsem.h 2010-04-29 20:01:51.893191958 -0400
8106@@ -106,10 +106,26 @@ static inline void __down_read(struct rw 8229@@ -118,10 +118,26 @@ static inline void __down_read(struct rw
8107 { 8230 {
8108 asm volatile("# beginning down_read\n\t" 8231 asm volatile("# beginning down_read\n\t"
8109 LOCK_PREFIX " incl (%%eax)\n\t" 8232 LOCK_PREFIX _ASM_INC "(%1)\n\t"
8110+ 8233+
8111+#ifdef CONFIG_PAX_REFCOUNT 8234+#ifdef CONFIG_PAX_REFCOUNT
8112+#ifdef CONFIG_X86_32 8235+#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
8117+#endif 8240+#endif
8118+ ".pushsection .fixup,\"ax\"\n" 8241+ ".pushsection .fixup,\"ax\"\n"
8119+ "1:\n" 8242+ "1:\n"
8120+ LOCK_PREFIX "decl (%%eax)\n" 8243+ LOCK_PREFIX _ASM_DEC "(%1)\n\t"
8121+ "jmp 0b\n" 8244+ "jmp 0b\n"
8122+ ".popsection\n" 8245+ ".popsection\n"
8123+ _ASM_EXTABLE(0b, 1b) 8246+ _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
8132 "# ending down_read\n\t" 8255 "# ending down_read\n\t"
8133 : "+m" (sem->count) 8256 : "+m" (sem->count)
8134 : "a" (sem) 8257 : "a" (sem)
8135@@ -124,13 +140,29 @@ static inline int __down_read_trylock(st 8258@@ -136,13 +152,29 @@ static inline int __down_read_trylock(st
8136 __s32 result, tmp; 8259 rwsem_count_t result, tmp;
8137 asm volatile("# beginning __down_read_trylock\n\t" 8260 asm volatile("# beginning __down_read_trylock\n\t"
8138 " movl %0,%1\n\t" 8261 " mov %0,%1\n\t"
8139- "1:\n\t" 8262- "1:\n\t"
8140+ "2:\n\t" 8263+ "2:\n\t"
8141 " movl %1,%2\n\t" 8264 " mov %1,%2\n\t"
8142 " addl %3,%2\n\t" 8265 " add %3,%2\n\t"
8143- " jle 2f\n\t" 8266- " jle 2f\n\t"
8144+ 8267+
8145+#ifdef CONFIG_PAX_REFCOUNT 8268+#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
8151+#endif 8274+#endif
8152+ ".pushsection .fixup,\"ax\"\n" 8275+ ".pushsection .fixup,\"ax\"\n"
8153+ "1:\n" 8276+ "1:\n"
8154+ "subl %3,%2\n" 8277+ "sub %3,%2\n"
8155+ "jmp 0b\n" 8278+ "jmp 0b\n"
8156+ ".popsection\n" 8279+ ".popsection\n"
8157+ _ASM_EXTABLE(0b, 1b) 8280+ _ASM_EXTABLE(0b, 1b)
8158+#endif 8281+#endif
8159+ 8282+
8160+ " jle 3f\n\t" 8283+ " jle 3f\n\t"
8161 LOCK_PREFIX " cmpxchgl %2,%0\n\t" 8284 LOCK_PREFIX " cmpxchg %2,%0\n\t"
8162- " jnz 1b\n\t" 8285- " jnz 1b\n\t"
8163- "2:\n\t" 8286- "2:\n\t"
8164+ " jnz 2b\n\t" 8287+ " 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
8166 "# ending __down_read_trylock\n\t" 8289 "# ending __down_read_trylock\n\t"
8167 : "+m" (sem->count), "=&a" (result), "=&r" (tmp) 8290 : "+m" (sem->count), "=&a" (result), "=&r" (tmp)
8168 : "i" (RWSEM_ACTIVE_READ_BIAS) 8291 : "i" (RWSEM_ACTIVE_READ_BIAS)
8169@@ -148,12 +180,28 @@ static inline void __down_write_nested(s 8292@@ -160,12 +192,28 @@ static inline void __down_write_nested(s
8170 tmp = RWSEM_ACTIVE_WRITE_BIAS; 8293 tmp = RWSEM_ACTIVE_WRITE_BIAS;
8171 asm volatile("# beginning down_write\n\t" 8294 asm volatile("# beginning down_write\n\t"
8172 LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" 8295 LOCK_PREFIX " xadd %1,(%2)\n\t"
8173+ 8296+
8174+#ifdef CONFIG_PAX_REFCOUNT 8297+#ifdef CONFIG_PAX_REFCOUNT
8175+#ifdef CONFIG_X86_32 8298+#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
8180+#endif 8303+#endif
8181+ ".pushsection .fixup,\"ax\"\n" 8304+ ".pushsection .fixup,\"ax\"\n"
8182+ "1:\n" 8305+ "1:\n"
8183+ "movl %%edx,(%%eax)\n" 8306+ "mov %1,(%2)\n"
8184+ "jmp 0b\n" 8307+ "jmp 0b\n"
8185+ ".popsection\n" 8308+ ".popsection\n"
8186+ _ASM_EXTABLE(0b, 1b) 8309+ _ASM_EXTABLE(0b, 1b)
8187+#endif 8310+#endif
8188+ 8311+
8189 /* subtract 0x0000ffff, returns the old value */ 8312 /* subtract 0x0000ffff, returns the old value */
8190 " testl %%edx,%%edx\n\t" 8313 " test %1,%1\n\t"
8191 /* was the count 0 before? */ 8314 /* was the count 0 before? */
8192- " jz 1f\n" 8315- " jz 1f\n"
8193+ " jz 2f\n" 8316+ " 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
8197 "# ending down_write" 8320 "# ending down_write"
8198 : "+m" (sem->count), "=d" (tmp) 8321 : "+m" (sem->count), "=d" (tmp)
8199 : "a" (sem), "1" (tmp) 8322 : "a" (sem), "1" (tmp)
8200@@ -186,10 +234,26 @@ static inline void __up_read(struct rw_s 8323@@ -198,10 +246,26 @@ static inline void __up_read(struct rw_s
8201 __s32 tmp = -RWSEM_ACTIVE_READ_BIAS; 8324 rwsem_count_t tmp = -RWSEM_ACTIVE_READ_BIAS;
8202 asm volatile("# beginning __up_read\n\t" 8325 asm volatile("# beginning __up_read\n\t"
8203 LOCK_PREFIX " xadd %%edx,(%%eax)\n\t" 8326 LOCK_PREFIX " xadd %1,(%2)\n\t"
8204+ 8327+
8205+#ifdef CONFIG_PAX_REFCOUNT 8328+#ifdef CONFIG_PAX_REFCOUNT
8206+#ifdef CONFIG_X86_32 8329+#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
8211+#endif 8334+#endif
8212+ ".pushsection .fixup,\"ax\"\n" 8335+ ".pushsection .fixup,\"ax\"\n"
8213+ "1:\n" 8336+ "1:\n"
8214+ "movl %%edx,(%%eax)\n" 8337+ "mov %1,(%2)\n"
8215+ "jmp 0b\n" 8338+ "jmp 0b\n"
8216+ ".popsection\n" 8339+ ".popsection\n"
8217+ _ASM_EXTABLE(0b, 1b) 8340+ _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
8226 "# ending __up_read\n" 8349 "# ending __up_read\n"
8227 : "+m" (sem->count), "=d" (tmp) 8350 : "+m" (sem->count), "=d" (tmp)
8228 : "a" (sem), "1" (tmp) 8351 : "a" (sem), "1" (tmp)
8229@@ -204,11 +268,27 @@ static inline void __up_write(struct rw_ 8352@@ -216,11 +280,27 @@ static inline void __up_write(struct rw_
8353 rwsem_count_t tmp;
8230 asm volatile("# beginning __up_write\n\t" 8354 asm volatile("# beginning __up_write\n\t"
8231 " movl %2,%%edx\n\t" 8355 LOCK_PREFIX " xadd %1,(%2)\n\t"
8232 LOCK_PREFIX " xaddl %%edx,(%%eax)\n\t"
8233+ 8356+
8234+#ifdef CONFIG_PAX_REFCOUNT 8357+#ifdef CONFIG_PAX_REFCOUNT
8235+#ifdef CONFIG_X86_32 8358+#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
8240+#endif 8363+#endif
8241+ ".pushsection .fixup,\"ax\"\n" 8364+ ".pushsection .fixup,\"ax\"\n"
8242+ "1:\n" 8365+ "1:\n"
8243+ "movl %%edx,(%%eax)\n" 8366+ "mov %1,(%2)\n"
8244+ "jmp 0b\n" 8367+ "jmp 0b\n"
8245+ ".popsection\n" 8368+ ".popsection\n"
8246+ _ASM_EXTABLE(0b, 1b) 8369+ _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
8254- "1:\n\t" 8377- "1:\n\t"
8255+ "2:\n\t" 8378+ "2:\n\t"
8256 "# ending __up_write\n" 8379 "# ending __up_write\n"
8257 : "+m" (sem->count) 8380 : "+m" (sem->count), "=d" (tmp)
8258 : "a" (sem), "i" (-RWSEM_ACTIVE_WRITE_BIAS) 8381 : "a" (sem), "1" (-RWSEM_ACTIVE_WRITE_BIAS)
8259@@ -222,10 +302,26 @@ static inline void __downgrade_write(str 8382@@ -234,13 +314,29 @@ static inline void __downgrade_write(str
8260 { 8383 {
8261 asm volatile("# beginning __downgrade_write\n\t" 8384 asm volatile("# beginning __downgrade_write\n\t"
8262 LOCK_PREFIX " addl %2,(%%eax)\n\t" 8385 LOCK_PREFIX _ASM_ADD "%2,(%1)\n\t"
8263+ 8386+
8264+#ifdef CONFIG_PAX_REFCOUNT 8387+#ifdef CONFIG_PAX_REFCOUNT
8265+#ifdef CONFIG_X86_32 8388+#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
8270+#endif 8393+#endif
8271+ ".pushsection .fixup,\"ax\"\n" 8394+ ".pushsection .fixup,\"ax\"\n"
8272+ "1:\n" 8395+ "1:\n"
8273+ LOCK_PREFIX "subl %2,(%%eax)\n" 8396+ LOCK_PREFIX _ASM_SUB "%2,(%1)\n"
8274+ "jmp 0b\n" 8397+ "jmp 0b\n"
8275+ ".popsection\n" 8398+ ".popsection\n"
8276+ _ASM_EXTABLE(0b, 1b) 8399+ _ASM_EXTABLE(0b, 1b)
8277+#endif 8400+#endif
8278+ 8401+
8279 /* transitions 0xZZZZ0001 -> 0xYYYY0001 */ 8402 /*
8403 * transitions 0xZZZZ0001 -> 0xYYYY0001 (i386)
8404 * 0xZZZZZZZZ00000001 -> 0xYYYYYYYY00000001 (x86_64)
8405 */
8280- " jns 1f\n\t" 8406- " jns 1f\n\t"
8281+ " jns 2f\n\t" 8407+ " jns 2f\n\t"
8282 " call call_rwsem_downgrade_wake\n" 8408 " 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
8284+ "2:\n\t" 8410+ "2:\n\t"
8285 "# ending __downgrade_write\n" 8411 "# ending __downgrade_write\n"
8286 : "+m" (sem->count) 8412 : "+m" (sem->count)
8287 : "a" (sem), "i" (-RWSEM_WAITING_BIAS) 8413 : "a" (sem), "er" (-RWSEM_WAITING_BIAS)
8288@@ -237,7 +333,23 @@ static inline void __downgrade_write(str 8414@@ -253,7 +349,23 @@ static inline void __downgrade_write(str
8289 */ 8415 static inline void rwsem_atomic_add(rwsem_count_t delta,
8290 static inline void rwsem_atomic_add(int delta, struct rw_semaphore *sem) 8416 struct rw_semaphore *sem)
8291 { 8417 {
8292- asm volatile(LOCK_PREFIX "addl %1,%0" 8418- asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0"
8293+ asm volatile(LOCK_PREFIX "addl %1,%0\n" 8419+ asm volatile(LOCK_PREFIX _ASM_ADD "%1,%0\n"
8294+ 8420+
8295+#ifdef CONFIG_PAX_REFCOUNT 8421+#ifdef CONFIG_PAX_REFCOUNT
8296+#ifdef CONFIG_X86_32 8422+#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
8301+#endif 8427+#endif
8302+ ".pushsection .fixup,\"ax\"\n" 8428+ ".pushsection .fixup,\"ax\"\n"
8303+ "1:\n" 8429+ "1:\n"
8304+ LOCK_PREFIX "subl %1,%0\n" 8430+ LOCK_PREFIX _ASM_SUB "%1,%0\n"
8305+ "jmp 0b\n" 8431+ "jmp 0b\n"
8306+ ".popsection\n" 8432+ ".popsection\n"
8307+ _ASM_EXTABLE(0b, 1b) 8433+ _ASM_EXTABLE(0b, 1b)
8308+#endif 8434+#endif
8309+ 8435+
8310 : "+m" (sem->count) 8436 : "+m" (sem->count)
8311 : "ir" (delta)); 8437 : "er" (delta));
8312 } 8438 }
8313@@ -249,7 +361,23 @@ static inline int rwsem_atomic_update(in 8439@@ -266,7 +378,23 @@ static inline rwsem_count_t rwsem_atomic
8314 { 8440 {
8315 int tmp = delta; 8441 rwsem_count_t tmp = delta;
8316 8442
8317- asm volatile(LOCK_PREFIX "xadd %0,%1" 8443- asm volatile(LOCK_PREFIX "xadd %0,%1"
8318+ asm volatile(LOCK_PREFIX "xadd %0,%1\n" 8444+ 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
8326+#endif 8452+#endif
8327+ ".pushsection .fixup,\"ax\"\n" 8453+ ".pushsection .fixup,\"ax\"\n"
8328+ "1:\n" 8454+ "1:\n"
8329+ "movl %0,%1\n" 8455+ "mov %0,%1\n"
8330+ "jmp 0b\n" 8456+ "jmp 0b\n"
8331+ ".popsection\n" 8457+ ".popsection\n"
8332+ _ASM_EXTABLE(0b, 1b) 8458+ _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
8335 : "+r" (tmp), "+m" (sem->count) 8461 : "+r" (tmp), "+m" (sem->count)
8336 : : "memory"); 8462 : : "memory");
8337 8463
8338diff -urNp linux-2.6.32.11/arch/x86/include/asm/segment.h linux-2.6.32.11/arch/x86/include/asm/segment.h 8464diff -urNp linux-2.6.32.12/arch/x86/include/asm/segment.h linux-2.6.32.12/arch/x86/include/asm/segment.h
8339--- linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400 8465--- linux-2.6.32.12/arch/x86/include/asm/segment.h 2010-03-15 11:52:04.000000000 -0400
8340+++ linux-2.6.32.11/arch/x86/include/asm/segment.h 2010-04-04 20:46:41.505526780 -0400 8466+++ linux-2.6.32.12/arch/x86/include/asm/segment.h 2010-04-04 20:46:41.505526780 -0400
8341@@ -62,8 +62,8 @@ 8467@@ -62,8 +62,8 @@
8342 * 26 - ESPFIX small SS 8468 * 26 - ESPFIX small SS
8343 * 27 - per-cpu [ offset to per-cpu data area ] 8469 * 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
8406 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8) 8532 #define __KERNEL_DS (GDT_ENTRY_KERNEL_DS * 8)
8407 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3) 8533 #define __USER_DS (GDT_ENTRY_DEFAULT_USER_DS* 8 + 3)
8408 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3) 8534 #define __USER_CS (GDT_ENTRY_DEFAULT_USER_CS* 8 + 3)
8409diff -urNp linux-2.6.32.11/arch/x86/include/asm/spinlock.h linux-2.6.32.11/arch/x86/include/asm/spinlock.h 8535diff -urNp linux-2.6.32.12/arch/x86/include/asm/spinlock.h linux-2.6.32.12/arch/x86/include/asm/spinlock.h
8410--- linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400 8536--- linux-2.6.32.12/arch/x86/include/asm/spinlock.h 2010-03-15 11:52:04.000000000 -0400
8411+++ linux-2.6.32.11/arch/x86/include/asm/spinlock.h 2010-04-04 20:46:41.505526780 -0400 8537+++ linux-2.6.32.12/arch/x86/include/asm/spinlock.h 2010-04-04 20:46:41.505526780 -0400
8412@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r 8538@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r
8413 static inline void __raw_read_lock(raw_rwlock_t *rw) 8539 static inline void __raw_read_lock(raw_rwlock_t *rw)
8414 { 8540 {
@@ -8512,9 +8638,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/spinlock.h linux-2.6.32.11/arch/
8512 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); 8638 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
8513 } 8639 }
8514 8640
8515diff -urNp linux-2.6.32.11/arch/x86/include/asm/system.h linux-2.6.32.11/arch/x86/include/asm/system.h 8641diff -urNp linux-2.6.32.12/arch/x86/include/asm/system.h linux-2.6.32.12/arch/x86/include/asm/system.h
8516--- linux-2.6.32.11/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400 8642--- linux-2.6.32.12/arch/x86/include/asm/system.h 2010-03-15 11:52:04.000000000 -0400
8517+++ linux-2.6.32.11/arch/x86/include/asm/system.h 2010-04-04 20:46:41.505526780 -0400 8643+++ linux-2.6.32.12/arch/x86/include/asm/system.h 2010-04-04 20:46:41.505526780 -0400
8518@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un 8644@@ -200,7 +200,7 @@ static inline unsigned long get_limit(un
8519 { 8645 {
8520 unsigned long __limit; 8646 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
8533 extern void free_init_pages(char *what, unsigned long begin, unsigned long end); 8659 extern void free_init_pages(char *what, unsigned long begin, unsigned long end);
8534 8660
8535 void default_idle(void); 8661 void default_idle(void);
8536diff -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 8662diff -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
8537--- linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400 8663--- linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h 2010-03-15 11:52:04.000000000 -0400
8538+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_32.h 2010-04-04 20:46:41.505526780 -0400 8664+++ linux-2.6.32.12/arch/x86/include/asm/uaccess_32.h 2010-04-04 20:46:41.505526780 -0400
8539@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u 8665@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u
8540 static __always_inline unsigned long __must_check 8666 static __always_inline unsigned long __must_check
8541 __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) 8667 __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
8665 long __must_check strncpy_from_user(char *dst, const char __user *src, 8791 long __must_check strncpy_from_user(char *dst, const char __user *src,
8666 long count); 8792 long count);
8667 long __must_check __strncpy_from_user(char *dst, 8793 long __must_check __strncpy_from_user(char *dst,
8668diff -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 8794diff -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
8669--- linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400 8795--- linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h 2010-03-15 11:52:04.000000000 -0400
8670+++ linux-2.6.32.11/arch/x86/include/asm/uaccess_64.h 2010-04-04 20:58:33.220592413 -0400 8796+++ linux-2.6.32.12/arch/x86/include/asm/uaccess_64.h 2010-04-04 20:58:33.220592413 -0400
8671@@ -9,6 +9,9 @@ 8797@@ -9,6 +9,9 @@
8672 #include <linux/prefetch.h> 8798 #include <linux/prefetch.h>
8673 #include <linux/lockdep.h> 8799 #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
8859 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); 8985 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
8860 8986
8861 #endif /* _ASM_X86_UACCESS_64_H */ 8987 #endif /* _ASM_X86_UACCESS_64_H */
8862diff -urNp linux-2.6.32.11/arch/x86/include/asm/uaccess.h linux-2.6.32.11/arch/x86/include/asm/uaccess.h 8988diff -urNp linux-2.6.32.12/arch/x86/include/asm/uaccess.h linux-2.6.32.12/arch/x86/include/asm/uaccess.h
8863--- linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400 8989--- linux-2.6.32.12/arch/x86/include/asm/uaccess.h 2010-03-15 11:52:04.000000000 -0400
8864+++ linux-2.6.32.11/arch/x86/include/asm/uaccess.h 2010-04-04 20:58:33.220592413 -0400 8990+++ linux-2.6.32.12/arch/x86/include/asm/uaccess.h 2010-04-04 20:58:33.220592413 -0400
8865@@ -8,8 +8,11 @@ 8991@@ -8,8 +8,11 @@
8866 #include <linux/thread_info.h> 8992 #include <linux/thread_info.h>
8867 #include <linux/prefetch.h> 8993 #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
9082 #ifdef CONFIG_X86_32 9208 #ifdef CONFIG_X86_32
9083 # include "uaccess_32.h" 9209 # include "uaccess_32.h"
9084 #else 9210 #else
9085diff -urNp linux-2.6.32.11/arch/x86/include/asm/vgtod.h linux-2.6.32.11/arch/x86/include/asm/vgtod.h 9211diff -urNp linux-2.6.32.12/arch/x86/include/asm/vgtod.h linux-2.6.32.12/arch/x86/include/asm/vgtod.h
9086--- linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400 9212--- linux-2.6.32.12/arch/x86/include/asm/vgtod.h 2010-03-15 11:52:04.000000000 -0400
9087+++ linux-2.6.32.11/arch/x86/include/asm/vgtod.h 2010-04-04 20:46:41.509696869 -0400 9213+++ linux-2.6.32.12/arch/x86/include/asm/vgtod.h 2010-04-04 20:46:41.509696869 -0400
9088@@ -14,6 +14,7 @@ struct vsyscall_gtod_data { 9214@@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
9089 int sysctl_enabled; 9215 int sysctl_enabled;
9090 struct timezone sys_tz; 9216 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
9093 cycle_t (*vread)(void); 9219 cycle_t (*vread)(void);
9094 cycle_t cycle_last; 9220 cycle_t cycle_last;
9095 cycle_t mask; 9221 cycle_t mask;
9096diff -urNp linux-2.6.32.11/arch/x86/include/asm/vmi.h linux-2.6.32.11/arch/x86/include/asm/vmi.h 9222diff -urNp linux-2.6.32.12/arch/x86/include/asm/vmi.h linux-2.6.32.12/arch/x86/include/asm/vmi.h
9097--- linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400 9223--- linux-2.6.32.12/arch/x86/include/asm/vmi.h 2010-03-15 11:52:04.000000000 -0400
9098+++ linux-2.6.32.11/arch/x86/include/asm/vmi.h 2010-04-04 20:46:41.509696869 -0400 9224+++ linux-2.6.32.12/arch/x86/include/asm/vmi.h 2010-04-04 20:46:41.509696869 -0400
9099@@ -191,6 +191,7 @@ struct vrom_header { 9225@@ -191,6 +191,7 @@ struct vrom_header {
9100 u8 reserved[96]; /* Reserved for headers */ 9226 u8 reserved[96]; /* Reserved for headers */
9101 char vmi_init[8]; /* VMI_Init jump point */ 9227 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
9104 } __attribute__((packed)); 9230 } __attribute__((packed));
9105 9231
9106 struct pnp_header { 9232 struct pnp_header {
9107diff -urNp linux-2.6.32.11/arch/x86/include/asm/vsyscall.h linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 9233diff -urNp linux-2.6.32.12/arch/x86/include/asm/vsyscall.h linux-2.6.32.12/arch/x86/include/asm/vsyscall.h
9108--- linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400 9234--- linux-2.6.32.12/arch/x86/include/asm/vsyscall.h 2010-03-15 11:52:04.000000000 -0400
9109+++ linux-2.6.32.11/arch/x86/include/asm/vsyscall.h 2010-04-04 20:46:41.509696869 -0400 9235+++ linux-2.6.32.12/arch/x86/include/asm/vsyscall.h 2010-04-04 20:46:41.509696869 -0400
9110@@ -15,9 +15,10 @@ enum vsyscall_num { 9236@@ -15,9 +15,10 @@ enum vsyscall_num {
9111 9237
9112 #ifdef __KERNEL__ 9238 #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/
9137 #endif /* __KERNEL__ */ 9263 #endif /* __KERNEL__ */
9138 9264
9139 #endif /* _ASM_X86_VSYSCALL_H */ 9265 #endif /* _ASM_X86_VSYSCALL_H */
9140diff -urNp linux-2.6.32.11/arch/x86/include/asm/xsave.h linux-2.6.32.11/arch/x86/include/asm/xsave.h 9266diff -urNp linux-2.6.32.12/arch/x86/include/asm/xsave.h linux-2.6.32.12/arch/x86/include/asm/xsave.h
9141--- linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400 9267--- linux-2.6.32.12/arch/x86/include/asm/xsave.h 2010-03-15 11:52:04.000000000 -0400
9142+++ linux-2.6.32.11/arch/x86/include/asm/xsave.h 2010-04-04 20:58:33.225084964 -0400 9268+++ linux-2.6.32.12/arch/x86/include/asm/xsave.h 2010-04-04 20:58:33.225084964 -0400
9143@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct 9269@@ -56,6 +56,12 @@ static inline int xrstor_checking(struct
9144 static inline int xsave_user(struct xsave_struct __user *buf) 9270 static inline int xsave_user(struct xsave_struct __user *buf)
9145 { 9271 {
@@ -9165,9 +9291,9 @@ diff -urNp linux-2.6.32.11/arch/x86/include/asm/xsave.h linux-2.6.32.11/arch/x86
9165 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n" 9291 __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
9166 "2:\n" 9292 "2:\n"
9167 ".section .fixup,\"ax\"\n" 9293 ".section .fixup,\"ax\"\n"
9168diff -urNp linux-2.6.32.11/arch/x86/Kconfig linux-2.6.32.11/arch/x86/Kconfig 9294diff -urNp linux-2.6.32.12/arch/x86/Kconfig linux-2.6.32.12/arch/x86/Kconfig
9169--- linux-2.6.32.11/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400 9295--- linux-2.6.32.12/arch/x86/Kconfig 2010-03-15 11:52:04.000000000 -0400
9170+++ linux-2.6.32.11/arch/x86/Kconfig 2010-04-04 20:46:41.509696869 -0400 9296+++ linux-2.6.32.12/arch/x86/Kconfig 2010-04-04 20:46:41.509696869 -0400
9171@@ -1083,7 +1083,7 @@ config PAGE_OFFSET 9297@@ -1083,7 +1083,7 @@ config PAGE_OFFSET
9172 hex 9298 hex
9173 default 0xB0000000 if VMSPLIT_3G_OPT 9299 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
9214 ---help--- 9340 ---help---
9215 Map the 32-bit VDSO to the predictable old-style address too. 9341 Map the 32-bit VDSO to the predictable old-style address too.
9216 ---help--- 9342 ---help---
9217diff -urNp linux-2.6.32.11/arch/x86/Kconfig.cpu linux-2.6.32.11/arch/x86/Kconfig.cpu 9343diff -urNp linux-2.6.32.12/arch/x86/Kconfig.cpu linux-2.6.32.12/arch/x86/Kconfig.cpu
9218--- linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-03-15 11:52:04.000000000 -0400 9344--- linux-2.6.32.12/arch/x86/Kconfig.cpu 2010-04-29 17:49:37.481119841 -0400
9219+++ linux-2.6.32.11/arch/x86/Kconfig.cpu 2010-04-04 20:46:41.509696869 -0400 9345+++ linux-2.6.32.12/arch/x86/Kconfig.cpu 2010-04-29 17:49:57.921493895 -0400
9220@@ -340,7 +340,7 @@ config X86_PPRO_FENCE 9346@@ -340,7 +340,7 @@ config X86_PPRO_FENCE
9221 9347
9222 config X86_F00F_BUG 9348 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
9244 9370
9245 config X86_MINIMUM_CPU_FAMILY 9371 config X86_MINIMUM_CPU_FAMILY
9246 int 9372 int
9247diff -urNp linux-2.6.32.11/arch/x86/Kconfig.debug linux-2.6.32.11/arch/x86/Kconfig.debug 9373diff -urNp linux-2.6.32.12/arch/x86/Kconfig.debug linux-2.6.32.12/arch/x86/Kconfig.debug
9248--- linux-2.6.32.11/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 9374--- linux-2.6.32.12/arch/x86/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
9249+++ linux-2.6.32.11/arch/x86/Kconfig.debug 2010-04-04 20:46:41.509696869 -0400 9375+++ linux-2.6.32.12/arch/x86/Kconfig.debug 2010-04-04 20:46:41.509696869 -0400
9250@@ -99,7 +99,7 @@ config X86_PTDUMP 9376@@ -99,7 +99,7 @@ config X86_PTDUMP
9251 config DEBUG_RODATA 9377 config DEBUG_RODATA
9252 bool "Write protect kernel read-only data structures" 9378 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
9256 ---help--- 9382 ---help---
9257 Mark the kernel read-only data as write-protected in the pagetables, 9383 Mark the kernel read-only data as write-protected in the pagetables,
9258 in order to catch accidental (and incorrect) writes to such const 9384 in order to catch accidental (and incorrect) writes to such const
9259diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/boot.c linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 9385diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/boot.c linux-2.6.32.12/arch/x86/kernel/acpi/boot.c
9260--- linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400 9386--- linux-2.6.32.12/arch/x86/kernel/acpi/boot.c 2010-04-04 20:41:49.916475305 -0400
9261+++ linux-2.6.32.11/arch/x86/kernel/acpi/boot.c 2010-04-04 20:46:41.509696869 -0400 9387+++ linux-2.6.32.12/arch/x86/kernel/acpi/boot.c 2010-04-04 20:46:41.509696869 -0400
9262@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a 9388@@ -1502,7 +1502,7 @@ static struct dmi_system_id __initdata a
9263 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), 9389 DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"),
9264 }, 9390 },
@@ -9268,9 +9394,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/boot.c linux-2.6.32.11/arch/x86/
9268 }; 9394 };
9269 9395
9270 /* 9396 /*
9271diff -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 9397diff -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
9272--- linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400 9398--- linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S 2010-03-15 11:52:04.000000000 -0400
9273+++ linux-2.6.32.11/arch/x86/kernel/acpi/realmode/wakeup.S 2010-04-04 20:46:41.509696869 -0400 9399+++ linux-2.6.32.12/arch/x86/kernel/acpi/realmode/wakeup.S 2010-04-04 20:46:41.509696869 -0400
9274@@ -104,7 +104,7 @@ _start: 9400@@ -104,7 +104,7 @@ _start:
9275 movl %eax, %ecx 9401 movl %eax, %ecx
9276 orl %edx, %ecx 9402 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
9280 wrmsr 9406 wrmsr
9281 1: 9407 1:
9282 9408
9283diff -urNp linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 9409diff -urNp linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c
9284--- linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 9410--- linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
9285+++ linux-2.6.32.11/arch/x86/kernel/acpi/sleep.c 2010-04-04 20:46:41.509696869 -0400 9411+++ linux-2.6.32.12/arch/x86/kernel/acpi/sleep.c 2010-04-04 20:46:41.509696869 -0400
9286@@ -11,11 +11,12 @@ 9412@@ -11,11 +11,12 @@
9287 #include <linux/cpumask.h> 9413 #include <linux/cpumask.h>
9288 #include <asm/segment.h> 9414 #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
9327 } 9453 }
9328 9454
9329 9455
9330diff -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 9456diff -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
9331--- linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400 9457--- linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S 2010-03-15 11:52:04.000000000 -0400
9332+++ linux-2.6.32.11/arch/x86/kernel/acpi/wakeup_32.S 2010-04-04 20:46:41.509696869 -0400 9458+++ linux-2.6.32.12/arch/x86/kernel/acpi/wakeup_32.S 2010-04-04 20:46:41.509696869 -0400
9333@@ -30,13 +30,11 @@ wakeup_pmode_return: 9459@@ -30,13 +30,11 @@ wakeup_pmode_return:
9334 # and restore the stack ... but you need gdt for this to work 9460 # and restore the stack ... but you need gdt for this to work
9335 movl saved_context_esp, %esp 9461 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
9346 9472
9347 bogus_magic: 9473 bogus_magic:
9348 jmp bogus_magic 9474 jmp bogus_magic
9349diff -urNp linux-2.6.32.11/arch/x86/kernel/alternative.c linux-2.6.32.11/arch/x86/kernel/alternative.c 9475diff -urNp linux-2.6.32.12/arch/x86/kernel/alternative.c linux-2.6.32.12/arch/x86/kernel/alternative.c
9350--- linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400 9476--- linux-2.6.32.12/arch/x86/kernel/alternative.c 2010-03-15 11:52:04.000000000 -0400
9351+++ linux-2.6.32.11/arch/x86/kernel/alternative.c 2010-04-04 20:46:41.509696869 -0400 9477+++ linux-2.6.32.12/arch/x86/kernel/alternative.c 2010-04-04 20:46:41.509696869 -0400
9352@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str 9478@@ -407,7 +407,7 @@ void __init_or_module apply_paravirt(str
9353 9479
9354 BUG_ON(p->len > MAX_PATCH_LEN); 9480 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
9421+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); 9547+ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]);
9422 return addr; 9548 return addr;
9423 } 9549 }
9424diff -urNp linux-2.6.32.11/arch/x86/kernel/amd_iommu.c linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 9550diff -urNp linux-2.6.32.12/arch/x86/kernel/amd_iommu.c linux-2.6.32.12/arch/x86/kernel/amd_iommu.c
9425--- linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-03-15 11:52:04.000000000 -0400 9551--- linux-2.6.32.12/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:37.521943068 -0400
9426+++ linux-2.6.32.11/arch/x86/kernel/amd_iommu.c 2010-04-04 20:46:41.509696869 -0400 9552+++ linux-2.6.32.12/arch/x86/kernel/amd_iommu.c 2010-04-29 17:49:57.953503497 -0400
9427@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains( 9553@@ -2074,7 +2074,7 @@ static void prealloc_protection_domains(
9428 } 9554 }
9429 } 9555 }
@@ -9433,9 +9559,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/amd_iommu.c linux-2.6.32.11/arch/x86/
9433 .alloc_coherent = alloc_coherent, 9559 .alloc_coherent = alloc_coherent,
9434 .free_coherent = free_coherent, 9560 .free_coherent = free_coherent,
9435 .map_page = map_page, 9561 .map_page = map_page,
9436diff -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 9562diff -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
9437--- linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400 9563--- linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c 2010-03-15 11:52:04.000000000 -0400
9438+++ linux-2.6.32.11/arch/x86/kernel/apic/io_apic.c 2010-04-04 20:46:41.509696869 -0400 9564+++ linux-2.6.32.12/arch/x86/kernel/apic/io_apic.c 2010-04-04 20:46:41.509696869 -0400
9439@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi 9565@@ -711,7 +711,7 @@ struct IO_APIC_route_entry **alloc_ioapi
9440 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics, 9566 ioapic_entries = kzalloc(sizeof(*ioapic_entries) * nr_ioapics,
9441 GFP_ATOMIC); 9567 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
9472 { 9598 {
9473 spin_unlock(&vector_lock); 9599 spin_unlock(&vector_lock);
9474 } 9600 }
9475diff -urNp linux-2.6.32.11/arch/x86/kernel/apm_32.c linux-2.6.32.11/arch/x86/kernel/apm_32.c 9601diff -urNp linux-2.6.32.12/arch/x86/kernel/apm_32.c linux-2.6.32.12/arch/x86/kernel/apm_32.c
9476--- linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400 9602--- linux-2.6.32.12/arch/x86/kernel/apm_32.c 2010-03-15 11:52:04.000000000 -0400
9477+++ linux-2.6.32.11/arch/x86/kernel/apm_32.c 2010-04-04 20:46:41.513555986 -0400 9603+++ linux-2.6.32.12/arch/x86/kernel/apm_32.c 2010-04-04 20:46:41.513555986 -0400
9478@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock); 9604@@ -410,7 +410,7 @@ static DEFINE_SPINLOCK(user_list_lock);
9479 * This is for buggy BIOS's that refer to (real mode) segment 0x40 9605 * This is for buggy BIOS's that refer to (real mode) segment 0x40
9480 * even though they are called in protected mode. 9606 * 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
9576 9702
9577 proc_create("apm", 0, NULL, &apm_file_ops); 9703 proc_create("apm", 0, NULL, &apm_file_ops);
9578 9704
9579diff -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 9705diff -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
9580--- linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400 9706--- linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c 2010-03-15 11:52:04.000000000 -0400
9581+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_32.c 2010-04-04 20:46:41.513555986 -0400 9707+++ linux-2.6.32.12/arch/x86/kernel/asm-offsets_32.c 2010-04-04 20:46:41.513555986 -0400
9582@@ -115,6 +115,11 @@ void foo(void) 9708@@ -115,6 +115,11 @@ void foo(void)
9583 OFFSET(PV_CPU_iret, pv_cpu_ops, iret); 9709 OFFSET(PV_CPU_iret, pv_cpu_ops, iret);
9584 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9710 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
9591 #endif 9717 #endif
9592 9718
9593 #ifdef CONFIG_XEN 9719 #ifdef CONFIG_XEN
9594diff -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 9720diff -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
9595--- linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400 9721--- linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c 2010-03-15 11:52:04.000000000 -0400
9596+++ linux-2.6.32.11/arch/x86/kernel/asm-offsets_64.c 2010-04-04 20:58:33.220592413 -0400 9722+++ linux-2.6.32.12/arch/x86/kernel/asm-offsets_64.c 2010-04-04 20:58:33.220592413 -0400
9597@@ -63,6 +63,18 @@ int main(void) 9723@@ -63,6 +63,18 @@ int main(void)
9598 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); 9724 OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit);
9599 OFFSET(PV_CPU_swapgs, pv_cpu_ops, swapgs); 9725 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
9621 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); 9747 DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist));
9622 BLANK(); 9748 BLANK();
9623 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); 9749 DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
9624diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/common.c linux-2.6.32.11/arch/x86/kernel/cpu/common.c 9750diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/common.c linux-2.6.32.12/arch/x86/kernel/cpu/common.c
9625--- linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400 9751--- linux-2.6.32.12/arch/x86/kernel/cpu/common.c 2010-03-15 11:52:04.000000000 -0400
9626+++ linux-2.6.32.11/arch/x86/kernel/cpu/common.c 2010-04-04 20:47:28.952733264 -0400 9752+++ linux-2.6.32.12/arch/x86/kernel/cpu/common.c 2010-04-04 20:47:28.952733264 -0400
9627@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon 9753@@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
9628 9754
9629 static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu; 9755 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
9732 struct thread_struct *thread = &curr->thread; 9858 struct thread_struct *thread = &curr->thread;
9733 9859
9734 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { 9860 if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
9735diff -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 9861diff -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
9736--- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400 9862--- linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-03-15 11:52:04.000000000 -0400
9737+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-04-04 20:46:41.513555986 -0400 9863+++ linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2010-04-04 20:46:41.513555986 -0400
9738@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any 9864@@ -521,7 +521,7 @@ static const struct dmi_system_id sw_any
9739 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), 9865 DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"),
9740 }, 9866 },
@@ -9744,9 +9870,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.
9744 }; 9870 };
9745 9871
9746 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c) 9872 static int acpi_cpufreq_blacklist(struct cpuinfo_x86 *c)
9747diff -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 9873diff -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
9748--- linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400 9874--- linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-03-15 11:52:04.000000000 -0400
9749+++ linux-2.6.32.11/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-04-04 20:46:41.513555986 -0400 9875+++ linux-2.6.32.12/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2010-04-04 20:46:41.513555986 -0400
9750@@ -225,7 +225,7 @@ static struct cpu_model models[] = 9876@@ -225,7 +225,7 @@ static struct cpu_model models[] =
9751 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, 9877 { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL },
9752 { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, 9878 { &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
9756 }; 9882 };
9757 #undef _BANIAS 9883 #undef _BANIAS
9758 #undef BANIAS 9884 #undef BANIAS
9759diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel.c linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 9885diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/intel.c linux-2.6.32.12/arch/x86/kernel/cpu/intel.c
9760--- linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:41:49.916475305 -0400 9886--- linux-2.6.32.12/arch/x86/kernel/cpu/intel.c 2010-04-04 20:41:49.916475305 -0400
9761+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel.c 2010-04-04 20:46:41.513555986 -0400 9887+++ linux-2.6.32.12/arch/x86/kernel/cpu/intel.c 2010-04-04 20:46:41.513555986 -0400
9762@@ -140,7 +140,7 @@ static void __cpuinit trap_init_f00f_bug 9888@@ -140,7 +140,7 @@ static void __cpuinit trap_init_f00f_bug
9763 * Update the IDT descriptor and reload the IDT so that 9889 * Update the IDT descriptor and reload the IDT so that
9764 * it uses the read-only mapped virtual address. 9890 * 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/
9768 load_idt(&idt_descr); 9894 load_idt(&idt_descr);
9769 } 9895 }
9770 #endif 9896 #endif
9771diff -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 9897diff -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
9772--- linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-03-15 11:52:04.000000000 -0400 9898--- linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-29 17:49:37.537108997 -0400
9773+++ linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-04 20:46:41.513555986 -0400 9899+++ linux-2.6.32.12/arch/x86/kernel/cpu/intel_cacheinfo.c 2010-04-29 17:49:57.985196208 -0400
9774@@ -863,7 +863,7 @@ static ssize_t store(struct kobject *kob 9900@@ -916,7 +916,7 @@ static ssize_t store(struct kobject *kob
9775 return ret; 9901 return ret;
9776 } 9902 }
9777 9903
@@ -9780,9 +9906,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/intel_cacheinfo.c linux-2.6.32.11
9780 .show = show, 9906 .show = show,
9781 .store = store, 9907 .store = store,
9782 }; 9908 };
9783diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/Makefile linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 9909diff -urNp linux-2.6.32.12/arch/x86/kernel/cpu/Makefile linux-2.6.32.12/arch/x86/kernel/cpu/Makefile
9784--- linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400 9910--- linux-2.6.32.12/arch/x86/kernel/cpu/Makefile 2010-03-15 11:52:04.000000000 -0400
9785+++ linux-2.6.32.11/arch/x86/kernel/cpu/Makefile 2010-04-04 20:46:41.513555986 -0400 9911+++ linux-2.6.32.12/arch/x86/kernel/cpu/Makefile 2010-04-04 20:46:41.513555986 -0400
9786@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER 9912@@ -7,10 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
9787 CFLAGS_REMOVE_common.o = -pg 9913 CFLAGS_REMOVE_common.o = -pg
9788 endif 9914 endif
@@ -9794,9 +9920,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/Makefile linux-2.6.32.11/arch/x86
9794 obj-y := intel_cacheinfo.o addon_cpuid_features.o 9920 obj-y := intel_cacheinfo.o addon_cpuid_features.o
9795 obj-y += proc.o capflags.o powerflags.o common.o 9921 obj-y += proc.o capflags.o powerflags.o common.o
9796 obj-y += vmware.o hypervisor.o sched.o 9922 obj-y += vmware.o hypervisor.o sched.o
9797diff -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 9923diff -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
9798--- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400 9924--- linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-03-15 11:52:04.000000000 -0400
9799+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-04-04 20:46:41.513555986 -0400 9925+++ linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce_amd.c 2010-04-04 20:46:41.513555986 -0400
9800@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob 9926@@ -388,7 +388,7 @@ static ssize_t store(struct kobject *kob
9801 return ret; 9927 return ret;
9802 } 9928 }
@@ -9806,9 +9932,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce_amd.c linux-2.6.32.11/
9806 .show = show, 9932 .show = show,
9807 .store = store, 9933 .store = store,
9808 }; 9934 };
9809diff -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 9935diff -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
9810--- linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400 9936--- linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c 2010-03-15 11:52:04.000000000 -0400
9811+++ linux-2.6.32.11/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-04 20:46:41.513555986 -0400 9937+++ linux-2.6.32.12/arch/x86/kernel/cpu/mcheck/mce.c 2010-04-04 20:46:41.513555986 -0400
9812@@ -187,7 +187,7 @@ static void print_mce(struct mce *m) 9938@@ -187,7 +187,7 @@ static void print_mce(struct mce *m)
9813 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "", 9939 !(m->mcgstatus & MCG_STATUS_EIPV) ? " !INEXACT!" : "",
9814 m->cs, m->ip); 9940 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
9861 }; 9987 };
9862 9988
9863 /* 9989 /*
9864diff -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 9990diff -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
9865--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400 9991--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c 2010-03-15 11:52:04.000000000 -0400
9866+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/amd.c 2010-04-04 20:46:41.513555986 -0400 9992+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/amd.c 2010-04-04 20:46:41.513555986 -0400
9867@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base 9993@@ -108,7 +108,7 @@ amd_validate_add_page(unsigned long base
9868 return 0; 9994 return 0;
9869 } 9995 }
@@ -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
9873 .vendor = X86_VENDOR_AMD, 9999 .vendor = X86_VENDOR_AMD,
9874 .set = amd_set_mtrr, 10000 .set = amd_set_mtrr,
9875 .get = amd_get_mtrr, 10001 .get = amd_get_mtrr,
9876diff -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 10002diff -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
9877--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400 10003--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c 2010-03-15 11:52:04.000000000 -0400
9878+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c 2010-04-04 20:46:41.513555986 -0400 10004+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/centaur.c 2010-04-04 20:46:41.513555986 -0400
9879@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long 10005@@ -110,7 +110,7 @@ centaur_validate_add_page(unsigned long
9880 return 0; 10006 return 0;
9881 } 10007 }
@@ -9885,9 +10011,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/centaur.c linux-2.6.32.11/ar
9885 .vendor = X86_VENDOR_CENTAUR, 10011 .vendor = X86_VENDOR_CENTAUR,
9886 .set = centaur_set_mcr, 10012 .set = centaur_set_mcr,
9887 .get = centaur_get_mcr, 10013 .get = centaur_get_mcr,
9888diff -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 10014diff -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
9889--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400 10015--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-03-15 11:52:04.000000000 -0400
9890+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-04-04 20:46:41.513555986 -0400 10016+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/cyrix.c 2010-04-04 20:46:41.513555986 -0400
9891@@ -265,7 +265,7 @@ static void cyrix_set_all(void) 10017@@ -265,7 +265,7 @@ static void cyrix_set_all(void)
9892 post_set(); 10018 post_set();
9893 } 10019 }
@@ -9897,9 +10023,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/cyrix.c linux-2.6.32.11/arch
9897 .vendor = X86_VENDOR_CYRIX, 10023 .vendor = X86_VENDOR_CYRIX,
9898 .set_all = cyrix_set_all, 10024 .set_all = cyrix_set_all,
9899 .set = cyrix_set_arr, 10025 .set = cyrix_set_arr,
9900diff -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 10026diff -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
9901--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400 10027--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c 2010-03-15 11:52:04.000000000 -0400
9902+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/generic.c 2010-04-04 20:46:41.513555986 -0400 10028+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/generic.c 2010-04-04 20:46:41.513555986 -0400
9903@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra 10029@@ -29,7 +29,7 @@ static struct fixed_range_block fixed_ra
9904 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */ 10030 { MSR_MTRRfix64K_00000, 1 }, /* one 64k MTRR */
9905 { MSR_MTRRfix16K_80000, 2 }, /* two 16k MTRRs */ 10031 { 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
9918 .use_intel_if = 1, 10044 .use_intel_if = 1,
9919 .set_all = generic_set_all, 10045 .set_all = generic_set_all,
9920 .get = generic_get_mtrr, 10046 .get = generic_get_mtrr,
9921diff -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 10047diff -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
9922--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400 10048--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c 2010-03-15 11:52:04.000000000 -0400
9923+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/main.c 2010-04-04 20:46:41.513555986 -0400 10049+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/main.c 2010-04-04 20:46:41.513555986 -0400
9924@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex); 10050@@ -60,14 +60,14 @@ static DEFINE_MUTEX(mtrr_mutex);
9925 u64 size_or_mask, size_and_mask; 10051 u64 size_or_mask, size_and_mask;
9926 static bool mtrr_aps_delayed_init; 10052 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/
9939 { 10065 {
9940 if (ops->vendor && ops->vendor < X86_VENDOR_NUM) 10066 if (ops->vendor && ops->vendor < X86_VENDOR_NUM)
9941 mtrr_ops[ops->vendor] = ops; 10067 mtrr_ops[ops->vendor] = ops;
9942diff -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 10068diff -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
9943--- linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400 10069--- linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-03-15 11:52:04.000000000 -0400
9944+++ linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-04-04 20:46:41.517551870 -0400 10070+++ linux-2.6.32.12/arch/x86/kernel/cpu/mtrr/mtrr.h 2010-04-04 20:46:41.517551870 -0400
9945@@ -12,19 +12,19 @@ 10071@@ -12,19 +12,19 @@
9946 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES]; 10072 extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
9947 10073
@@ -9992,9 +10118,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/cpu/mtrr/mtrr.h linux-2.6.32.11/arch/
9992 10118
9993 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd) 10119 #define is_cpu(vnd) (mtrr_if && mtrr_if->vendor == X86_VENDOR_##vnd)
9994 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1) 10120 #define use_intel() (mtrr_if && mtrr_if->use_intel_if == 1)
9995diff -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 10121diff -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
9996--- linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400 10122--- linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-03-15 11:52:04.000000000 -0400
9997+++ linux-2.6.32.11/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-04-04 20:46:41.517551870 -0400 10123+++ linux-2.6.32.12/arch/x86/kernel/cpu/perfctr-watchdog.c 2010-04-04 20:46:41.517551870 -0400
9998@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk { 10124@@ -30,11 +30,11 @@ struct nmi_watchdog_ctlblk {
9999 10125
10000 /* Interface defining a CPU specific perfctr watchdog */ 10126 /* 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
10028 static struct wd_ops intel_arch_wd_ops __read_mostly = { 10154 static struct wd_ops intel_arch_wd_ops __read_mostly = {
10029 .reserve = single_msr_reserve, 10155 .reserve = single_msr_reserve,
10030 .unreserve = single_msr_unreserve, 10156 .unreserve = single_msr_unreserve,
10031diff -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 10157diff -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
10032--- linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-03-15 11:52:04.000000000 -0400 10158--- linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:37.537108997 -0400
10033+++ linux-2.6.32.11/arch/x86/kernel/cpu/perf_event.c 2010-04-04 20:46:41.517551870 -0400 10159+++ linux-2.6.32.12/arch/x86/kernel/cpu/perf_event.c 2010-04-29 17:49:57.989487280 -0400
10034@@ -2252,7 +2252,7 @@ perf_callchain_user(struct pt_regs *regs 10160@@ -2354,7 +2354,7 @@ perf_callchain_user(struct pt_regs *regs
10035 break; 10161 break;
10036 10162
10037 callchain_store(entry, frame.return_address); 10163 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
10040 } 10166 }
10041 } 10167 }
10042 10168
10043diff -urNp linux-2.6.32.11/arch/x86/kernel/crash.c linux-2.6.32.11/arch/x86/kernel/crash.c 10169diff -urNp linux-2.6.32.12/arch/x86/kernel/crash.c linux-2.6.32.12/arch/x86/kernel/crash.c
10044--- linux-2.6.32.11/arch/x86/kernel/crash.c 2010-03-15 11:52:04.000000000 -0400 10170--- linux-2.6.32.12/arch/x86/kernel/crash.c 2010-04-29 17:49:37.537108997 -0400
10045+++ linux-2.6.32.11/arch/x86/kernel/crash.c 2010-04-04 20:46:41.517551870 -0400 10171+++ linux-2.6.32.12/arch/x86/kernel/crash.c 2010-04-29 17:49:57.989487280 -0400
10046@@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 10172@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu,
10047 regs = args->regs; 10173 regs = args->regs;
10048 10174
10049 #ifdef CONFIG_X86_32 10175 #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
10052 crash_fixup_ss_esp(&fixed_regs, regs); 10178 crash_fixup_ss_esp(&fixed_regs, regs);
10053 regs = &fixed_regs; 10179 regs = &fixed_regs;
10054 } 10180 }
10055diff -urNp linux-2.6.32.11/arch/x86/kernel/doublefault_32.c linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 10181diff -urNp linux-2.6.32.12/arch/x86/kernel/doublefault_32.c linux-2.6.32.12/arch/x86/kernel/doublefault_32.c
10056--- linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400 10182--- linux-2.6.32.12/arch/x86/kernel/doublefault_32.c 2010-03-15 11:52:04.000000000 -0400
10057+++ linux-2.6.32.11/arch/x86/kernel/doublefault_32.c 2010-04-04 20:46:41.517551870 -0400 10183+++ linux-2.6.32.12/arch/x86/kernel/doublefault_32.c 2010-04-04 20:46:41.517551870 -0400
10058@@ -11,7 +11,7 @@ 10184@@ -11,7 +11,7 @@
10059 10185
10060 #define DOUBLEFAULT_STACKSIZE (1024) 10186 #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
10086 .fs = __KERNEL_PERCPU, 10212 .fs = __KERNEL_PERCPU,
10087 10213
10088 .__cr3 = __pa_nodebug(swapper_pg_dir), 10214 .__cr3 = __pa_nodebug(swapper_pg_dir),
10089diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 10215diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c
10090--- linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400 10216--- linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c 2010-03-15 11:52:04.000000000 -0400
10091+++ linux-2.6.32.11/arch/x86/kernel/dumpstack_32.c 2010-04-04 20:46:41.517551870 -0400 10217+++ linux-2.6.32.12/arch/x86/kernel/dumpstack_32.c 2010-04-04 20:46:41.517551870 -0400
10092@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs 10218@@ -112,11 +112,12 @@ void show_registers(struct pt_regs *regs
10093 * When in-kernel, we also print out the stack and code at the 10219 * When in-kernel, we also print out the stack and code at the
10094 * time of the fault.. 10220 * 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
10133 if (ip < PAGE_OFFSET) 10259 if (ip < PAGE_OFFSET)
10134 return 0; 10260 return 0;
10135 if (probe_kernel_address((unsigned short *)ip, ud2)) 10261 if (probe_kernel_address((unsigned short *)ip, ud2))
10136diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack.c linux-2.6.32.11/arch/x86/kernel/dumpstack.c 10262diff -urNp linux-2.6.32.12/arch/x86/kernel/dumpstack.c linux-2.6.32.12/arch/x86/kernel/dumpstack.c
10137--- linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400 10263--- linux-2.6.32.12/arch/x86/kernel/dumpstack.c 2010-03-15 11:52:04.000000000 -0400
10138+++ linux-2.6.32.11/arch/x86/kernel/dumpstack.c 2010-04-04 20:46:41.517551870 -0400 10264+++ linux-2.6.32.12/arch/x86/kernel/dumpstack.c 2010-04-04 20:46:41.517551870 -0400
10139@@ -180,7 +180,7 @@ void dump_stack(void) 10265@@ -180,7 +180,7 @@ void dump_stack(void)
10140 #endif 10266 #endif
10141 10267
@@ -10163,9 +10289,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/dumpstack.c linux-2.6.32.11/arch/x86/
10163 report_bug(regs->ip, regs); 10289 report_bug(regs->ip, regs);
10164 10290
10165 if (__die(str, regs, err)) 10291 if (__die(str, regs, err))
10166diff -urNp linux-2.6.32.11/arch/x86/kernel/e820.c linux-2.6.32.11/arch/x86/kernel/e820.c 10292diff -urNp linux-2.6.32.12/arch/x86/kernel/e820.c linux-2.6.32.12/arch/x86/kernel/e820.c
10167--- linux-2.6.32.11/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400 10293--- linux-2.6.32.12/arch/x86/kernel/e820.c 2010-03-15 11:52:04.000000000 -0400
10168+++ linux-2.6.32.11/arch/x86/kernel/e820.c 2010-04-04 20:46:41.517551870 -0400 10294+++ linux-2.6.32.12/arch/x86/kernel/e820.c 2010-04-04 20:46:41.517551870 -0400
10169@@ -733,7 +733,7 @@ struct early_res { 10295@@ -733,7 +733,7 @@ struct early_res {
10170 }; 10296 };
10171 static struct early_res early_res[MAX_EARLY_RES] __initdata = { 10297 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
10175 }; 10301 };
10176 10302
10177 static int __init find_overlapped_early(u64 start, u64 end) 10303 static int __init find_overlapped_early(u64 start, u64 end)
10178diff -urNp linux-2.6.32.11/arch/x86/kernel/efi_32.c linux-2.6.32.11/arch/x86/kernel/efi_32.c 10304diff -urNp linux-2.6.32.12/arch/x86/kernel/efi_32.c linux-2.6.32.12/arch/x86/kernel/efi_32.c
10179--- linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400 10305--- linux-2.6.32.12/arch/x86/kernel/efi_32.c 2010-03-15 11:52:04.000000000 -0400
10180+++ linux-2.6.32.11/arch/x86/kernel/efi_32.c 2010-04-04 20:46:41.517551870 -0400 10306+++ linux-2.6.32.12/arch/x86/kernel/efi_32.c 2010-04-04 20:46:41.517551870 -0400
10181@@ -38,70 +38,38 @@ 10307@@ -38,70 +38,38 @@
10182 */ 10308 */
10183 10309
@@ -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
10258 10384
10259 /* 10385 /*
10260 * After the lock is released, the original page table is restored. 10386 * After the lock is released, the original page table is restored.
10261diff -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 10387diff -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
10262--- linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400 10388--- linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S 2010-03-15 11:52:04.000000000 -0400
10263+++ linux-2.6.32.11/arch/x86/kernel/efi_stub_32.S 2010-04-04 20:46:41.517551870 -0400 10389+++ linux-2.6.32.12/arch/x86/kernel/efi_stub_32.S 2010-04-04 20:46:41.517551870 -0400
10264@@ -6,6 +6,7 @@ 10390@@ -6,6 +6,7 @@
10265 */ 10391 */
10266 10392
@@ -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
10359 saved_return_addr: 10485 saved_return_addr:
10360 .long 0 10486 .long 0
10361 efi_rt_function_ptr: 10487 efi_rt_function_ptr:
10362diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_32.S linux-2.6.32.11/arch/x86/kernel/entry_32.S 10488diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_32.S linux-2.6.32.12/arch/x86/kernel/entry_32.S
10363--- linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400 10489--- linux-2.6.32.12/arch/x86/kernel/entry_32.S 2010-03-15 11:52:04.000000000 -0400
10364+++ linux-2.6.32.11/arch/x86/kernel/entry_32.S 2010-04-04 20:47:28.952733264 -0400 10490+++ linux-2.6.32.12/arch/x86/kernel/entry_32.S 2010-04-04 20:47:28.952733264 -0400
10365@@ -191,7 +191,67 @@ 10491@@ -191,7 +191,67 @@
10366 10492
10367 #endif /* CONFIG_X86_32_LAZY_GS */ 10493 #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
10675 RESTORE_REGS 10801 RESTORE_REGS
10676 lss 12+4(%esp), %esp # back to espfix stack 10802 lss 12+4(%esp), %esp # back to espfix stack
10677 CFI_ADJUST_CFA_OFFSET -24 10803 CFI_ADJUST_CFA_OFFSET -24
10678diff -urNp linux-2.6.32.11/arch/x86/kernel/entry_64.S linux-2.6.32.11/arch/x86/kernel/entry_64.S 10804diff -urNp linux-2.6.32.12/arch/x86/kernel/entry_64.S linux-2.6.32.12/arch/x86/kernel/entry_64.S
10679--- linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400 10805--- linux-2.6.32.12/arch/x86/kernel/entry_64.S 2010-03-15 11:52:04.000000000 -0400
10680+++ linux-2.6.32.11/arch/x86/kernel/entry_64.S 2010-04-07 16:58:23.343008831 -0400 10806+++ linux-2.6.32.12/arch/x86/kernel/entry_64.S 2010-04-07 16:58:23.343008831 -0400
10681@@ -53,6 +53,7 @@ 10807@@ -53,6 +53,7 @@
10682 #include <asm/paravirt.h> 10808 #include <asm/paravirt.h>
10683 #include <asm/ftrace.h> 10809 #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
11074 RESTORE_ALL 8 11200 RESTORE_ALL 8
11075 jmp irq_return 11201 jmp irq_return
11076 nmi_userspace: 11202 nmi_userspace:
11077diff -urNp linux-2.6.32.11/arch/x86/kernel/ftrace.c linux-2.6.32.11/arch/x86/kernel/ftrace.c 11203diff -urNp linux-2.6.32.12/arch/x86/kernel/ftrace.c linux-2.6.32.12/arch/x86/kernel/ftrace.c
11078--- linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400 11204--- linux-2.6.32.12/arch/x86/kernel/ftrace.c 2010-03-15 11:52:04.000000000 -0400
11079+++ linux-2.6.32.11/arch/x86/kernel/ftrace.c 2010-04-04 20:46:41.517551870 -0400 11205+++ linux-2.6.32.12/arch/x86/kernel/ftrace.c 2010-04-04 20:46:41.517551870 -0400
11080@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void) 11206@@ -149,7 +149,9 @@ void ftrace_nmi_enter(void)
11081 { 11207 {
11082 if (atomic_inc_return(&nmi_running) & MOD_CODE_WRITE_FLAG) { 11208 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
11142 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE)) 11268 if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
11143 return -EFAULT; 11269 return -EFAULT;
11144 11270
11145diff -urNp linux-2.6.32.11/arch/x86/kernel/head32.c linux-2.6.32.11/arch/x86/kernel/head32.c 11271diff -urNp linux-2.6.32.12/arch/x86/kernel/head32.c linux-2.6.32.12/arch/x86/kernel/head32.c
11146--- linux-2.6.32.11/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400 11272--- linux-2.6.32.12/arch/x86/kernel/head32.c 2010-03-15 11:52:04.000000000 -0400
11147+++ linux-2.6.32.11/arch/x86/kernel/head32.c 2010-04-04 20:46:41.517551870 -0400 11273+++ linux-2.6.32.12/arch/x86/kernel/head32.c 2010-04-04 20:46:41.517551870 -0400
11148@@ -16,6 +16,7 @@ 11274@@ -16,6 +16,7 @@
11149 #include <asm/apic.h> 11275 #include <asm/apic.h>
11150 #include <asm/io_apic.h> 11276 #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
11162 11288
11163 #ifdef CONFIG_BLK_DEV_INITRD 11289 #ifdef CONFIG_BLK_DEV_INITRD
11164 /* Reserve INITRD */ 11290 /* Reserve INITRD */
11165diff -urNp linux-2.6.32.11/arch/x86/kernel/head_32.S linux-2.6.32.11/arch/x86/kernel/head_32.S 11291diff -urNp linux-2.6.32.12/arch/x86/kernel/head_32.S linux-2.6.32.12/arch/x86/kernel/head_32.S
11166--- linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400 11292--- linux-2.6.32.12/arch/x86/kernel/head_32.S 2010-03-15 11:52:04.000000000 -0400
11167+++ linux-2.6.32.11/arch/x86/kernel/head_32.S 2010-04-04 20:58:33.220592413 -0400 11293+++ linux-2.6.32.12/arch/x86/kernel/head_32.S 2010-04-04 20:58:33.220592413 -0400
11168@@ -19,10 +19,17 @@ 11294@@ -19,10 +19,17 @@
11169 #include <asm/setup.h> 11295 #include <asm/setup.h>
11170 #include <asm/processor-flags.h> 11296 #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
11606+ /* Be sure this is zeroed to avoid false validations in Xen */ 11732+ /* Be sure this is zeroed to avoid false validations in Xen */
11607+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0 11733+ .fill PAGE_SIZE_asm - GDT_SIZE,1,0
11608+ .endr 11734+ .endr
11609diff -urNp linux-2.6.32.11/arch/x86/kernel/head64.c linux-2.6.32.11/arch/x86/kernel/head64.c 11735diff -urNp linux-2.6.32.12/arch/x86/kernel/head64.c linux-2.6.32.12/arch/x86/kernel/head64.c
11610--- linux-2.6.32.11/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400 11736--- linux-2.6.32.12/arch/x86/kernel/head64.c 2010-03-15 11:52:04.000000000 -0400
11611+++ linux-2.6.32.11/arch/x86/kernel/head64.c 2010-04-04 20:58:33.225084964 -0400 11737+++ linux-2.6.32.12/arch/x86/kernel/head64.c 2010-04-04 20:58:33.225084964 -0400
11612@@ -29,7 +29,13 @@ 11738@@ -29,7 +29,13 @@
11613 static void __init zap_identity_mappings(void) 11739 static void __init zap_identity_mappings(void)
11614 { 11740 {
@@ -11623,9 +11749,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/head64.c linux-2.6.32.11/arch/x86/ker
11623 __flush_tlb_all(); 11749 __flush_tlb_all();
11624 } 11750 }
11625 11751
11626diff -urNp linux-2.6.32.11/arch/x86/kernel/head_64.S linux-2.6.32.11/arch/x86/kernel/head_64.S 11752diff -urNp linux-2.6.32.12/arch/x86/kernel/head_64.S linux-2.6.32.12/arch/x86/kernel/head_64.S
11627--- linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400 11753--- linux-2.6.32.12/arch/x86/kernel/head_64.S 2010-03-15 11:52:04.000000000 -0400
11628+++ linux-2.6.32.11/arch/x86/kernel/head_64.S 2010-04-04 20:58:33.220592413 -0400 11754+++ linux-2.6.32.12/arch/x86/kernel/head_64.S 2010-04-04 20:58:33.220592413 -0400
11629@@ -19,6 +19,7 @@ 11755@@ -19,6 +19,7 @@
11630 #include <asm/cache.h> 11756 #include <asm/cache.h>
11631 #include <asm/processor-flags.h> 11757 #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
11896 12022
11897 __PAGE_ALIGNED_BSS 12023 __PAGE_ALIGNED_BSS
11898 .align PAGE_SIZE 12024 .align PAGE_SIZE
11899diff -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 12025diff -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
11900--- linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400 12026--- linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c 2010-03-15 11:52:04.000000000 -0400
11901+++ linux-2.6.32.11/arch/x86/kernel/i386_ksyms_32.c 2010-04-04 20:46:41.517551870 -0400 12027+++ linux-2.6.32.12/arch/x86/kernel/i386_ksyms_32.c 2010-04-04 20:46:41.517551870 -0400
11902@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void); 12028@@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
11903 EXPORT_SYMBOL(cmpxchg8b_emu); 12029 EXPORT_SYMBOL(cmpxchg8b_emu);
11904 #endif 12030 #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/
11920+#ifdef CONFIG_PAX_KERNEXEC 12046+#ifdef CONFIG_PAX_KERNEXEC
11921+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR); 12047+EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
11922+#endif 12048+#endif
11923diff -urNp linux-2.6.32.11/arch/x86/kernel/init_task.c linux-2.6.32.11/arch/x86/kernel/init_task.c 12049diff -urNp linux-2.6.32.12/arch/x86/kernel/init_task.c linux-2.6.32.12/arch/x86/kernel/init_task.c
11924--- linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400 12050--- linux-2.6.32.12/arch/x86/kernel/init_task.c 2010-03-15 11:52:04.000000000 -0400
11925+++ linux-2.6.32.11/arch/x86/kernel/init_task.c 2010-04-04 20:46:41.517551870 -0400 12051+++ linux-2.6.32.12/arch/x86/kernel/init_task.c 2010-04-04 20:46:41.517551870 -0400
11926@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task); 12052@@ -38,5 +38,5 @@ EXPORT_SYMBOL(init_task);
11927 * section. Since TSS's are completely CPU-local, we want them 12053 * section. Since TSS's are completely CPU-local, we want them
11928 * on exact cacheline boundaries, to eliminate cacheline ping-pong. 12054 * 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/
11931- 12057-
11932+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; 12058+struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
11933+EXPORT_SYMBOL(init_tss); 12059+EXPORT_SYMBOL(init_tss);
11934diff -urNp linux-2.6.32.11/arch/x86/kernel/ioport.c linux-2.6.32.11/arch/x86/kernel/ioport.c 12060diff -urNp linux-2.6.32.12/arch/x86/kernel/ioport.c linux-2.6.32.12/arch/x86/kernel/ioport.c
11935--- linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400 12061--- linux-2.6.32.12/arch/x86/kernel/ioport.c 2010-03-15 11:52:04.000000000 -0400
11936+++ linux-2.6.32.11/arch/x86/kernel/ioport.c 2010-04-04 20:46:41.517551870 -0400 12062+++ linux-2.6.32.12/arch/x86/kernel/ioport.c 2010-04-04 20:46:41.517551870 -0400
11937@@ -6,6 +6,7 @@ 12063@@ -6,6 +6,7 @@
11938 #include <linux/sched.h> 12064 #include <linux/sched.h>
11939 #include <linux/kernel.h> 12065 #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
11978 } 12104 }
11979 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); 12105 regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12);
11980 12106
11981diff -urNp linux-2.6.32.11/arch/x86/kernel/irq_32.c linux-2.6.32.11/arch/x86/kernel/irq_32.c 12107diff -urNp linux-2.6.32.12/arch/x86/kernel/irq_32.c linux-2.6.32.12/arch/x86/kernel/irq_32.c
11982--- linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400 12108--- linux-2.6.32.12/arch/x86/kernel/irq_32.c 2010-03-15 11:52:04.000000000 -0400
11983+++ linux-2.6.32.11/arch/x86/kernel/irq_32.c 2010-04-04 20:46:41.521777445 -0400 12109+++ linux-2.6.32.12/arch/x86/kernel/irq_32.c 2010-04-04 20:46:41.521777445 -0400
11984@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc 12110@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc
11985 return 0; 12111 return 0;
11986 12112
@@ -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
11999 12125
12000 call_on_stack(__do_softirq, isp); 12126 call_on_stack(__do_softirq, isp);
12001 /* 12127 /*
12002diff -urNp linux-2.6.32.11/arch/x86/kernel/kgdb.c linux-2.6.32.11/arch/x86/kernel/kgdb.c 12128diff -urNp linux-2.6.32.12/arch/x86/kernel/kgdb.c linux-2.6.32.12/arch/x86/kernel/kgdb.c
12003--- linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 12129--- linux-2.6.32.12/arch/x86/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
12004+++ linux-2.6.32.11/arch/x86/kernel/kgdb.c 2010-04-04 20:46:41.521777445 -0400 12130+++ linux-2.6.32.12/arch/x86/kernel/kgdb.c 2010-04-04 20:46:41.521777445 -0400
12005@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception 12131@@ -573,7 +573,7 @@ unsigned long kgdb_arch_pc(int exception
12006 return instruction_pointer(regs); 12132 return instruction_pointer(regs);
12007 } 12133 }
@@ -12011,9 +12137,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/kgdb.c linux-2.6.32.11/arch/x86/kerne
12011 /* Breakpoint instruction: */ 12137 /* Breakpoint instruction: */
12012 .gdb_bpt_instr = { 0xcc }, 12138 .gdb_bpt_instr = { 0xcc },
12013 .flags = KGDB_HW_BREAKPOINT, 12139 .flags = KGDB_HW_BREAKPOINT,
12014diff -urNp linux-2.6.32.11/arch/x86/kernel/kprobes.c linux-2.6.32.11/arch/x86/kernel/kprobes.c 12140diff -urNp linux-2.6.32.12/arch/x86/kernel/kprobes.c linux-2.6.32.12/arch/x86/kernel/kprobes.c
12015--- linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 12141--- linux-2.6.32.12/arch/x86/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
12016+++ linux-2.6.32.11/arch/x86/kernel/kprobes.c 2010-04-04 20:46:41.521777445 -0400 12142+++ linux-2.6.32.12/arch/x86/kernel/kprobes.c 2010-04-04 20:46:41.521777445 -0400
12017@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f 12143@@ -166,9 +166,13 @@ static void __kprobes set_jmp_op(void *f
12018 char op; 12144 char op;
12019 s32 raddr; 12145 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
12096 return ret; 12222 return ret;
12097 12223
12098 switch (val) { 12224 switch (val) {
12099diff -urNp linux-2.6.32.11/arch/x86/kernel/ldt.c linux-2.6.32.11/arch/x86/kernel/ldt.c 12225diff -urNp linux-2.6.32.12/arch/x86/kernel/ldt.c linux-2.6.32.12/arch/x86/kernel/ldt.c
12100--- linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400 12226--- linux-2.6.32.12/arch/x86/kernel/ldt.c 2010-03-15 11:52:04.000000000 -0400
12101+++ linux-2.6.32.11/arch/x86/kernel/ldt.c 2010-04-04 20:46:41.521777445 -0400 12227+++ linux-2.6.32.12/arch/x86/kernel/ldt.c 2010-04-04 20:46:41.521777445 -0400
12102@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i 12228@@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i
12103 if (reload) { 12229 if (reload) {
12104 #ifdef CONFIG_SMP 12230 #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
12163 fill_ldt(&ldt, &ldt_info); 12289 fill_ldt(&ldt, &ldt_info);
12164 if (oldmode) 12290 if (oldmode)
12165 ldt.avl = 0; 12291 ldt.avl = 0;
12166diff -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 12292diff -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
12167--- linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400 12293--- linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c 2010-03-15 11:52:04.000000000 -0400
12168+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_32.c 2010-04-04 20:46:41.521777445 -0400 12294+++ linux-2.6.32.12/arch/x86/kernel/machine_kexec_32.c 2010-04-04 20:46:41.521777445 -0400
12169@@ -26,7 +26,7 @@ 12295@@ -26,7 +26,7 @@
12170 #include <asm/system.h> 12296 #include <asm/system.h>
12171 #include <asm/cacheflush.h> 12297 #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
12193 12319
12194 relocate_kernel_ptr = control_page; 12320 relocate_kernel_ptr = control_page;
12195 page_list[PA_CONTROL_PAGE] = __pa(control_page); 12321 page_list[PA_CONTROL_PAGE] = __pa(control_page);
12196diff -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 12322diff -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
12197--- linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400 12323--- linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c 2010-03-15 11:52:04.000000000 -0400
12198+++ linux-2.6.32.11/arch/x86/kernel/machine_kexec_64.c 2010-04-04 20:58:33.225084964 -0400 12324+++ linux-2.6.32.12/arch/x86/kernel/machine_kexec_64.c 2010-04-04 20:58:33.225084964 -0400
12199@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag 12325@@ -126,7 +126,13 @@ static int init_level4_page(struct kimag
12200 } 12326 }
12201 /* clear the unused entries */ 12327 /* 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
12210 addr += PGDIR_SIZE; 12336 addr += PGDIR_SIZE;
12211 } 12337 }
12212 out: 12338 out:
12213diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_amd.c linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 12339diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_amd.c linux-2.6.32.12/arch/x86/kernel/microcode_amd.c
12214--- linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400 12340--- linux-2.6.32.12/arch/x86/kernel/microcode_amd.c 2010-03-15 11:52:04.000000000 -0400
12215+++ linux-2.6.32.11/arch/x86/kernel/microcode_amd.c 2010-04-04 20:46:41.521777445 -0400 12341+++ linux-2.6.32.12/arch/x86/kernel/microcode_amd.c 2010-04-04 20:46:41.521777445 -0400
12216@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c 12342@@ -346,7 +346,7 @@ static void microcode_fini_cpu_amd(int c
12217 uci->mc = NULL; 12343 uci->mc = NULL;
12218 } 12344 }
@@ -12231,9 +12357,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_amd.c linux-2.6.32.11/arch/
12231 { 12357 {
12232 return &microcode_amd_ops; 12358 return &microcode_amd_ops;
12233 } 12359 }
12234diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_core.c linux-2.6.32.11/arch/x86/kernel/microcode_core.c 12360diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_core.c linux-2.6.32.12/arch/x86/kernel/microcode_core.c
12235--- linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400 12361--- linux-2.6.32.12/arch/x86/kernel/microcode_core.c 2010-03-15 11:52:04.000000000 -0400
12236+++ linux-2.6.32.11/arch/x86/kernel/microcode_core.c 2010-04-04 20:46:41.521777445 -0400 12362+++ linux-2.6.32.12/arch/x86/kernel/microcode_core.c 2010-04-04 20:46:41.521777445 -0400
12237@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL"); 12363@@ -90,7 +90,7 @@ MODULE_LICENSE("GPL");
12238 12364
12239 #define MICROCODE_VERSION "2.00" 12365 #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
12243 12369
12244 /* 12370 /*
12245 * Synchronization. 12371 * Synchronization.
12246diff -urNp linux-2.6.32.11/arch/x86/kernel/microcode_intel.c linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 12372diff -urNp linux-2.6.32.12/arch/x86/kernel/microcode_intel.c linux-2.6.32.12/arch/x86/kernel/microcode_intel.c
12247--- linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400 12373--- linux-2.6.32.12/arch/x86/kernel/microcode_intel.c 2010-03-15 11:52:04.000000000 -0400
12248+++ linux-2.6.32.11/arch/x86/kernel/microcode_intel.c 2010-04-04 20:46:41.521777445 -0400 12374+++ linux-2.6.32.12/arch/x86/kernel/microcode_intel.c 2010-04-04 20:46:41.521777445 -0400
12249@@ -443,13 +443,13 @@ static enum ucode_state request_microcod 12375@@ -443,13 +443,13 @@ static enum ucode_state request_microcod
12250 12376
12251 static int get_ucode_user(void *to, const void *from, size_t n) 12377 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
12280 { 12406 {
12281 return &microcode_intel_ops; 12407 return &microcode_intel_ops;
12282 } 12408 }
12283diff -urNp linux-2.6.32.11/arch/x86/kernel/module.c linux-2.6.32.11/arch/x86/kernel/module.c 12409diff -urNp linux-2.6.32.12/arch/x86/kernel/module.c linux-2.6.32.12/arch/x86/kernel/module.c
12284--- linux-2.6.32.11/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 12410--- linux-2.6.32.12/arch/x86/kernel/module.c 2010-03-15 11:52:04.000000000 -0400
12285+++ linux-2.6.32.11/arch/x86/kernel/module.c 2010-04-04 20:46:41.521777445 -0400 12411+++ linux-2.6.32.12/arch/x86/kernel/module.c 2010-04-04 20:46:41.521777445 -0400
12286@@ -34,7 +34,7 @@ 12412@@ -34,7 +34,7 @@
12287 #define DEBUGP(fmt...) 12413 #define DEBUGP(fmt...)
12288 #endif 12414 #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
12423 #if 0 12549 #if 0
12424 if ((s64)val != *(s32 *)loc) 12550 if ((s64)val != *(s32 *)loc)
12425 goto overflow; 12551 goto overflow;
12426diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt.c linux-2.6.32.11/arch/x86/kernel/paravirt.c 12552diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt.c linux-2.6.32.12/arch/x86/kernel/paravirt.c
12427--- linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400 12553--- linux-2.6.32.12/arch/x86/kernel/paravirt.c 2010-03-15 11:52:04.000000000 -0400
12428+++ linux-2.6.32.11/arch/x86/kernel/paravirt.c 2010-04-04 20:46:41.521777445 -0400 12554+++ linux-2.6.32.12/arch/x86/kernel/paravirt.c 2010-04-29 17:46:36.865234674 -0400
12429@@ -120,9 +120,9 @@ unsigned paravirt_patch_jmp(void *insnbu 12555@@ -122,7 +122,7 @@ unsigned paravirt_patch_jmp(void *insnbu
12430
12431 /* Neat trick to map patch type back to the call within the
12432 * corresponding structure. */ 12556 * corresponding structure. */
12433-static void *get_call_destination(u8 type) 12557 static void *get_call_destination(u8 type)
12434+static const void *get_call_destination(u8 type)
12435 { 12558 {
12436- struct paravirt_patch_template tmpl = { 12559- struct paravirt_patch_template tmpl = {
12437+ const struct paravirt_patch_template tmpl = { 12560+ const struct paravirt_patch_template tmpl = {
12438 .pv_init_ops = pv_init_ops, 12561 .pv_init_ops = pv_init_ops,
12439 .pv_time_ops = pv_time_ops, 12562 .pv_time_ops = pv_time_ops,
12440 .pv_cpu_ops = pv_cpu_ops, 12563 .pv_cpu_ops = pv_cpu_ops,
12441@@ -133,13 +133,13 @@ static void *get_call_destination(u8 typ 12564@@ -145,14 +145,14 @@ unsigned paravirt_patch_default(u8 type,
12442 .pv_lock_ops = pv_lock_ops,
12443 #endif
12444 };
12445- return *((void **)&tmpl + type);
12446+ return *((const void **)&tmpl + type);
12447 }
12448
12449 unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf,
12450 unsigned long addr, unsigned len)
12451 {
12452- void *opfunc = get_call_destination(type);
12453+ const void *opfunc = get_call_destination(type);
12454 unsigned ret;
12455
12456 if (opfunc == NULL) 12565 if (opfunc == NULL)
12566 /* If there's no function, patch it with a ud2a (BUG) */
12567 ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a));
12568- else if (opfunc == _paravirt_nop)
12569+ else if (opfunc == (void *)_paravirt_nop)
12570 /* If the operation is a nop, then nop the callsite */
12571 ret = paravirt_patch_nop();
12572
12573 /* identity functions just return their single argument */
12574- else if (opfunc == _paravirt_ident_32)
12575+ else if (opfunc == (void *)_paravirt_ident_32)
12576 ret = paravirt_patch_ident_32(insnbuf, len);
12577- else if (opfunc == _paravirt_ident_64)
12578+ else if (opfunc == (void *)_paravirt_ident_64)
12579 ret = paravirt_patch_ident_64(insnbuf, len);
12580
12581 else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) ||
12457@@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn 12582@@ -178,7 +178,7 @@ unsigned paravirt_patch_insns(void *insn
12458 if (insn_len > len || start == NULL) 12583 if (insn_len > len || start == NULL)
12459 insn_len = len; 12584 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
12530 }; 12655 };
12531 12656
12532 EXPORT_SYMBOL_GPL(pv_time_ops); 12657 EXPORT_SYMBOL_GPL(pv_time_ops);
12533diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 12658diff -urNp linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c
12534--- linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400 12659--- linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c 2010-03-15 11:52:04.000000000 -0400
12535+++ linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c 2010-04-04 20:46:41.521777445 -0400 12660+++ linux-2.6.32.12/arch/x86/kernel/paravirt-spinlocks.c 2010-04-04 20:46:41.521777445 -0400
12536@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * 12661@@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t *
12537 __raw_spin_lock(lock); 12662 __raw_spin_lock(lock);
12538 } 12663 }
@@ -12542,9 +12667,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.32.11/
12542 #ifdef CONFIG_SMP 12667 #ifdef CONFIG_SMP
12543 .spin_is_locked = __ticket_spin_is_locked, 12668 .spin_is_locked = __ticket_spin_is_locked,
12544 .spin_is_contended = __ticket_spin_is_contended, 12669 .spin_is_contended = __ticket_spin_is_contended,
12545diff -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 12670diff -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
12546--- linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400 12671--- linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c 2010-03-15 11:52:04.000000000 -0400
12547+++ linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c 2010-04-04 20:46:41.521777445 -0400 12672+++ linux-2.6.32.12/arch/x86/kernel/pci-calgary_64.c 2010-04-04 20:46:41.521777445 -0400
12548@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct 12673@@ -472,7 +472,7 @@ static void calgary_free_coherent(struct
12549 free_pages((unsigned long)vaddr, get_order(size)); 12674 free_pages((unsigned long)vaddr, get_order(size));
12550 } 12675 }
@@ -12554,9 +12679,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-calgary_64.c linux-2.6.32.11/arch
12554 .alloc_coherent = calgary_alloc_coherent, 12679 .alloc_coherent = calgary_alloc_coherent,
12555 .free_coherent = calgary_free_coherent, 12680 .free_coherent = calgary_free_coherent,
12556 .map_sg = calgary_map_sg, 12681 .map_sg = calgary_map_sg,
12557diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-dma.c linux-2.6.32.11/arch/x86/kernel/pci-dma.c 12682diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-dma.c linux-2.6.32.12/arch/x86/kernel/pci-dma.c
12558--- linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400 12683--- linux-2.6.32.12/arch/x86/kernel/pci-dma.c 2010-03-15 11:52:04.000000000 -0400
12559+++ linux-2.6.32.11/arch/x86/kernel/pci-dma.c 2010-04-04 20:46:41.521777445 -0400 12684+++ linux-2.6.32.12/arch/x86/kernel/pci-dma.c 2010-04-04 20:46:41.521777445 -0400
12560@@ -14,7 +14,7 @@ 12685@@ -14,7 +14,7 @@
12561 12686
12562 static int forbid_dac __read_mostly; 12687 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
12575 12700
12576 #ifdef CONFIG_PCI 12701 #ifdef CONFIG_PCI
12577 if (mask > 0xffffffff && forbid_dac > 0) { 12702 if (mask > 0xffffffff && forbid_dac > 0) {
12578diff -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 12703diff -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
12579--- linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-03-15 11:52:04.000000000 -0400 12704--- linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c 2010-04-29 17:49:37.537108997 -0400
12580+++ linux-2.6.32.11/arch/x86/kernel/pci-gart_64.c 2010-04-04 20:46:41.521777445 -0400 12705+++ linux-2.6.32.12/arch/x86/kernel/pci-gart_64.c 2010-04-29 17:49:57.989487280 -0400
12581@@ -679,7 +679,7 @@ static __init int init_k8_gatt(struct ag 12706@@ -682,7 +682,7 @@ static __init int init_k8_gatt(struct ag
12582 return -1; 12707 return -1;
12583 } 12708 }
12584 12709
@@ -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
12587 .map_sg = gart_map_sg, 12712 .map_sg = gart_map_sg,
12588 .unmap_sg = gart_unmap_sg, 12713 .unmap_sg = gart_unmap_sg,
12589 .map_page = gart_map_page, 12714 .map_page = gart_map_page,
12590diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-nommu.c linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 12715diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-nommu.c linux-2.6.32.12/arch/x86/kernel/pci-nommu.c
12591--- linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400 12716--- linux-2.6.32.12/arch/x86/kernel/pci-nommu.c 2010-03-15 11:52:04.000000000 -0400
12592+++ linux-2.6.32.11/arch/x86/kernel/pci-nommu.c 2010-04-04 20:46:41.521777445 -0400 12717+++ linux-2.6.32.12/arch/x86/kernel/pci-nommu.c 2010-04-04 20:46:41.521777445 -0400
12593@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str 12718@@ -94,7 +94,7 @@ static void nommu_sync_sg_for_device(str
12594 flush_write_buffers(); 12719 flush_write_buffers();
12595 } 12720 }
@@ -12599,9 +12724,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-nommu.c linux-2.6.32.11/arch/x86/
12599 .alloc_coherent = dma_generic_alloc_coherent, 12724 .alloc_coherent = dma_generic_alloc_coherent,
12600 .free_coherent = nommu_free_coherent, 12725 .free_coherent = nommu_free_coherent,
12601 .map_sg = nommu_map_sg, 12726 .map_sg = nommu_map_sg,
12602diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 12727diff -urNp linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c
12603--- linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400 12728--- linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c 2010-03-15 11:52:04.000000000 -0400
12604+++ linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c 2010-04-04 20:46:41.521777445 -0400 12729+++ linux-2.6.32.12/arch/x86/kernel/pci-swiotlb.c 2010-04-04 20:46:41.521777445 -0400
12605@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent( 12730@@ -25,7 +25,7 @@ static void *x86_swiotlb_alloc_coherent(
12606 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags); 12731 return swiotlb_alloc_coherent(hwdev, size, dma_handle, flags);
12607 } 12732 }
@@ -12611,9 +12736,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/pci-swiotlb.c linux-2.6.32.11/arch/x8
12611 .mapping_error = swiotlb_dma_mapping_error, 12736 .mapping_error = swiotlb_dma_mapping_error,
12612 .alloc_coherent = x86_swiotlb_alloc_coherent, 12737 .alloc_coherent = x86_swiotlb_alloc_coherent,
12613 .free_coherent = swiotlb_free_coherent, 12738 .free_coherent = swiotlb_free_coherent,
12614diff -urNp linux-2.6.32.11/arch/x86/kernel/process_32.c linux-2.6.32.11/arch/x86/kernel/process_32.c 12739diff -urNp linux-2.6.32.12/arch/x86/kernel/process_32.c linux-2.6.32.12/arch/x86/kernel/process_32.c
12615--- linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400 12740--- linux-2.6.32.12/arch/x86/kernel/process_32.c 2010-03-15 11:52:04.000000000 -0400
12616+++ linux-2.6.32.11/arch/x86/kernel/process_32.c 2010-04-04 20:46:41.521777445 -0400 12741+++ linux-2.6.32.12/arch/x86/kernel/process_32.c 2010-04-04 20:46:41.521777445 -0400
12617@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as 12742@@ -67,6 +67,7 @@ asmlinkage void ret_from_fork(void) __as
12618 unsigned long thread_saved_pc(struct task_struct *tsk) 12743 unsigned long thread_saved_pc(struct task_struct *tsk)
12619 { 12744 {
@@ -12708,9 +12833,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_32.c linux-2.6.32.11/arch/x86
12708+ load_sp0(init_tss + smp_processor_id(), thread); 12833+ load_sp0(init_tss + smp_processor_id(), thread);
12709+} 12834+}
12710+#endif 12835+#endif
12711diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86/kernel/process_64.c 12836diff -urNp linux-2.6.32.12/arch/x86/kernel/process_64.c linux-2.6.32.12/arch/x86/kernel/process_64.c
12712--- linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:41:49.920655481 -0400 12837--- linux-2.6.32.12/arch/x86/kernel/process_64.c 2010-04-04 20:41:49.920655481 -0400
12713+++ linux-2.6.32.11/arch/x86/kernel/process_64.c 2010-04-04 20:46:41.521777445 -0400 12838+++ linux-2.6.32.12/arch/x86/kernel/process_64.c 2010-04-04 20:46:41.521777445 -0400
12714@@ -91,7 +91,7 @@ static void __exit_idle(void) 12839@@ -91,7 +91,7 @@ static void __exit_idle(void)
12715 void exit_idle(void) 12840 void exit_idle(void)
12716 { 12841 {
@@ -12753,9 +12878,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process_64.c linux-2.6.32.11/arch/x86
12753 return 0; 12878 return 0;
12754 ip = *(u64 *)(fp+8); 12879 ip = *(u64 *)(fp+8);
12755 if (!in_sched_functions(ip)) 12880 if (!in_sched_functions(ip))
12756diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/kernel/process.c 12881diff -urNp linux-2.6.32.12/arch/x86/kernel/process.c linux-2.6.32.12/arch/x86/kernel/process.c
12757--- linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400 12882--- linux-2.6.32.12/arch/x86/kernel/process.c 2010-04-04 20:41:49.920655481 -0400
12758+++ linux-2.6.32.11/arch/x86/kernel/process.c 2010-04-04 20:46:41.521777445 -0400 12883+++ linux-2.6.32.12/arch/x86/kernel/process.c 2010-04-04 20:46:41.521777445 -0400
12759@@ -73,7 +73,7 @@ void exit_thread(void) 12884@@ -73,7 +73,7 @@ void exit_thread(void)
12760 unsigned long *bp = t->io_bitmap_ptr; 12885 unsigned long *bp = t->io_bitmap_ptr;
12761 12886
@@ -12793,9 +12918,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/process.c linux-2.6.32.11/arch/x86/ke
12793- return randomize_range(mm->brk, range_end, 0) ? : mm->brk; 12918- return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
12794-} 12919-}
12795- 12920-
12796diff -urNp linux-2.6.32.11/arch/x86/kernel/ptrace.c linux-2.6.32.11/arch/x86/kernel/ptrace.c 12921diff -urNp linux-2.6.32.12/arch/x86/kernel/ptrace.c linux-2.6.32.12/arch/x86/kernel/ptrace.c
12797--- linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 12922--- linux-2.6.32.12/arch/x86/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
12798+++ linux-2.6.32.11/arch/x86/kernel/ptrace.c 2010-04-04 20:46:41.525738446 -0400 12923+++ linux-2.6.32.12/arch/x86/kernel/ptrace.c 2010-04-04 20:46:41.525738446 -0400
12799@@ -925,7 +925,7 @@ static const struct user_regset_view use 12924@@ -925,7 +925,7 @@ static const struct user_regset_view use
12800 long arch_ptrace(struct task_struct *child, long request, long addr, long data) 12925 long arch_ptrace(struct task_struct *child, long request, long addr, long data)
12801 { 12926 {
@@ -12864,9 +12989,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/ptrace.c linux-2.6.32.11/arch/x86/ker
12864 12989
12865 /* Send us the fake SIGTRAP */ 12990 /* Send us the fake SIGTRAP */
12866 force_sig_info(SIGTRAP, &info, tsk); 12991 force_sig_info(SIGTRAP, &info, tsk);
12867diff -urNp linux-2.6.32.11/arch/x86/kernel/reboot.c linux-2.6.32.11/arch/x86/kernel/reboot.c 12992diff -urNp linux-2.6.32.12/arch/x86/kernel/reboot.c linux-2.6.32.12/arch/x86/kernel/reboot.c
12868--- linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400 12993--- linux-2.6.32.12/arch/x86/kernel/reboot.c 2010-03-15 11:52:04.000000000 -0400
12869+++ linux-2.6.32.11/arch/x86/kernel/reboot.c 2010-04-04 20:46:41.525738446 -0400 12994+++ linux-2.6.32.12/arch/x86/kernel/reboot.c 2010-04-04 20:46:41.525738446 -0400
12870@@ -33,7 +33,7 @@ void (*pm_power_off)(void); 12995@@ -33,7 +33,7 @@ void (*pm_power_off)(void);
12871 EXPORT_SYMBOL(pm_power_off); 12996 EXPORT_SYMBOL(pm_power_off);
12872 12997
@@ -12943,9 +13068,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/reboot.c linux-2.6.32.11/arch/x86/ker
12943 13068
12944 /* Set up the IDT for real mode. */ 13069 /* Set up the IDT for real mode. */
12945 load_idt(&real_mode_idt); 13070 load_idt(&real_mode_idt);
12946diff -urNp linux-2.6.32.11/arch/x86/kernel/setup.c linux-2.6.32.11/arch/x86/kernel/setup.c 13071diff -urNp linux-2.6.32.12/arch/x86/kernel/setup.c linux-2.6.32.12/arch/x86/kernel/setup.c
12947--- linux-2.6.32.11/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400 13072--- linux-2.6.32.12/arch/x86/kernel/setup.c 2010-03-15 11:52:04.000000000 -0400
12948+++ linux-2.6.32.11/arch/x86/kernel/setup.c 2010-04-04 20:46:41.525738446 -0400 13073+++ linux-2.6.32.12/arch/x86/kernel/setup.c 2010-04-04 20:46:41.525738446 -0400
12949@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p) 13074@@ -771,14 +771,14 @@ void __init setup_arch(char **cmdline_p)
12950 13075
12951 if (!boot_params.hdr.root_flags) 13076 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
12966 data_resource.end = virt_to_phys(_edata)-1; 13091 data_resource.end = virt_to_phys(_edata)-1;
12967 bss_resource.start = virt_to_phys(&__bss_start); 13092 bss_resource.start = virt_to_phys(&__bss_start);
12968 bss_resource.end = virt_to_phys(&__bss_stop)-1; 13093 bss_resource.end = virt_to_phys(&__bss_stop)-1;
12969diff -urNp linux-2.6.32.11/arch/x86/kernel/setup_percpu.c linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 13094diff -urNp linux-2.6.32.12/arch/x86/kernel/setup_percpu.c linux-2.6.32.12/arch/x86/kernel/setup_percpu.c
12970--- linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400 13095--- linux-2.6.32.12/arch/x86/kernel/setup_percpu.c 2010-03-15 11:52:04.000000000 -0400
12971+++ linux-2.6.32.11/arch/x86/kernel/setup_percpu.c 2010-04-04 20:46:41.525738446 -0400 13096+++ linux-2.6.32.12/arch/x86/kernel/setup_percpu.c 2010-04-04 20:46:41.525738446 -0400
12972@@ -25,19 +25,17 @@ 13097@@ -25,19 +25,17 @@
12973 # define DBG(x...) 13098 # define DBG(x...)
12974 #endif 13099 #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
13031 /* 13156 /*
13032 * Up to this point, the boot CPU has been using .data.init 13157 * Up to this point, the boot CPU has been using .data.init
13033 * area. Reload any changed state for the boot CPU. 13158 * area. Reload any changed state for the boot CPU.
13034diff -urNp linux-2.6.32.11/arch/x86/kernel/signal.c linux-2.6.32.11/arch/x86/kernel/signal.c 13159diff -urNp linux-2.6.32.12/arch/x86/kernel/signal.c linux-2.6.32.12/arch/x86/kernel/signal.c
13035--- linux-2.6.32.11/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 13160--- linux-2.6.32.12/arch/x86/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
13036+++ linux-2.6.32.11/arch/x86/kernel/signal.c 2010-04-04 20:46:41.525738446 -0400 13161+++ linux-2.6.32.12/arch/x86/kernel/signal.c 2010-04-04 20:46:41.525738446 -0400
13037@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi 13162@@ -197,7 +197,7 @@ static unsigned long align_sigframe(unsi
13038 * Align the stack pointer according to the i386 ABI, 13163 * Align the stack pointer according to the i386 ABI,
13039 * i.e. so that on function entry ((sp + 4) & 15) == 0. 13164 * 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
13105 return; 13230 return;
13106 13231
13107 if (current_thread_info()->status & TS_RESTORE_SIGMASK) 13232 if (current_thread_info()->status & TS_RESTORE_SIGMASK)
13108diff -urNp linux-2.6.32.11/arch/x86/kernel/smpboot.c linux-2.6.32.11/arch/x86/kernel/smpboot.c 13233diff -urNp linux-2.6.32.12/arch/x86/kernel/smpboot.c linux-2.6.32.12/arch/x86/kernel/smpboot.c
13109--- linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400 13234--- linux-2.6.32.12/arch/x86/kernel/smpboot.c 2010-04-04 20:41:49.920655481 -0400
13110+++ linux-2.6.32.11/arch/x86/kernel/smpboot.c 2010-04-04 20:58:33.225084964 -0400 13235+++ linux-2.6.32.12/arch/x86/kernel/smpboot.c 2010-04-04 20:58:33.225084964 -0400
13111@@ -729,7 +729,11 @@ do_rest: 13236@@ -729,7 +729,11 @@ do_rest:
13112 (unsigned long)task_stack_page(c_idle.idle) - 13237 (unsigned long)task_stack_page(c_idle.idle) -
13113 KERNEL_STACK_OFFSET + THREAD_SIZE; 13238 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
13133 #ifdef CONFIG_X86_32 13258 #ifdef CONFIG_X86_32
13134 /* init low mem mapping */ 13259 /* init low mem mapping */
13135 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY, 13260 clone_pgd_range(swapper_pg_dir, swapper_pg_dir + KERNEL_PGD_BOUNDARY,
13136diff -urNp linux-2.6.32.11/arch/x86/kernel/step.c linux-2.6.32.11/arch/x86/kernel/step.c 13261diff -urNp linux-2.6.32.12/arch/x86/kernel/step.c linux-2.6.32.12/arch/x86/kernel/step.c
13137--- linux-2.6.32.11/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400 13262--- linux-2.6.32.12/arch/x86/kernel/step.c 2010-03-15 11:52:04.000000000 -0400
13138+++ linux-2.6.32.11/arch/x86/kernel/step.c 2010-04-04 20:46:41.525738446 -0400 13263+++ linux-2.6.32.12/arch/x86/kernel/step.c 2010-04-04 20:46:41.525738446 -0400
13139@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc 13264@@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
13140 struct desc_struct *desc; 13265 struct desc_struct *desc;
13141 unsigned long base; 13266 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
13168 /* 32-bit mode: register increment */ 13293 /* 32-bit mode: register increment */
13169 return 0; 13294 return 0;
13170 /* 64-bit mode: REX prefix */ 13295 /* 64-bit mode: REX prefix */
13171diff -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 13296diff -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
13172--- linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400 13297--- linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S 2010-03-15 11:52:04.000000000 -0400
13173+++ linux-2.6.32.11/arch/x86/kernel/syscall_table_32.S 2010-04-04 20:46:41.525738446 -0400 13298+++ linux-2.6.32.12/arch/x86/kernel/syscall_table_32.S 2010-04-04 20:46:41.525738446 -0400
13174@@ -1,3 +1,4 @@ 13299@@ -1,3 +1,4 @@
13175+.section .rodata,"a",@progbits 13300+.section .rodata,"a",@progbits
13176 ENTRY(sys_call_table) 13301 ENTRY(sys_call_table)
13177 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ 13302 .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */
13178 .long sys_exit 13303 .long sys_exit
13179diff -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 13304diff -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
13180--- linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400 13305--- linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c 2010-03-15 11:52:04.000000000 -0400
13181+++ linux-2.6.32.11/arch/x86/kernel/sys_i386_32.c 2010-04-04 20:46:41.525738446 -0400 13306+++ linux-2.6.32.12/arch/x86/kernel/sys_i386_32.c 2010-04-04 20:46:41.525738446 -0400
13182@@ -24,6 +24,21 @@ 13307@@ -24,6 +24,21 @@
13183 13308
13184 #include <asm/syscalls.h> 13309 #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
13425 } 13550 }
13426 case 1: /* iBCS2 emulator entry point */ 13551 case 1: /* iBCS2 emulator entry point */
13427 if (!segment_eq(get_fs(), get_ds())) 13552 if (!segment_eq(get_fs(), get_ds()))
13428diff -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 13553diff -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
13429--- linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400 13554--- linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c 2010-03-15 11:52:04.000000000 -0400
13430+++ linux-2.6.32.11/arch/x86/kernel/sys_x86_64.c 2010-04-04 20:46:41.525738446 -0400 13555+++ linux-2.6.32.12/arch/x86/kernel/sys_x86_64.c 2010-04-04 20:46:41.525738446 -0400
13431@@ -32,8 +32,8 @@ out: 13556@@ -32,8 +32,8 @@ out:
13432 return error; 13557 return error;
13433 } 13558 }
@@ -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
13509 mm->cached_hole_size = ~0UL; 13634 mm->cached_hole_size = ~0UL;
13510 13635
13511 return addr; 13636 return addr;
13512diff -urNp linux-2.6.32.11/arch/x86/kernel/time.c linux-2.6.32.11/arch/x86/kernel/time.c 13637diff -urNp linux-2.6.32.12/arch/x86/kernel/time.c linux-2.6.32.12/arch/x86/kernel/time.c
13513--- linux-2.6.32.11/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 13638--- linux-2.6.32.12/arch/x86/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
13514+++ linux-2.6.32.11/arch/x86/kernel/time.c 2010-04-04 20:46:41.525738446 -0400 13639+++ linux-2.6.32.12/arch/x86/kernel/time.c 2010-04-04 20:46:41.525738446 -0400
13515@@ -26,17 +26,13 @@ 13640@@ -26,17 +26,13 @@
13516 int timer_ack; 13641 int timer_ack;
13517 #endif 13642 #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
13550 } 13675 }
13551 return pc; 13676 return pc;
13552 } 13677 }
13553diff -urNp linux-2.6.32.11/arch/x86/kernel/tls.c linux-2.6.32.11/arch/x86/kernel/tls.c 13678diff -urNp linux-2.6.32.12/arch/x86/kernel/tls.c linux-2.6.32.12/arch/x86/kernel/tls.c
13554--- linux-2.6.32.11/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400 13679--- linux-2.6.32.12/arch/x86/kernel/tls.c 2010-03-15 11:52:04.000000000 -0400
13555+++ linux-2.6.32.11/arch/x86/kernel/tls.c 2010-04-04 20:46:41.525738446 -0400 13680+++ linux-2.6.32.12/arch/x86/kernel/tls.c 2010-04-04 20:46:41.525738446 -0400
13556@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc 13681@@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
13557 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) 13682 if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
13558 return -EINVAL; 13683 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
13565 set_tls_desc(p, idx, &info, 1); 13690 set_tls_desc(p, idx, &info, 1);
13566 13691
13567 return 0; 13692 return 0;
13568diff -urNp linux-2.6.32.11/arch/x86/kernel/trampoline_32.S linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 13693diff -urNp linux-2.6.32.12/arch/x86/kernel/trampoline_32.S linux-2.6.32.12/arch/x86/kernel/trampoline_32.S
13569--- linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400 13694--- linux-2.6.32.12/arch/x86/kernel/trampoline_32.S 2010-03-15 11:52:04.000000000 -0400
13570+++ linux-2.6.32.11/arch/x86/kernel/trampoline_32.S 2010-04-04 20:46:41.525738446 -0400 13695+++ linux-2.6.32.12/arch/x86/kernel/trampoline_32.S 2010-04-04 20:46:41.525738446 -0400
13571@@ -32,6 +32,12 @@ 13696@@ -32,6 +32,12 @@
13572 #include <asm/segment.h> 13697 #include <asm/segment.h>
13573 #include <asm/page_types.h> 13698 #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/
13590 13715
13591 # These need to be in the same 64K segment as the above; 13716 # These need to be in the same 64K segment as the above;
13592 # hence we don't use the boot_gdt_descr defined in head.S 13717 # hence we don't use the boot_gdt_descr defined in head.S
13593diff -urNp linux-2.6.32.11/arch/x86/kernel/traps.c linux-2.6.32.11/arch/x86/kernel/traps.c 13718diff -urNp linux-2.6.32.12/arch/x86/kernel/traps.c linux-2.6.32.12/arch/x86/kernel/traps.c
13594--- linux-2.6.32.11/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400 13719--- linux-2.6.32.12/arch/x86/kernel/traps.c 2010-03-15 11:52:04.000000000 -0400
13595+++ linux-2.6.32.11/arch/x86/kernel/traps.c 2010-04-04 20:46:41.525738446 -0400 13720+++ linux-2.6.32.12/arch/x86/kernel/traps.c 2010-04-04 20:46:41.525738446 -0400
13596@@ -69,12 +69,6 @@ asmlinkage int system_call(void); 13721@@ -69,12 +69,6 @@ asmlinkage int system_call(void);
13597 13722
13598 /* Do we ignore FPU interrupts ? */ 13723 /* 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
13742 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); 13867 handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code);
13743 return; 13868 return;
13744 } 13869 }
13745diff -urNp linux-2.6.32.11/arch/x86/kernel/tsc.c linux-2.6.32.11/arch/x86/kernel/tsc.c 13870diff -urNp linux-2.6.32.12/arch/x86/kernel/tsc.c linux-2.6.32.12/arch/x86/kernel/tsc.c
13746--- linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400 13871--- linux-2.6.32.12/arch/x86/kernel/tsc.c 2010-03-15 11:52:04.000000000 -0400
13747+++ linux-2.6.32.11/arch/x86/kernel/tsc.c 2010-04-04 20:46:41.525738446 -0400 13872+++ linux-2.6.32.12/arch/x86/kernel/tsc.c 2010-04-04 20:46:41.525738446 -0400
13748@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b 13873@@ -795,7 +795,7 @@ static struct dmi_system_id __initdata b
13749 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), 13874 DMI_MATCH(DMI_BOARD_NAME, "2635FA0"),
13750 }, 13875 },
@@ -13754,9 +13879,9 @@ diff -urNp linux-2.6.32.11/arch/x86/kernel/tsc.c linux-2.6.32.11/arch/x86/kernel
13754 }; 13879 };
13755 13880
13756 static void __init check_system_tsc_reliable(void) 13881 static void __init check_system_tsc_reliable(void)
13757diff -urNp linux-2.6.32.11/arch/x86/kernel/vm86_32.c linux-2.6.32.11/arch/x86/kernel/vm86_32.c 13882diff -urNp linux-2.6.32.12/arch/x86/kernel/vm86_32.c linux-2.6.32.12/arch/x86/kernel/vm86_32.c
13758--- linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400 13883--- linux-2.6.32.12/arch/x86/kernel/vm86_32.c 2010-03-15 11:52:04.000000000 -0400
13759+++ linux-2.6.32.11/arch/x86/kernel/vm86_32.c 2010-04-04 20:46:41.525738446 -0400 13884+++ linux-2.6.32.12/arch/x86/kernel/vm86_32.c 2010-04-04 20:46:41.525738446 -0400
13760@@ -41,6 +41,7 @@ 13885@@ -41,6 +41,7 @@
13761 #include <linux/ptrace.h> 13886 #include <linux/ptrace.h>
13762 #include <linux/audit.h> 13887 #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
13821 if (get_user(segoffs, intr_ptr)) 13946 if (get_user(segoffs, intr_ptr))
13822 goto cannot_handle; 13947 goto cannot_handle;
13823 if ((segoffs >> 16) == BIOSSEG) 13948 if ((segoffs >> 16) == BIOSSEG)
13824diff -urNp linux-2.6.32.11/arch/x86/kernel/vmi_32.c linux-2.6.32.11/arch/x86/kernel/vmi_32.c 13949diff -urNp linux-2.6.32.12/arch/x86/kernel/vmi_32.c linux-2.6.32.12/arch/x86/kernel/vmi_32.c
13825--- linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400 13950--- linux-2.6.32.12/arch/x86/kernel/vmi_32.c 2010-03-15 11:52:04.000000000 -0400
13826+++ linux-2.6.32.11/arch/x86/kernel/vmi_32.c 2010-04-04 20:46:41.525738446 -0400 13951+++ linux-2.6.32.12/arch/x86/kernel/vmi_32.c 2010-04-04 20:46:41.525738446 -0400
13827@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1))) 13952@@ -44,12 +44,17 @@ typedef u32 __attribute__((regparm(1)))
13828 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int); 13953 typedef u64 __attribute__((regparm(2))) (VROMLONGFUNC)(int);
13829 13954
@@ -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
13983 return; 14108 return;
13984 14109
13985 local_irq_save(flags); 14110 local_irq_save(flags);
13986diff -urNp linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 14111diff -urNp linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S
13987--- linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400 14112--- linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S 2010-03-15 11:52:04.000000000 -0400
13988+++ linux-2.6.32.11/arch/x86/kernel/vmlinux.lds.S 2010-04-04 20:46:41.529538490 -0400 14113+++ linux-2.6.32.12/arch/x86/kernel/vmlinux.lds.S 2010-04-04 20:46:41.529538490 -0400
13989@@ -26,6 +26,22 @@ 14114@@ -26,6 +26,22 @@
13990 #include <asm/page_types.h> 14115 #include <asm/page_types.h>
13991 #include <asm/cache.h> 14116 #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
14273 "kernel image bigger than KERNEL_IMAGE_SIZE"); 14398 "kernel image bigger than KERNEL_IMAGE_SIZE");
14274 14399
14275 #ifdef CONFIG_SMP 14400 #ifdef CONFIG_SMP
14276diff -urNp linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 14401diff -urNp linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c
14277--- linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400 14402--- linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c 2010-03-15 11:52:04.000000000 -0400
14278+++ linux-2.6.32.11/arch/x86/kernel/vsyscall_64.c 2010-04-04 20:46:41.529538490 -0400 14403+++ linux-2.6.32.12/arch/x86/kernel/vsyscall_64.c 2010-04-04 20:46:41.529538490 -0400
14279@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa 14404@@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa
14280 14405
14281 write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); 14406 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
14309 }; 14434 };
14310 #endif 14435 #endif
14311 14436
14312diff -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 14437diff -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
14313--- linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400 14438--- linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c 2010-03-15 11:52:04.000000000 -0400
14314+++ linux-2.6.32.11/arch/x86/kernel/x8664_ksyms_64.c 2010-04-04 20:46:41.529538490 -0400 14439+++ linux-2.6.32.12/arch/x86/kernel/x8664_ksyms_64.c 2010-04-04 20:46:41.529538490 -0400
14315@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); 14440@@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8);
14316 14441
14317 EXPORT_SYMBOL(copy_user_generic); 14442 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
14321 EXPORT_SYMBOL(__copy_from_user_inatomic); 14446 EXPORT_SYMBOL(__copy_from_user_inatomic);
14322 14447
14323 EXPORT_SYMBOL(copy_page); 14448 EXPORT_SYMBOL(copy_page);
14324diff -urNp linux-2.6.32.11/arch/x86/kernel/xsave.c linux-2.6.32.11/arch/x86/kernel/xsave.c 14449diff -urNp linux-2.6.32.12/arch/x86/kernel/xsave.c linux-2.6.32.12/arch/x86/kernel/xsave.c
14325--- linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400 14450--- linux-2.6.32.12/arch/x86/kernel/xsave.c 2010-03-15 11:52:04.000000000 -0400
14326+++ linux-2.6.32.11/arch/x86/kernel/xsave.c 2010-04-04 20:46:41.529538490 -0400 14451+++ linux-2.6.32.12/arch/x86/kernel/xsave.c 2010-04-04 20:46:41.529538490 -0400
14327@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_ 14452@@ -54,7 +54,7 @@ int check_for_xstate(struct i387_fxsave_
14328 fx_sw_user->xstate_size > fx_sw_user->extended_size) 14453 fx_sw_user->xstate_size > fx_sw_user->extended_size)
14329 return -1; 14454 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
14351 buf); 14476 buf);
14352 if (unlikely(err)) { 14477 if (unlikely(err)) {
14353 /* 14478 /*
14354diff -urNp linux-2.6.32.11/arch/x86/kvm/emulate.c linux-2.6.32.11/arch/x86/kvm/emulate.c 14479diff -urNp linux-2.6.32.12/arch/x86/kvm/emulate.c linux-2.6.32.12/arch/x86/kvm/emulate.c
14355--- linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-03-15 11:52:04.000000000 -0400 14480--- linux-2.6.32.12/arch/x86/kvm/emulate.c 2010-04-29 17:49:37.541027029 -0400
14356+++ linux-2.6.32.11/arch/x86/kvm/emulate.c 2010-04-04 20:46:41.529538490 -0400 14481+++ linux-2.6.32.12/arch/x86/kvm/emulate.c 2010-04-29 17:49:57.993228946 -0400
14357@@ -404,6 +404,7 @@ static u32 group2_table[] = { 14482@@ -81,8 +81,8 @@
14483 #define Src2CL (1<<29)
14484 #define Src2ImmByte (2<<29)
14485 #define Src2One (3<<29)
14486-#define Src2Imm16 (4<<29)
14487-#define Src2Mask (7<<29)
14488+#define Src2Imm16 (4U<<29)
14489+#define Src2Mask (7U<<29)
14490
14491 enum {
14492 Group1_80, Group1_81, Group1_82, Group1_83,
14493@@ -411,6 +411,7 @@ static u32 group2_table[] = {
14358 14494
14359 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \ 14495 #define ____emulate_2op(_op, _src, _dst, _eflags, _x, _y, _suffix) \
14360 do { \ 14496 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
14362 __asm__ __volatile__ ( \ 14498 __asm__ __volatile__ ( \
14363 _PRE_EFLAGS("0", "4", "2") \ 14499 _PRE_EFLAGS("0", "4", "2") \
14364 _op _suffix " %"_x"3,%1; " \ 14500 _op _suffix " %"_x"3,%1; " \
14365@@ -417,8 +418,6 @@ static u32 group2_table[] = { 14501@@ -424,8 +425,6 @@ static u32 group2_table[] = {
14366 /* Raw emulation: instruction has two explicit operands. */ 14502 /* Raw emulation: instruction has two explicit operands. */
14367 #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \ 14503 #define __emulate_2op_nobyte(_op,_src,_dst,_eflags,_wx,_wy,_lx,_ly,_qx,_qy) \
14368 do { \ 14504 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
14371 switch ((_dst).bytes) { \ 14507 switch ((_dst).bytes) { \
14372 case 2: \ 14508 case 2: \
14373 ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \ 14509 ____emulate_2op(_op,_src,_dst,_eflags,_wx,_wy,"w"); \
14374@@ -434,7 +433,6 @@ static u32 group2_table[] = { 14510@@ -441,7 +440,6 @@ static u32 group2_table[] = {
14375 14511
14376 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ 14512 #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
14377 do { \ 14513 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
14379 switch ((_dst).bytes) { \ 14515 switch ((_dst).bytes) { \
14380 case 1: \ 14516 case 1: \
14381 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \ 14517 ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b"); \
14382diff -urNp linux-2.6.32.11/arch/x86/kvm/svm.c linux-2.6.32.11/arch/x86/kvm/svm.c 14518diff -urNp linux-2.6.32.12/arch/x86/kvm/lapic.c linux-2.6.32.12/arch/x86/kvm/lapic.c
14383--- linux-2.6.32.11/arch/x86/kvm/svm.c 2010-03-15 11:52:04.000000000 -0400 14519--- linux-2.6.32.12/arch/x86/kvm/lapic.c 2010-03-15 11:52:04.000000000 -0400
14384+++ linux-2.6.32.11/arch/x86/kvm/svm.c 2010-04-04 20:46:41.529538490 -0400 14520+++ linux-2.6.32.12/arch/x86/kvm/lapic.c 2010-04-29 17:46:37.073091406 -0400
14385@@ -2389,9 +2389,12 @@ static int handle_exit(struct kvm_run *k 14521@@ -52,7 +52,7 @@
14522 #define APIC_BUS_CYCLE_NS 1
14523
14524 /* #define apic_debug(fmt,arg...) printk(KERN_WARNING fmt,##arg) */
14525-#define apic_debug(fmt, arg...)
14526+#define apic_debug(fmt, arg...) do {} while (0)
14527
14528 #define APIC_LVT_NUM 6
14529 /* 14 is the version for Xeon and Pentium 8.4.8*/
14530diff -urNp linux-2.6.32.12/arch/x86/kvm/svm.c linux-2.6.32.12/arch/x86/kvm/svm.c
14531--- linux-2.6.32.12/arch/x86/kvm/svm.c 2010-04-29 17:49:37.601044544 -0400
14532+++ linux-2.6.32.12/arch/x86/kvm/svm.c 2010-04-29 17:49:58.005400983 -0400
14533@@ -2395,9 +2395,12 @@ static int handle_exit(struct kvm_run *k
14386 static void reload_tss(struct kvm_vcpu *vcpu) 14534 static void reload_tss(struct kvm_vcpu *vcpu)
14387 { 14535 {
14388 int cpu = raw_smp_processor_id(); 14536 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
14396 load_TR_desc(); 14544 load_TR_desc();
14397 } 14545 }
14398 14546
14399@@ -2839,7 +2842,7 @@ static bool svm_gb_page_enable(void) 14547@@ -2845,7 +2848,7 @@ static bool svm_gb_page_enable(void)
14400 return true; 14548 return true;
14401 } 14549 }
14402 14550
@@ -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
14405 .cpu_has_kvm_support = has_svm, 14553 .cpu_has_kvm_support = has_svm,
14406 .disabled_by_bios = is_disabled, 14554 .disabled_by_bios = is_disabled,
14407 .hardware_setup = svm_hardware_setup, 14555 .hardware_setup = svm_hardware_setup,
14408diff -urNp linux-2.6.32.11/arch/x86/kvm/vmx.c linux-2.6.32.11/arch/x86/kvm/vmx.c 14556diff -urNp linux-2.6.32.12/arch/x86/kvm/vmx.c linux-2.6.32.12/arch/x86/kvm/vmx.c
14409--- linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-03-15 11:52:04.000000000 -0400 14557--- linux-2.6.32.12/arch/x86/kvm/vmx.c 2010-04-29 17:49:37.601044544 -0400
14410+++ linux-2.6.32.11/arch/x86/kvm/vmx.c 2010-04-04 20:46:41.529538490 -0400 14558+++ linux-2.6.32.12/arch/x86/kvm/vmx.c 2010-04-29 17:49:58.025065700 -0400
14411@@ -566,7 +566,11 @@ static void reload_tss(void) 14559@@ -568,7 +568,11 @@ static void reload_tss(void)
14412 14560
14413 kvm_get_gdt(&gdt); 14561 kvm_get_gdt(&gdt);
14414 descs = (void *)gdt.base; 14562 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
14420 load_TR_desc(); 14568 load_TR_desc();
14421 } 14569 }
14422 14570
14423@@ -1388,8 +1392,11 @@ static __init int hardware_setup(void) 14571@@ -1395,8 +1399,11 @@ static __init int hardware_setup(void)
14424 if (!cpu_has_vmx_flexpriority()) 14572 if (!cpu_has_vmx_flexpriority())
14425 flexpriority_enabled = 0; 14573 flexpriority_enabled = 0;
14426 14574
@@ -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
14434 14582
14435 if (enable_ept && !cpu_has_vmx_ept_2m_page()) 14583 if (enable_ept && !cpu_has_vmx_ept_2m_page())
14436 kvm_disable_largepages(); 14584 kvm_disable_largepages();
14437@@ -2339,7 +2346,7 @@ static int vmx_vcpu_setup(struct vcpu_vm 14585@@ -2347,7 +2354,7 @@ static int vmx_vcpu_setup(struct vcpu_vm
14438 vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ 14586 vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */
14439 14587
14440 asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); 14588 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
14443 vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); 14591 vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0);
14444 vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); 14592 vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0);
14445 vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); 14593 vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0);
14446@@ -3682,6 +3689,12 @@ static void vmx_vcpu_run(struct kvm_vcpu 14594@@ -3703,6 +3710,12 @@ static void vmx_vcpu_run(struct kvm_vcpu
14447 "jmp .Lkvm_vmx_return \n\t" 14595 "jmp .Lkvm_vmx_return \n\t"
14448 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" 14596 ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t"
14449 ".Lkvm_vmx_return: " 14597 ".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
14456 /* Save guest registers, load host registers, keep flags */ 14604 /* Save guest registers, load host registers, keep flags */
14457 "xchg %0, (%%"R"sp) \n\t" 14605 "xchg %0, (%%"R"sp) \n\t"
14458 "mov %%"R"ax, %c[rax](%0) \n\t" 14606 "mov %%"R"ax, %c[rax](%0) \n\t"
14459@@ -3728,6 +3741,11 @@ static void vmx_vcpu_run(struct kvm_vcpu 14607@@ -3749,6 +3762,11 @@ static void vmx_vcpu_run(struct kvm_vcpu
14460 [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), 14608 [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])),
14461 #endif 14609 #endif
14462 [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) 14610 [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
14468 : "cc", "memory" 14616 : "cc", "memory"
14469 , R"bx", R"di", R"si" 14617 , R"bx", R"di", R"si"
14470 #ifdef CONFIG_X86_64 14618 #ifdef CONFIG_X86_64
14471@@ -3746,7 +3764,7 @@ static void vmx_vcpu_run(struct kvm_vcpu 14619@@ -3767,7 +3785,7 @@ static void vmx_vcpu_run(struct kvm_vcpu
14472 if (vmx->rmode.irq.pending) 14620 if (vmx->rmode.irq.pending)
14473 fixup_rmode_irq(vmx); 14621 fixup_rmode_irq(vmx);
14474 14622
@@ -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
14477 vmx->launched = 1; 14625 vmx->launched = 1;
14478 14626
14479 vmx_complete_interrupts(vmx); 14627 vmx_complete_interrupts(vmx);
14480@@ -3921,7 +3939,7 @@ static bool vmx_gb_page_enable(void) 14628@@ -3942,7 +3960,7 @@ static bool vmx_gb_page_enable(void)
14481 return false; 14629 return false;
14482 } 14630 }
14483 14631
@@ -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
14486 .cpu_has_kvm_support = cpu_has_kvm_support, 14634 .cpu_has_kvm_support = cpu_has_kvm_support,
14487 .disabled_by_bios = vmx_disabled_by_bios, 14635 .disabled_by_bios = vmx_disabled_by_bios,
14488 .hardware_setup = hardware_setup, 14636 .hardware_setup = hardware_setup,
14489diff -urNp linux-2.6.32.11/arch/x86/kvm/x86.c linux-2.6.32.11/arch/x86/kvm/x86.c 14637diff -urNp linux-2.6.32.12/arch/x86/kvm/x86.c linux-2.6.32.12/arch/x86/kvm/x86.c
14490--- linux-2.6.32.11/arch/x86/kvm/x86.c 2010-03-15 11:52:04.000000000 -0400 14638--- linux-2.6.32.12/arch/x86/kvm/x86.c 2010-04-29 17:49:37.601044544 -0400
14491+++ linux-2.6.32.11/arch/x86/kvm/x86.c 2010-04-04 20:46:41.529538490 -0400 14639+++ linux-2.6.32.12/arch/x86/kvm/x86.c 2010-04-29 17:49:58.041485405 -0400
14492@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct 14640@@ -81,45 +81,45 @@ static void update_cr8_intercept(struct
14493 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, 14641 static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
14494 struct kvm_cpuid_entry2 __user *entries); 14642 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
14568 { NULL } 14716 { NULL }
14569 }; 14717 };
14570 14718
14571@@ -1658,7 +1658,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru 14719@@ -1635,7 +1635,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru
14572 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, 14720 static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu,
14573 struct kvm_interrupt *irq) 14721 struct kvm_interrupt *irq)
14574 { 14722 {
@@ -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
14577 return -EINVAL; 14725 return -EINVAL;
14578 if (irqchip_in_kernel(vcpu->kvm)) 14726 if (irqchip_in_kernel(vcpu->kvm))
14579 return -ENXIO; 14727 return -ENXIO;
14580@@ -3170,10 +3170,10 @@ static struct notifier_block kvmclock_cp 14728@@ -3205,10 +3205,10 @@ static struct notifier_block kvmclock_cp
14581 .notifier_call = kvmclock_cpufreq_notifier 14729 .notifier_call = kvmclock_cpufreq_notifier
14582 }; 14730 };
14583 14731
@@ -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
14590 14738
14591 if (kvm_x86_ops) { 14739 if (kvm_x86_ops) {
14592 printk(KERN_ERR "kvm: already loaded the other module\n"); 14740 printk(KERN_ERR "kvm: already loaded the other module\n");
14593diff -urNp linux-2.6.32.11/arch/x86/lib/checksum_32.S linux-2.6.32.11/arch/x86/lib/checksum_32.S 14741diff -urNp linux-2.6.32.12/arch/x86/lib/checksum_32.S linux-2.6.32.12/arch/x86/lib/checksum_32.S
14594--- linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400 14742--- linux-2.6.32.12/arch/x86/lib/checksum_32.S 2010-03-15 11:52:04.000000000 -0400
14595+++ linux-2.6.32.11/arch/x86/lib/checksum_32.S 2010-04-04 20:46:41.529538490 -0400 14743+++ linux-2.6.32.12/arch/x86/lib/checksum_32.S 2010-04-04 20:46:41.529538490 -0400
14596@@ -28,7 +28,8 @@ 14744@@ -28,7 +28,8 @@
14597 #include <linux/linkage.h> 14745 #include <linux/linkage.h>
14598 #include <asm/dwarf2.h> 14746 #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
14838 14986
14839 #undef ROUND 14987 #undef ROUND
14840 #undef ROUND1 14988 #undef ROUND1
14841diff -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 14989diff -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
14842--- linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400 14990--- linux-2.6.32.12/arch/x86/lib/clear_page_64.S 2010-03-15 11:52:04.000000000 -0400
14843+++ linux-2.6.32.11/arch/x86/lib/clear_page_64.S 2010-04-04 20:46:41.529538490 -0400 14991+++ linux-2.6.32.12/arch/x86/lib/clear_page_64.S 2010-04-04 20:46:41.529538490 -0400
14844@@ -43,7 +43,7 @@ ENDPROC(clear_page) 14992@@ -43,7 +43,7 @@ ENDPROC(clear_page)
14845 14993
14846 #include <asm/cpufeature.h> 14994 #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
14850 1: .byte 0xeb /* jmp <disp8> */ 14998 1: .byte 0xeb /* jmp <disp8> */
14851 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 14999 .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */
14852 2: 15000 2:
14853diff -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 15001diff -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
14854--- linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400 15002--- linux-2.6.32.12/arch/x86/lib/copy_page_64.S 2010-03-15 11:52:04.000000000 -0400
14855+++ linux-2.6.32.11/arch/x86/lib/copy_page_64.S 2010-04-04 20:46:41.529538490 -0400 15003+++ linux-2.6.32.12/arch/x86/lib/copy_page_64.S 2010-04-04 20:46:41.529538490 -0400
14856@@ -104,7 +104,7 @@ ENDPROC(copy_page) 15004@@ -104,7 +104,7 @@ ENDPROC(copy_page)
14857 15005
14858 #include <asm/cpufeature.h> 15006 #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/
14862 1: .byte 0xeb /* jmp <disp8> */ 15010 1: .byte 0xeb /* jmp <disp8> */
14863 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 15011 .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */
14864 2: 15012 2:
14865diff -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 15013diff -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
14866--- linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400 15014--- linux-2.6.32.12/arch/x86/lib/copy_user_64.S 2010-03-15 11:52:04.000000000 -0400
14867+++ linux-2.6.32.11/arch/x86/lib/copy_user_64.S 2010-04-04 20:58:33.225084964 -0400 15015+++ linux-2.6.32.12/arch/x86/lib/copy_user_64.S 2010-04-04 20:58:33.225084964 -0400
14868@@ -15,13 +15,14 @@ 15016@@ -15,13 +15,14 @@
14869 #include <asm/asm-offsets.h> 15017 #include <asm/asm-offsets.h>
14870 #include <asm/thread_info.h> 15018 #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/
14939 movl %edx,%ecx 15087 movl %edx,%ecx
14940 xorl %eax,%eax 15088 xorl %eax,%eax
14941 rep 15089 rep
14942diff -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 15090diff -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
14943--- linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400 15091--- linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S 2010-03-15 11:52:04.000000000 -0400
14944+++ linux-2.6.32.11/arch/x86/lib/copy_user_nocache_64.S 2010-04-04 20:58:33.225084964 -0400 15092+++ linux-2.6.32.12/arch/x86/lib/copy_user_nocache_64.S 2010-04-04 20:58:33.225084964 -0400
14945@@ -14,6 +14,7 @@ 15093@@ -14,6 +14,7 @@
14946 #include <asm/current.h> 15094 #include <asm/current.h>
14947 #include <asm/asm-offsets.h> 15095 #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
14966 cmpl $8,%edx 15114 cmpl $8,%edx
14967 jb 20f /* less then 8 bytes, go to byte copy loop */ 15115 jb 20f /* less then 8 bytes, go to byte copy loop */
14968 ALIGN_DESTINATION 15116 ALIGN_DESTINATION
14969diff -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 15117diff -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
14970--- linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400 15118--- linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c 2010-03-15 11:52:04.000000000 -0400
14971+++ linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c 2010-04-04 20:58:33.225084964 -0400 15119+++ linux-2.6.32.12/arch/x86/lib/csum-wrappers_64.c 2010-04-04 20:58:33.225084964 -0400
14972@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _ 15120@@ -52,6 +52,8 @@ csum_partial_copy_from_user(const void _
14973 len -= 2; 15121 len -= 2;
14974 } 15122 }
@@ -14987,9 +15135,9 @@ diff -urNp linux-2.6.32.11/arch/x86/lib/csum-wrappers_64.c linux-2.6.32.11/arch/
14987 return csum_partial_copy_generic(src, (void __force *)dst, 15135 return csum_partial_copy_generic(src, (void __force *)dst,
14988 len, isum, NULL, errp); 15136 len, isum, NULL, errp);
14989 } 15137 }
14990diff -urNp linux-2.6.32.11/arch/x86/lib/getuser.S linux-2.6.32.11/arch/x86/lib/getuser.S 15138diff -urNp linux-2.6.32.12/arch/x86/lib/getuser.S linux-2.6.32.12/arch/x86/lib/getuser.S
14991--- linux-2.6.32.11/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400 15139--- linux-2.6.32.12/arch/x86/lib/getuser.S 2010-03-15 11:52:04.000000000 -0400
14992+++ linux-2.6.32.11/arch/x86/lib/getuser.S 2010-04-04 20:58:33.225084964 -0400 15140+++ linux-2.6.32.12/arch/x86/lib/getuser.S 2010-04-04 20:58:33.225084964 -0400
14993@@ -33,14 +33,38 @@ 15141@@ -33,14 +33,38 @@
14994 #include <asm/asm-offsets.h> 15142 #include <asm/asm-offsets.h>
14995 #include <asm/thread_info.h> 15143 #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
15126 xor %edx,%edx 15274 xor %edx,%edx
15127 mov $(-EFAULT),%_ASM_AX 15275 mov $(-EFAULT),%_ASM_AX
15128 ret 15276 ret
15129diff -urNp linux-2.6.32.11/arch/x86/lib/memcpy_64.S linux-2.6.32.11/arch/x86/lib/memcpy_64.S 15277diff -urNp linux-2.6.32.12/arch/x86/lib/memcpy_64.S linux-2.6.32.12/arch/x86/lib/memcpy_64.S
15130--- linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400 15278--- linux-2.6.32.12/arch/x86/lib/memcpy_64.S 2010-03-15 11:52:04.000000000 -0400
15131+++ linux-2.6.32.11/arch/x86/lib/memcpy_64.S 2010-04-04 20:46:41.529538490 -0400 15279+++ linux-2.6.32.12/arch/x86/lib/memcpy_64.S 2010-04-04 20:46:41.529538490 -0400
15132@@ -128,7 +128,7 @@ ENDPROC(__memcpy) 15280@@ -128,7 +128,7 @@ ENDPROC(__memcpy)
15133 * It is also a lot simpler. Use this when possible: 15281 * It is also a lot simpler. Use this when possible:
15134 */ 15282 */
@@ -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
15138 1: .byte 0xeb /* jmp <disp8> */ 15286 1: .byte 0xeb /* jmp <disp8> */
15139 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 15287 .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */
15140 2: 15288 2:
15141diff -urNp linux-2.6.32.11/arch/x86/lib/memset_64.S linux-2.6.32.11/arch/x86/lib/memset_64.S 15289diff -urNp linux-2.6.32.12/arch/x86/lib/memset_64.S linux-2.6.32.12/arch/x86/lib/memset_64.S
15142--- linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400 15290--- linux-2.6.32.12/arch/x86/lib/memset_64.S 2010-03-15 11:52:04.000000000 -0400
15143+++ linux-2.6.32.11/arch/x86/lib/memset_64.S 2010-04-04 20:46:41.529538490 -0400 15291+++ linux-2.6.32.12/arch/x86/lib/memset_64.S 2010-04-04 20:46:41.529538490 -0400
15144@@ -118,7 +118,7 @@ ENDPROC(__memset) 15292@@ -118,7 +118,7 @@ ENDPROC(__memset)
15145 15293
15146 #include <asm/cpufeature.h> 15294 #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
15150 1: .byte 0xeb /* jmp <disp8> */ 15298 1: .byte 0xeb /* jmp <disp8> */
15151 .byte (memset_c - memset) - (2f - 1b) /* offset */ 15299 .byte (memset_c - memset) - (2f - 1b) /* offset */
15152 2: 15300 2:
15153diff -urNp linux-2.6.32.11/arch/x86/lib/mmx_32.c linux-2.6.32.11/arch/x86/lib/mmx_32.c 15301diff -urNp linux-2.6.32.12/arch/x86/lib/mmx_32.c linux-2.6.32.12/arch/x86/lib/mmx_32.c
15154--- linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400 15302--- linux-2.6.32.12/arch/x86/lib/mmx_32.c 2010-03-15 11:52:04.000000000 -0400
15155+++ linux-2.6.32.11/arch/x86/lib/mmx_32.c 2010-04-04 20:46:41.533557286 -0400 15303+++ linux-2.6.32.12/arch/x86/lib/mmx_32.c 2010-04-04 20:46:41.533557286 -0400
15156@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * 15304@@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
15157 { 15305 {
15158 void *p; 15306 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
15468 15616
15469 from += 64; 15617 from += 64;
15470 to += 64; 15618 to += 64;
15471diff -urNp linux-2.6.32.11/arch/x86/lib/putuser.S linux-2.6.32.11/arch/x86/lib/putuser.S 15619diff -urNp linux-2.6.32.12/arch/x86/lib/putuser.S linux-2.6.32.12/arch/x86/lib/putuser.S
15472--- linux-2.6.32.11/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400 15620--- linux-2.6.32.12/arch/x86/lib/putuser.S 2010-03-15 11:52:04.000000000 -0400
15473+++ linux-2.6.32.11/arch/x86/lib/putuser.S 2010-04-04 20:58:33.225084964 -0400 15621+++ linux-2.6.32.12/arch/x86/lib/putuser.S 2010-04-04 20:58:33.225084964 -0400
15474@@ -15,7 +15,8 @@ 15622@@ -15,7 +15,8 @@
15475 #include <asm/thread_info.h> 15623 #include <asm/thread_info.h>
15476 #include <asm/errno.h> 15624 #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
15640 movl $-EFAULT,%eax 15788 movl $-EFAULT,%eax
15641 EXIT 15789 EXIT
15642 END(bad_put_user) 15790 END(bad_put_user)
15643diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_32.c linux-2.6.32.11/arch/x86/lib/usercopy_32.c 15791diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_32.c linux-2.6.32.12/arch/x86/lib/usercopy_32.c
15644--- linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400 15792--- linux-2.6.32.12/arch/x86/lib/usercopy_32.c 2010-03-15 11:52:04.000000000 -0400
15645+++ linux-2.6.32.11/arch/x86/lib/usercopy_32.c 2010-04-04 20:46:41.533557286 -0400 15793+++ linux-2.6.32.12/arch/x86/lib/usercopy_32.c 2010-04-04 20:46:41.533557286 -0400
15646@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned 15794@@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned
15647 * Copy a null terminated string from userspace. 15795 * Copy a null terminated string from userspace.
15648 */ 15796 */
@@ -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
16611+#endif 16759+#endif
16612+ 16760+
16613+EXPORT_SYMBOL(set_fs); 16761+EXPORT_SYMBOL(set_fs);
16614diff -urNp linux-2.6.32.11/arch/x86/lib/usercopy_64.c linux-2.6.32.11/arch/x86/lib/usercopy_64.c 16762diff -urNp linux-2.6.32.12/arch/x86/lib/usercopy_64.c linux-2.6.32.12/arch/x86/lib/usercopy_64.c
16615--- linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400 16763--- linux-2.6.32.12/arch/x86/lib/usercopy_64.c 2010-03-15 11:52:04.000000000 -0400
16616+++ linux-2.6.32.11/arch/x86/lib/usercopy_64.c 2010-04-04 20:58:33.225084964 -0400 16764+++ linux-2.6.32.12/arch/x86/lib/usercopy_64.c 2010-04-04 20:58:33.225084964 -0400
16617@@ -42,6 +42,8 @@ long 16765@@ -42,6 +42,8 @@ long
16618 __strncpy_from_user(char *dst, const char __user *src, long count) 16766 __strncpy_from_user(char *dst, const char __user *src, long count)
16619 { 16767 {
@@ -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
16650 } 16798 }
16651 EXPORT_SYMBOL(copy_in_user); 16799 EXPORT_SYMBOL(copy_in_user);
16652 16800
16653diff -urNp linux-2.6.32.11/arch/x86/Makefile linux-2.6.32.11/arch/x86/Makefile 16801diff -urNp linux-2.6.32.12/arch/x86/Makefile linux-2.6.32.12/arch/x86/Makefile
16654--- linux-2.6.32.11/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400 16802--- linux-2.6.32.12/arch/x86/Makefile 2010-03-15 11:52:04.000000000 -0400
16655+++ linux-2.6.32.11/arch/x86/Makefile 2010-04-04 20:46:41.533557286 -0400 16803+++ linux-2.6.32.12/arch/x86/Makefile 2010-04-04 20:46:41.533557286 -0400
16656@@ -189,3 +189,12 @@ define archhelp 16804@@ -189,3 +189,12 @@ define archhelp
16657 echo ' FDARGS="..." arguments for the booted kernel' 16805 echo ' FDARGS="..." arguments for the booted kernel'
16658 echo ' FDINITRD=file initrd for the booted kernel' 16806 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
16666+ 16814+
16667+archprepare: 16815+archprepare:
16668+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) 16816+ $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
16669diff -urNp linux-2.6.32.11/arch/x86/mm/extable.c linux-2.6.32.11/arch/x86/mm/extable.c 16817diff -urNp linux-2.6.32.12/arch/x86/mm/extable.c linux-2.6.32.12/arch/x86/mm/extable.c
16670--- linux-2.6.32.11/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400 16818--- linux-2.6.32.12/arch/x86/mm/extable.c 2010-03-15 11:52:04.000000000 -0400
16671+++ linux-2.6.32.11/arch/x86/mm/extable.c 2010-04-04 20:46:41.533557286 -0400 16819+++ linux-2.6.32.12/arch/x86/mm/extable.c 2010-04-04 20:46:41.533557286 -0400
16672@@ -1,14 +1,71 @@ 16820@@ -1,14 +1,71 @@
16673 #include <linux/module.h> 16821 #include <linux/module.h>
16674 #include <linux/spinlock.h> 16822 #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
16742 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; 16890 extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp;
16743 extern u32 pnp_bios_is_utter_crap; 16891 extern u32 pnp_bios_is_utter_crap;
16744 pnp_bios_is_utter_crap = 1; 16892 pnp_bios_is_utter_crap = 1;
16745diff -urNp linux-2.6.32.11/arch/x86/mm/fault.c linux-2.6.32.11/arch/x86/mm/fault.c 16893diff -urNp linux-2.6.32.12/arch/x86/mm/fault.c linux-2.6.32.12/arch/x86/mm/fault.c
16746--- linux-2.6.32.11/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400 16894--- linux-2.6.32.12/arch/x86/mm/fault.c 2010-03-15 11:52:04.000000000 -0400
16747+++ linux-2.6.32.11/arch/x86/mm/fault.c 2010-04-04 20:58:33.225084964 -0400 16895+++ linux-2.6.32.12/arch/x86/mm/fault.c 2010-04-29 17:46:36.897235141 -0400
16748@@ -11,10 +11,19 @@ 16896@@ -11,10 +11,19 @@
16749 #include <linux/kprobes.h> /* __kprobes, ... */ 16897 #include <linux/kprobes.h> /* __kprobes, ... */
16750 #include <linux/mmiotrace.h> /* kmmio_handler, ... */ 16898 #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
17081 if (write) { 17229 if (write) {
17082 /* write, present and write, not present: */ 17230 /* write, present and write, not present: */
17083 if (unlikely(!(vma->vm_flags & VM_WRITE))) 17231 if (unlikely(!(vma->vm_flags & VM_WRITE)))
17084@@ -947,17 +1175,29 @@ do_page_fault(struct pt_regs *regs, unsi 17232@@ -947,17 +1175,31 @@ do_page_fault(struct pt_regs *regs, unsi
17085 { 17233 {
17086 struct vm_area_struct *vma; 17234 struct vm_area_struct *vma;
17087 struct task_struct *tsk; 17235 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
17094+ unsigned long address = read_cr2(); 17242+ unsigned long address = read_cr2();
17095+ 17243+
17096+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF) 17244+#if defined(CONFIG_X86_64) && defined(CONFIG_PAX_MEMORY_UDEREF)
17097+ if (!user_mode(regs)) { 17245+ if (!user_mode(regs) && address < 2 * PAX_USER_SHADOW_BASE) {
17246+ if (!search_exception_tables(regs->ip)) {
17247+ bad_area_nosemaphore(regs, error_code, address);
17248+ return;
17249+ }
17098+ if (address < PAX_USER_SHADOW_BASE) { 17250+ if (address < PAX_USER_SHADOW_BASE) {
17099+ if (search_exception_tables(regs->ip)) { 17251+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n");
17100+ printk(KERN_ERR "PAX: please report this to pageexec@freemail.hu\n"); 17252+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip);
17101+ printk(KERN_ERR "PAX: faulting IP: %pS\n", (void *)regs->ip); 17253+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR);
17102+ show_trace_log_lvl(NULL, NULL, (void *)regs->sp, regs->bp, KERN_ERR); 17254+ } else
17103+ }
17104+ } else if (address < 2 * PAX_USER_SHADOW_BASE)
17105+ address -= PAX_USER_SHADOW_BASE; 17255+ address -= PAX_USER_SHADOW_BASE;
17106+ } 17256+ }
17107+#endif 17257+#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
17115 /* 17265 /*
17116 * Detect and handle instructions that would cause a page fault for 17266 * Detect and handle instructions that would cause a page fault for
17117 * both a tracked kernel page and a userspace page. 17267 * both a tracked kernel page and a userspace page.
17118@@ -1017,7 +1257,7 @@ do_page_fault(struct pt_regs *regs, unsi 17268@@ -1017,7 +1259,7 @@ do_page_fault(struct pt_regs *regs, unsi
17119 * User-mode registers count as a user access even for any 17269 * User-mode registers count as a user access even for any
17120 * potential system fault or CPU buglet: 17270 * potential system fault or CPU buglet:
17121 */ 17271 */
@@ -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
17124 local_irq_enable(); 17274 local_irq_enable();
17125 error_code |= PF_USER; 17275 error_code |= PF_USER;
17126 } else { 17276 } else {
17127@@ -1071,6 +1311,11 @@ do_page_fault(struct pt_regs *regs, unsi 17277@@ -1071,6 +1313,11 @@ do_page_fault(struct pt_regs *regs, unsi
17128 might_sleep(); 17278 might_sleep();
17129 } 17279 }
17130 17280
@@ -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
17136 vma = find_vma(mm, address); 17286 vma = find_vma(mm, address);
17137 if (unlikely(!vma)) { 17287 if (unlikely(!vma)) {
17138 bad_area(regs, error_code, address); 17288 bad_area(regs, error_code, address);
17139@@ -1082,18 +1327,24 @@ do_page_fault(struct pt_regs *regs, unsi 17289@@ -1082,18 +1329,24 @@ do_page_fault(struct pt_regs *regs, unsi
17140 bad_area(regs, error_code, address); 17290 bad_area(regs, error_code, address);
17141 return; 17291 return;
17142 } 17292 }
@@ -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
17172 if (unlikely(expand_stack(vma, address))) { 17322 if (unlikely(expand_stack(vma, address))) {
17173 bad_area(regs, error_code, address); 17323 bad_area(regs, error_code, address);
17174 return; 17324 return;
17175@@ -1137,3 +1388,199 @@ good_area: 17325@@ -1137,3 +1390,199 @@ good_area:
17176 17326
17177 up_read(&mm->mmap_sem); 17327 up_read(&mm->mmap_sem);
17178 } 17328 }
@@ -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
17372+ 17522+
17373+ return ret ? -EFAULT : 0; 17523+ return ret ? -EFAULT : 0;
17374+} 17524+}
17375diff -urNp linux-2.6.32.11/arch/x86/mm/gup.c linux-2.6.32.11/arch/x86/mm/gup.c 17525diff -urNp linux-2.6.32.12/arch/x86/mm/gup.c linux-2.6.32.12/arch/x86/mm/gup.c
17376--- linux-2.6.32.11/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400 17526--- linux-2.6.32.12/arch/x86/mm/gup.c 2010-03-15 11:52:04.000000000 -0400
17377+++ linux-2.6.32.11/arch/x86/mm/gup.c 2010-04-04 20:46:41.533557286 -0400 17527+++ linux-2.6.32.12/arch/x86/mm/gup.c 2010-04-04 20:46:41.533557286 -0400
17378@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long 17528@@ -237,7 +237,7 @@ int __get_user_pages_fast(unsigned long
17379 addr = start; 17529 addr = start;
17380 len = (unsigned long) nr_pages << PAGE_SHIFT; 17530 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
17384 (void __user *)start, len))) 17534 (void __user *)start, len)))
17385 return 0; 17535 return 0;
17386 17536
17387diff -urNp linux-2.6.32.11/arch/x86/mm/highmem_32.c linux-2.6.32.11/arch/x86/mm/highmem_32.c 17537diff -urNp linux-2.6.32.12/arch/x86/mm/highmem_32.c linux-2.6.32.12/arch/x86/mm/highmem_32.c
17388--- linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400 17538--- linux-2.6.32.12/arch/x86/mm/highmem_32.c 2010-03-15 11:52:04.000000000 -0400
17389+++ linux-2.6.32.11/arch/x86/mm/highmem_32.c 2010-04-04 20:46:41.533557286 -0400 17539+++ linux-2.6.32.12/arch/x86/mm/highmem_32.c 2010-04-04 20:46:41.533557286 -0400
17390@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page 17540@@ -43,7 +43,10 @@ void *kmap_atomic_prot(struct page *page
17391 idx = type + KM_TYPE_NR*smp_processor_id(); 17541 idx = type + KM_TYPE_NR*smp_processor_id();
17392 vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); 17542 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/
17398 17548
17399 return (void *)vaddr; 17549 return (void *)vaddr;
17400 } 17550 }
17401diff -urNp linux-2.6.32.11/arch/x86/mm/hugetlbpage.c linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 17551diff -urNp linux-2.6.32.12/arch/x86/mm/hugetlbpage.c linux-2.6.32.12/arch/x86/mm/hugetlbpage.c
17402--- linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400 17552--- linux-2.6.32.12/arch/x86/mm/hugetlbpage.c 2010-03-15 11:52:04.000000000 -0400
17403+++ linux-2.6.32.11/arch/x86/mm/hugetlbpage.c 2010-04-04 20:46:41.533557286 -0400 17553+++ linux-2.6.32.12/arch/x86/mm/hugetlbpage.c 2010-04-04 20:46:41.533557286 -0400
17404@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe 17554@@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe
17405 struct hstate *h = hstate_file(file); 17555 struct hstate *h = hstate_file(file);
17406 struct mm_struct *mm = current->mm; 17556 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
17535 (!vma || addr + len <= vma->vm_start)) 17685 (!vma || addr + len <= vma->vm_start))
17536 return addr; 17686 return addr;
17537 } 17687 }
17538diff -urNp linux-2.6.32.11/arch/x86/mm/init_32.c linux-2.6.32.11/arch/x86/mm/init_32.c 17688diff -urNp linux-2.6.32.12/arch/x86/mm/init_32.c linux-2.6.32.12/arch/x86/mm/init_32.c
17539--- linux-2.6.32.11/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400 17689--- linux-2.6.32.12/arch/x86/mm/init_32.c 2010-03-15 11:52:04.000000000 -0400
17540+++ linux-2.6.32.11/arch/x86/mm/init_32.c 2010-04-04 20:58:33.225084964 -0400 17690+++ linux-2.6.32.12/arch/x86/mm/init_32.c 2010-04-04 20:58:33.225084964 -0400
17541@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void) 17691@@ -72,36 +72,6 @@ static __init void *alloc_low_page(void)
17542 } 17692 }
17543 17693
@@ -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
17841 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT); 17991 set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
17842 printk(KERN_INFO "Write protecting the kernel text: %luk\n", 17992 printk(KERN_INFO "Write protecting the kernel text: %luk\n",
17843 size >> 10); 17993 size >> 10);
17844diff -urNp linux-2.6.32.11/arch/x86/mm/init_64.c linux-2.6.32.11/arch/x86/mm/init_64.c 17994diff -urNp linux-2.6.32.12/arch/x86/mm/init_64.c linux-2.6.32.12/arch/x86/mm/init_64.c
17845--- linux-2.6.32.11/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400 17995--- linux-2.6.32.12/arch/x86/mm/init_64.c 2010-03-15 11:52:04.000000000 -0400
17846+++ linux-2.6.32.11/arch/x86/mm/init_64.c 2010-04-04 20:58:33.225084964 -0400 17996+++ linux-2.6.32.12/arch/x86/mm/init_64.c 2010-04-04 20:58:33.225084964 -0400
17847@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page, 17997@@ -163,7 +163,9 @@ void set_pte_vaddr_pud(pud_t *pud_page,
17848 pmd = fill_pmd(pud, vaddr); 17998 pmd = fill_pmd(pud, vaddr);
17849 pte = fill_pte(pmd, vaddr); 17999 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
17904 return "[vdso]"; 18054 return "[vdso]";
17905 if (vma == &gate_vma) 18055 if (vma == &gate_vma)
17906 return "[vsyscall]"; 18056 return "[vsyscall]";
17907diff -urNp linux-2.6.32.11/arch/x86/mm/init.c linux-2.6.32.11/arch/x86/mm/init.c 18057diff -urNp linux-2.6.32.12/arch/x86/mm/init.c linux-2.6.32.12/arch/x86/mm/init.c
17908--- linux-2.6.32.11/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400 18058--- linux-2.6.32.12/arch/x86/mm/init.c 2010-03-15 11:52:04.000000000 -0400
17909+++ linux-2.6.32.11/arch/x86/mm/init.c 2010-04-04 20:46:41.533557286 -0400 18059+++ linux-2.6.32.12/arch/x86/mm/init.c 2010-04-04 20:46:41.533557286 -0400
17910@@ -69,11 +69,7 @@ static void __init find_early_table_spac 18060@@ -69,11 +69,7 @@ static void __init find_early_table_spac
17911 * cause a hotspot and fill up ZONE_DMA. The page tables 18061 * cause a hotspot and fill up ZONE_DMA. The page tables
17912 * need roughly 0.5KB per GB. 18062 * 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
18023 free_init_pages("unused kernel memory", 18173 free_init_pages("unused kernel memory",
18024 (unsigned long)(&__init_begin), 18174 (unsigned long)(&__init_begin),
18025 (unsigned long)(&__init_end)); 18175 (unsigned long)(&__init_end));
18026diff -urNp linux-2.6.32.11/arch/x86/mm/iomap_32.c linux-2.6.32.11/arch/x86/mm/iomap_32.c 18176diff -urNp linux-2.6.32.12/arch/x86/mm/iomap_32.c linux-2.6.32.12/arch/x86/mm/iomap_32.c
18027--- linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400 18177--- linux-2.6.32.12/arch/x86/mm/iomap_32.c 2010-03-15 11:52:04.000000000 -0400
18028+++ linux-2.6.32.11/arch/x86/mm/iomap_32.c 2010-04-04 20:46:41.533557286 -0400 18178+++ linux-2.6.32.12/arch/x86/mm/iomap_32.c 2010-04-04 20:46:41.533557286 -0400
18029@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long 18179@@ -65,7 +65,11 @@ void *kmap_atomic_prot_pfn(unsigned long
18030 debug_kmap_atomic(type); 18180 debug_kmap_atomic(type);
18031 idx = type + KM_TYPE_NR * smp_processor_id(); 18181 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
18038 arch_flush_lazy_mmu_mode(); 18188 arch_flush_lazy_mmu_mode();
18039 18189
18040 return (void *)vaddr; 18190 return (void *)vaddr;
18041diff -urNp linux-2.6.32.11/arch/x86/mm/ioremap.c linux-2.6.32.11/arch/x86/mm/ioremap.c 18191diff -urNp linux-2.6.32.12/arch/x86/mm/ioremap.c linux-2.6.32.12/arch/x86/mm/ioremap.c
18042--- linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400 18192--- linux-2.6.32.12/arch/x86/mm/ioremap.c 2010-03-15 11:52:04.000000000 -0400
18043+++ linux-2.6.32.11/arch/x86/mm/ioremap.c 2010-04-04 20:46:41.533557286 -0400 18193+++ linux-2.6.32.12/arch/x86/mm/ioremap.c 2010-04-04 20:46:41.533557286 -0400
18044@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr) 18194@@ -41,8 +41,8 @@ int page_is_ram(unsigned long pagenr)
18045 * Second special case: Some BIOSen report the PC BIOS 18195 * Second special case: Some BIOSen report the PC BIOS
18046 * area (640->1Mb) as ram even though it is not. 18196 * 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
18087 18237
18088 /* 18238 /*
18089 * The boot-ioremap range spans multiple pmds, for which 18239 * The boot-ioremap range spans multiple pmds, for which
18090diff -urNp linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 18240diff -urNp linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c
18091--- linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400 18241--- linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c 2010-03-15 11:52:04.000000000 -0400
18092+++ linux-2.6.32.11/arch/x86/mm/kmemcheck/kmemcheck.c 2010-04-04 20:46:41.533557286 -0400 18242+++ linux-2.6.32.12/arch/x86/mm/kmemcheck/kmemcheck.c 2010-04-04 20:46:41.533557286 -0400
18093@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg 18243@@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
18094 * memory (e.g. tracked pages)? For now, we need this to avoid 18244 * memory (e.g. tracked pages)? For now, we need this to avoid
18095 * invoking kmemcheck for PnP BIOS calls. 18245 * 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
18102 return false; 18252 return false;
18103 18253
18104 pte = kmemcheck_pte_lookup(address); 18254 pte = kmemcheck_pte_lookup(address);
18105diff -urNp linux-2.6.32.11/arch/x86/mm/mmap.c linux-2.6.32.11/arch/x86/mm/mmap.c 18255diff -urNp linux-2.6.32.12/arch/x86/mm/mmap.c linux-2.6.32.12/arch/x86/mm/mmap.c
18106--- linux-2.6.32.11/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 18256--- linux-2.6.32.12/arch/x86/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
18107+++ linux-2.6.32.11/arch/x86/mm/mmap.c 2010-04-04 20:46:41.537568318 -0400 18257+++ linux-2.6.32.12/arch/x86/mm/mmap.c 2010-04-04 20:46:41.537568318 -0400
18108@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size 18258@@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
18109 * Leave an at least ~128 MB hole with possible stack randomization. 18259 * Leave an at least ~128 MB hole with possible stack randomization.
18110 */ 18260 */
@@ -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
18186 mm->get_unmapped_area = arch_get_unmapped_area_topdown; 18336 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
18187 mm->unmap_area = arch_unmap_area_topdown; 18337 mm->unmap_area = arch_unmap_area_topdown;
18188 } 18338 }
18189diff -urNp linux-2.6.32.11/arch/x86/mm/numa_32.c linux-2.6.32.11/arch/x86/mm/numa_32.c 18339diff -urNp linux-2.6.32.12/arch/x86/mm/numa_32.c linux-2.6.32.12/arch/x86/mm/numa_32.c
18190--- linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400 18340--- linux-2.6.32.12/arch/x86/mm/numa_32.c 2010-03-15 11:52:04.000000000 -0400
18191+++ linux-2.6.32.11/arch/x86/mm/numa_32.c 2010-04-04 20:46:41.537568318 -0400 18341+++ linux-2.6.32.12/arch/x86/mm/numa_32.c 2010-04-04 20:46:41.537568318 -0400
18192@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int 18342@@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int
18193 } 18343 }
18194 #endif 18344 #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
18197 extern unsigned long highend_pfn, highstart_pfn; 18347 extern unsigned long highend_pfn, highstart_pfn;
18198 18348
18199 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) 18349 #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE)
18200diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr.c linux-2.6.32.11/arch/x86/mm/pageattr.c 18350diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr.c linux-2.6.32.12/arch/x86/mm/pageattr.c
18201--- linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400 18351--- linux-2.6.32.12/arch/x86/mm/pageattr.c 2010-03-15 11:52:04.000000000 -0400
18202+++ linux-2.6.32.11/arch/x86/mm/pageattr.c 2010-04-04 20:46:41.537568318 -0400 18352+++ linux-2.6.32.12/arch/x86/mm/pageattr.c 2010-04-04 20:46:41.537568318 -0400
18203@@ -268,9 +268,10 @@ static inline pgprot_t static_protection 18353@@ -268,9 +268,10 @@ static inline pgprot_t static_protection
18204 * Does not cover __inittext since that is gone later on. On 18354 * Does not cover __inittext since that is gone later on. On
18205 * 64bit we do not enforce !NX on the low mapping 18355 * 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
18231 #ifdef CONFIG_X86_32 18381 #ifdef CONFIG_X86_32
18232 if (!SHARED_KERNEL_PMD) { 18382 if (!SHARED_KERNEL_PMD) {
18233 struct page *page; 18383 struct page *page;
18234diff -urNp linux-2.6.32.11/arch/x86/mm/pageattr-test.c linux-2.6.32.11/arch/x86/mm/pageattr-test.c 18384diff -urNp linux-2.6.32.12/arch/x86/mm/pageattr-test.c linux-2.6.32.12/arch/x86/mm/pageattr-test.c
18235--- linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400 18385--- linux-2.6.32.12/arch/x86/mm/pageattr-test.c 2010-03-15 11:52:04.000000000 -0400
18236+++ linux-2.6.32.11/arch/x86/mm/pageattr-test.c 2010-04-04 20:46:41.537568318 -0400 18386+++ linux-2.6.32.12/arch/x86/mm/pageattr-test.c 2010-04-04 20:46:41.537568318 -0400
18237@@ -36,7 +36,7 @@ enum { 18387@@ -36,7 +36,7 @@ enum {
18238 18388
18239 static int pte_testbit(pte_t pte) 18389 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/
18243 } 18393 }
18244 18394
18245 struct split_state { 18395 struct split_state {
18246diff -urNp linux-2.6.32.11/arch/x86/mm/pat.c linux-2.6.32.11/arch/x86/mm/pat.c 18396diff -urNp linux-2.6.32.12/arch/x86/mm/pat.c linux-2.6.32.12/arch/x86/mm/pat.c
18247--- linux-2.6.32.11/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400 18397--- linux-2.6.32.12/arch/x86/mm/pat.c 2010-03-15 11:52:04.000000000 -0400
18248+++ linux-2.6.32.11/arch/x86/mm/pat.c 2010-04-04 20:46:41.537568318 -0400 18398+++ linux-2.6.32.12/arch/x86/mm/pat.c 2010-04-04 20:46:41.537568318 -0400
18249@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct 18399@@ -258,7 +258,7 @@ chk_conflict(struct memtype *new, struct
18250 18400
18251 conflict: 18401 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
18282 cattr_name(want_flags), 18432 cattr_name(want_flags),
18283 (unsigned long long)paddr, 18433 (unsigned long long)paddr,
18284 (unsigned long long)(paddr + size), 18434 (unsigned long long)(paddr + size),
18285diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable_32.c linux-2.6.32.11/arch/x86/mm/pgtable_32.c 18435diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable_32.c linux-2.6.32.12/arch/x86/mm/pgtable_32.c
18286--- linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400 18436--- linux-2.6.32.12/arch/x86/mm/pgtable_32.c 2010-03-15 11:52:04.000000000 -0400
18287+++ linux-2.6.32.11/arch/x86/mm/pgtable_32.c 2010-04-04 20:46:41.537568318 -0400 18437+++ linux-2.6.32.12/arch/x86/mm/pgtable_32.c 2010-04-04 20:46:41.537568318 -0400
18288@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr, 18438@@ -49,10 +49,13 @@ void set_pte_vaddr(unsigned long vaddr,
18289 return; 18439 return;
18290 } 18440 }
@@ -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/
18299 18449
18300 /* 18450 /*
18301 * It's enough to flush this one mapping. 18451 * It's enough to flush this one mapping.
18302diff -urNp linux-2.6.32.11/arch/x86/mm/pgtable.c linux-2.6.32.11/arch/x86/mm/pgtable.c 18452diff -urNp linux-2.6.32.12/arch/x86/mm/pgtable.c linux-2.6.32.12/arch/x86/mm/pgtable.c
18303--- linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400 18453--- linux-2.6.32.12/arch/x86/mm/pgtable.c 2010-03-15 11:52:04.000000000 -0400
18304+++ linux-2.6.32.11/arch/x86/mm/pgtable.c 2010-04-04 20:58:33.225084964 -0400 18454+++ linux-2.6.32.12/arch/x86/mm/pgtable.c 2010-04-04 20:58:33.225084964 -0400
18305@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather * 18455@@ -63,8 +63,12 @@ void ___pmd_free_tlb(struct mmu_gather *
18306 #if PAGETABLE_LEVELS > 3 18456 #if PAGETABLE_LEVELS > 3
18307 void ___pud_free_tlb(struct mmu_gather *tlb, pud_t *pud) 18457 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
18571 pgd_dtor(pgd); 18721 pgd_dtor(pgd);
18572 paravirt_pgd_free(mm, pgd); 18722 paravirt_pgd_free(mm, pgd);
18573 free_page((unsigned long)pgd); 18723 free_page((unsigned long)pgd);
18574diff -urNp linux-2.6.32.11/arch/x86/mm/setup_nx.c linux-2.6.32.11/arch/x86/mm/setup_nx.c 18724diff -urNp linux-2.6.32.12/arch/x86/mm/setup_nx.c linux-2.6.32.12/arch/x86/mm/setup_nx.c
18575--- linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400 18725--- linux-2.6.32.12/arch/x86/mm/setup_nx.c 2010-03-15 11:52:04.000000000 -0400
18576+++ linux-2.6.32.11/arch/x86/mm/setup_nx.c 2010-04-04 20:46:41.537568318 -0400 18726+++ linux-2.6.32.12/arch/x86/mm/setup_nx.c 2010-04-04 20:46:41.537568318 -0400
18577@@ -4,11 +4,10 @@ 18727@@ -4,11 +4,10 @@
18578 18728
18579 #include <asm/pgtable.h> 18729 #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
18639 __supported_pte_mask &= ~_PAGE_NX; 18789 __supported_pte_mask &= ~_PAGE_NX;
18640 } 18790 }
18641 #endif 18791 #endif
18642diff -urNp linux-2.6.32.11/arch/x86/mm/tlb.c linux-2.6.32.11/arch/x86/mm/tlb.c 18792diff -urNp linux-2.6.32.12/arch/x86/mm/tlb.c linux-2.6.32.12/arch/x86/mm/tlb.c
18643--- linux-2.6.32.11/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400 18793--- linux-2.6.32.12/arch/x86/mm/tlb.c 2010-03-15 11:52:04.000000000 -0400
18644+++ linux-2.6.32.11/arch/x86/mm/tlb.c 2010-04-04 20:58:33.225084964 -0400 18794+++ linux-2.6.32.12/arch/x86/mm/tlb.c 2010-04-04 20:58:33.225084964 -0400
18645@@ -12,7 +12,7 @@ 18795@@ -12,7 +12,7 @@
18646 #include <asm/uv/uv.h> 18796 #include <asm/uv/uv.h>
18647 18797
@@ -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
18663 } 18813 }
18664 EXPORT_SYMBOL_GPL(leave_mm); 18814 EXPORT_SYMBOL_GPL(leave_mm);
18665 18815
18666diff -urNp linux-2.6.32.11/arch/x86/oprofile/backtrace.c linux-2.6.32.11/arch/x86/oprofile/backtrace.c 18816diff -urNp linux-2.6.32.12/arch/x86/oprofile/backtrace.c linux-2.6.32.12/arch/x86/oprofile/backtrace.c
18667--- linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400 18817--- linux-2.6.32.12/arch/x86/oprofile/backtrace.c 2010-03-15 11:52:04.000000000 -0400
18668+++ linux-2.6.32.11/arch/x86/oprofile/backtrace.c 2010-04-04 20:46:41.537568318 -0400 18818+++ linux-2.6.32.12/arch/x86/oprofile/backtrace.c 2010-04-04 20:46:41.537568318 -0400
18669@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back 18819@@ -57,7 +57,7 @@ static struct frame_head *dump_user_back
18670 struct frame_head bufhead[2]; 18820 struct frame_head bufhead[2];
18671 18821
@@ -18684,9 +18834,9 @@ diff -urNp linux-2.6.32.11/arch/x86/oprofile/backtrace.c linux-2.6.32.11/arch/x8
18684 unsigned long stack = kernel_stack_pointer(regs); 18834 unsigned long stack = kernel_stack_pointer(regs);
18685 if (depth) 18835 if (depth)
18686 dump_trace(NULL, regs, (unsigned long *)stack, 0, 18836 dump_trace(NULL, regs, (unsigned long *)stack, 0,
18687diff -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 18837diff -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
18688--- linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400 18838--- linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c 2010-03-15 11:52:04.000000000 -0400
18689+++ linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c 2010-04-04 20:46:41.537568318 -0400 18839+++ linux-2.6.32.12/arch/x86/oprofile/op_model_p4.c 2010-04-04 20:46:41.537568318 -0400
18690@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo 18840@@ -50,7 +50,7 @@ static inline void setup_num_counters(vo
18691 #endif 18841 #endif
18692 } 18842 }
@@ -18696,9 +18846,9 @@ diff -urNp linux-2.6.32.11/arch/x86/oprofile/op_model_p4.c linux-2.6.32.11/arch/
18696 { 18846 {
18697 #ifdef CONFIG_SMP 18847 #ifdef CONFIG_SMP
18698 return smp_num_siblings == 2 ? 2 : 1; 18848 return smp_num_siblings == 2 ? 2 : 1;
18699diff -urNp linux-2.6.32.11/arch/x86/pci/common.c linux-2.6.32.11/arch/x86/pci/common.c 18849diff -urNp linux-2.6.32.12/arch/x86/pci/common.c linux-2.6.32.12/arch/x86/pci/common.c
18700--- linux-2.6.32.11/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400 18850--- linux-2.6.32.12/arch/x86/pci/common.c 2010-03-15 11:52:04.000000000 -0400
18701+++ linux-2.6.32.11/arch/x86/pci/common.c 2010-04-04 20:46:41.537568318 -0400 18851+++ linux-2.6.32.12/arch/x86/pci/common.c 2010-04-04 20:46:41.537568318 -0400
18702@@ -31,8 +31,8 @@ int noioapicreroute = 1; 18852@@ -31,8 +31,8 @@ int noioapicreroute = 1;
18703 int pcibios_last_bus = -1; 18853 int pcibios_last_bus = -1;
18704 unsigned long pirq_table_addr; 18854 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
18719 }; 18869 };
18720 18870
18721 void __init dmi_check_pciprobe(void) 18871 void __init dmi_check_pciprobe(void)
18722diff -urNp linux-2.6.32.11/arch/x86/pci/direct.c linux-2.6.32.11/arch/x86/pci/direct.c 18872diff -urNp linux-2.6.32.12/arch/x86/pci/direct.c linux-2.6.32.12/arch/x86/pci/direct.c
18723--- linux-2.6.32.11/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400 18873--- linux-2.6.32.12/arch/x86/pci/direct.c 2010-03-15 11:52:04.000000000 -0400
18724+++ linux-2.6.32.11/arch/x86/pci/direct.c 2010-04-04 20:46:41.537568318 -0400 18874+++ linux-2.6.32.12/arch/x86/pci/direct.c 2010-04-04 20:46:41.537568318 -0400
18725@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int 18875@@ -79,7 +79,7 @@ static int pci_conf1_write(unsigned int
18726 18876
18727 #undef PCI_CONF1_ADDRESS 18877 #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
18749 { 18899 {
18750 u32 x = 0; 18900 u32 x = 0;
18751 int year, devfn; 18901 int year, devfn;
18752diff -urNp linux-2.6.32.11/arch/x86/pci/fixup.c linux-2.6.32.11/arch/x86/pci/fixup.c 18902diff -urNp linux-2.6.32.12/arch/x86/pci/fixup.c linux-2.6.32.12/arch/x86/pci/fixup.c
18753--- linux-2.6.32.11/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400 18903--- linux-2.6.32.12/arch/x86/pci/fixup.c 2010-03-15 11:52:04.000000000 -0400
18754+++ linux-2.6.32.11/arch/x86/pci/fixup.c 2010-04-04 20:46:41.537568318 -0400 18904+++ linux-2.6.32.12/arch/x86/pci/fixup.c 2010-04-04 20:46:41.537568318 -0400
18755@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi 18905@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi
18756 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), 18906 DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"),
18757 }, 18907 },
@@ -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
18770 }; 18920 };
18771 18921
18772 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) 18922 static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev)
18773diff -urNp linux-2.6.32.11/arch/x86/pci/irq.c linux-2.6.32.11/arch/x86/pci/irq.c 18923diff -urNp linux-2.6.32.12/arch/x86/pci/irq.c linux-2.6.32.12/arch/x86/pci/irq.c
18774--- linux-2.6.32.11/arch/x86/pci/irq.c 2010-03-15 11:52:04.000000000 -0400 18924--- linux-2.6.32.12/arch/x86/pci/irq.c 2010-04-29 17:49:37.625451376 -0400
18775+++ linux-2.6.32.11/arch/x86/pci/irq.c 2010-04-04 20:46:41.537568318 -0400 18925+++ linux-2.6.32.12/arch/x86/pci/irq.c 2010-04-29 17:49:58.053442872 -0400
18776@@ -543,7 +543,7 @@ static __init int intel_router_probe(str 18926@@ -543,7 +543,7 @@ static __init int intel_router_probe(str
18777 static struct pci_device_id __initdata pirq_440gx[] = { 18927 static struct pci_device_id __initdata pirq_440gx[] = {
18778 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, 18928 { 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
18782 }; 18932 };
18783 18933
18784 /* 440GX has a proprietary PIRQ router -- don't use it */ 18934 /* 440GX has a proprietary PIRQ router -- don't use it */
18785@@ -1107,7 +1107,7 @@ static struct dmi_system_id __initdata p 18935@@ -1109,7 +1109,7 @@ static struct dmi_system_id __initdata p
18786 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"), 18936 DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
18787 }, 18937 },
18788 }, 18938 },
@@ -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
18791 }; 18941 };
18792 18942
18793 int __init pcibios_irq_init(void) 18943 int __init pcibios_irq_init(void)
18794diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_32.c linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 18944diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_32.c linux-2.6.32.12/arch/x86/pci/mmconfig_32.c
18795--- linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400 18945--- linux-2.6.32.12/arch/x86/pci/mmconfig_32.c 2010-03-15 11:52:04.000000000 -0400
18796+++ linux-2.6.32.11/arch/x86/pci/mmconfig_32.c 2010-04-04 20:46:41.537568318 -0400 18946+++ linux-2.6.32.12/arch/x86/pci/mmconfig_32.c 2010-04-04 20:46:41.537568318 -0400
18797@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int 18947@@ -125,7 +125,7 @@ static int pci_mmcfg_write(unsigned int
18798 return 0; 18948 return 0;
18799 } 18949 }
@@ -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
18803 .read = pci_mmcfg_read, 18953 .read = pci_mmcfg_read,
18804 .write = pci_mmcfg_write, 18954 .write = pci_mmcfg_write,
18805 }; 18955 };
18806diff -urNp linux-2.6.32.11/arch/x86/pci/mmconfig_64.c linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 18956diff -urNp linux-2.6.32.12/arch/x86/pci/mmconfig_64.c linux-2.6.32.12/arch/x86/pci/mmconfig_64.c
18807--- linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400 18957--- linux-2.6.32.12/arch/x86/pci/mmconfig_64.c 2010-03-15 11:52:04.000000000 -0400
18808+++ linux-2.6.32.11/arch/x86/pci/mmconfig_64.c 2010-04-04 20:46:41.537568318 -0400 18958+++ linux-2.6.32.12/arch/x86/pci/mmconfig_64.c 2010-04-04 20:46:41.537568318 -0400
18809@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int 18959@@ -104,7 +104,7 @@ static int pci_mmcfg_write(unsigned int
18810 return 0; 18960 return 0;
18811 } 18961 }
@@ -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
18815 .read = pci_mmcfg_read, 18965 .read = pci_mmcfg_read,
18816 .write = pci_mmcfg_write, 18966 .write = pci_mmcfg_write,
18817 }; 18967 };
18818diff -urNp linux-2.6.32.11/arch/x86/pci/numaq_32.c linux-2.6.32.11/arch/x86/pci/numaq_32.c 18968diff -urNp linux-2.6.32.12/arch/x86/pci/numaq_32.c linux-2.6.32.12/arch/x86/pci/numaq_32.c
18819--- linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400 18969--- linux-2.6.32.12/arch/x86/pci/numaq_32.c 2010-03-15 11:52:04.000000000 -0400
18820+++ linux-2.6.32.11/arch/x86/pci/numaq_32.c 2010-04-04 20:46:41.537568318 -0400 18970+++ linux-2.6.32.12/arch/x86/pci/numaq_32.c 2010-04-04 20:46:41.537568318 -0400
18821@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i 18971@@ -112,7 +112,7 @@ static int pci_conf1_mq_write(unsigned i
18822 18972
18823 #undef PCI_CONF1_MQ_ADDRESS 18973 #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/
18827 .read = pci_conf1_mq_read, 18977 .read = pci_conf1_mq_read,
18828 .write = pci_conf1_mq_write 18978 .write = pci_conf1_mq_write
18829 }; 18979 };
18830diff -urNp linux-2.6.32.11/arch/x86/pci/olpc.c linux-2.6.32.11/arch/x86/pci/olpc.c 18980diff -urNp linux-2.6.32.12/arch/x86/pci/olpc.c linux-2.6.32.12/arch/x86/pci/olpc.c
18831--- linux-2.6.32.11/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400 18981--- linux-2.6.32.12/arch/x86/pci/olpc.c 2010-03-15 11:52:04.000000000 -0400
18832+++ linux-2.6.32.11/arch/x86/pci/olpc.c 2010-04-04 20:46:41.537568318 -0400 18982+++ linux-2.6.32.12/arch/x86/pci/olpc.c 2010-04-04 20:46:41.537568318 -0400
18833@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s 18983@@ -297,7 +297,7 @@ static int pci_olpc_write(unsigned int s
18834 return 0; 18984 return 0;
18835 } 18985 }
@@ -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
18839 .read = pci_olpc_read, 18989 .read = pci_olpc_read,
18840 .write = pci_olpc_write, 18990 .write = pci_olpc_write,
18841 }; 18991 };
18842diff -urNp linux-2.6.32.11/arch/x86/pci/pcbios.c linux-2.6.32.11/arch/x86/pci/pcbios.c 18992diff -urNp linux-2.6.32.12/arch/x86/pci/pcbios.c linux-2.6.32.12/arch/x86/pci/pcbios.c
18843--- linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400 18993--- linux-2.6.32.12/arch/x86/pci/pcbios.c 2010-03-15 11:52:04.000000000 -0400
18844+++ linux-2.6.32.11/arch/x86/pci/pcbios.c 2010-04-04 20:46:41.537568318 -0400 18994+++ linux-2.6.32.12/arch/x86/pci/pcbios.c 2010-04-04 20:46:41.537568318 -0400
18845@@ -56,50 +56,93 @@ union bios32 { 18995@@ -56,50 +56,93 @@ union bios32 {
18846 static struct { 18996 static struct {
18847 unsigned long address; 18997 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
19164 return !(ret & 0xff00); 19314 return !(ret & 0xff00);
19165 } 19315 }
19166 EXPORT_SYMBOL(pcibios_set_irq_routing); 19316 EXPORT_SYMBOL(pcibios_set_irq_routing);
19167diff -urNp linux-2.6.32.11/arch/x86/power/cpu.c linux-2.6.32.11/arch/x86/power/cpu.c 19317diff -urNp linux-2.6.32.12/arch/x86/power/cpu.c linux-2.6.32.12/arch/x86/power/cpu.c
19168--- linux-2.6.32.11/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400 19318--- linux-2.6.32.12/arch/x86/power/cpu.c 2010-03-15 11:52:04.000000000 -0400
19169+++ linux-2.6.32.11/arch/x86/power/cpu.c 2010-04-04 20:46:41.537568318 -0400 19319+++ linux-2.6.32.12/arch/x86/power/cpu.c 2010-04-04 20:46:41.537568318 -0400
19170@@ -126,7 +126,7 @@ static void do_fpu_end(void) 19320@@ -126,7 +126,7 @@ static void do_fpu_end(void)
19171 static void fix_processor_context(void) 19321 static void fix_processor_context(void)
19172 { 19322 {
@@ -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
19186 19336
19187 syscall_init(); /* This sets MSR_*STAR and related */ 19337 syscall_init(); /* This sets MSR_*STAR and related */
19188 #endif 19338 #endif
19189diff -urNp linux-2.6.32.11/arch/x86/vdso/Makefile linux-2.6.32.11/arch/x86/vdso/Makefile 19339diff -urNp linux-2.6.32.12/arch/x86/vdso/Makefile linux-2.6.32.12/arch/x86/vdso/Makefile
19190--- linux-2.6.32.11/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400 19340--- linux-2.6.32.12/arch/x86/vdso/Makefile 2010-03-15 11:52:04.000000000 -0400
19191+++ linux-2.6.32.11/arch/x86/vdso/Makefile 2010-04-04 20:46:41.537568318 -0400 19341+++ linux-2.6.32.12/arch/x86/vdso/Makefile 2010-04-04 20:46:41.537568318 -0400
19192@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ 19342@@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@
19193 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ 19343 $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \
19194 -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) 19344 -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/
19198 GCOV_PROFILE := n 19348 GCOV_PROFILE := n
19199 19349
19200 # 19350 #
19201diff -urNp linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 19351diff -urNp linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c
19202--- linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400 19352--- linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c 2010-03-15 11:52:04.000000000 -0400
19203+++ linux-2.6.32.11/arch/x86/vdso/vclock_gettime.c 2010-04-04 20:46:41.541133870 -0400 19353+++ linux-2.6.32.12/arch/x86/vdso/vclock_gettime.c 2010-04-04 20:46:41.541133870 -0400
19204@@ -22,24 +22,48 @@ 19354@@ -22,24 +22,48 @@
19205 #include <asm/hpet.h> 19355 #include <asm/hpet.h>
19206 #include <asm/unistd.h> 19356 #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
19299 } 19449 }
19300 int gettimeofday(struct timeval *, struct timezone *) 19450 int gettimeofday(struct timeval *, struct timezone *)
19301 __attribute__((weak, alias("__vdso_gettimeofday"))); 19451 __attribute__((weak, alias("__vdso_gettimeofday")));
19302diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 19452diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c
19303--- linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400 19453--- linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c 2010-03-15 11:52:04.000000000 -0400
19304+++ linux-2.6.32.11/arch/x86/vdso/vdso32-setup.c 2010-04-04 20:46:41.541133870 -0400 19454+++ linux-2.6.32.12/arch/x86/vdso/vdso32-setup.c 2010-04-04 20:46:41.541133870 -0400
19305@@ -25,6 +25,7 @@ 19455@@ -25,6 +25,7 @@
19306 #include <asm/tlbflush.h> 19456 #include <asm/tlbflush.h>
19307 #include <asm/vdso.h> 19457 #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
19402 return &gate_vma; 19552 return &gate_vma;
19403 return NULL; 19553 return NULL;
19404 } 19554 }
19405diff -urNp linux-2.6.32.11/arch/x86/vdso/vdso.lds.S linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 19555diff -urNp linux-2.6.32.12/arch/x86/vdso/vdso.lds.S linux-2.6.32.12/arch/x86/vdso/vdso.lds.S
19406--- linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400 19556--- linux-2.6.32.12/arch/x86/vdso/vdso.lds.S 2010-03-15 11:52:04.000000000 -0400
19407+++ linux-2.6.32.11/arch/x86/vdso/vdso.lds.S 2010-04-04 20:46:41.541133870 -0400 19557+++ linux-2.6.32.12/arch/x86/vdso/vdso.lds.S 2010-04-04 20:46:41.541133870 -0400
19408@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; 19558@@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK;
19409 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; 19559 #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x;
19410 #include "vextern.h" 19560 #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
19415+VEXTERN(fallback_time) 19565+VEXTERN(fallback_time)
19416+VEXTERN(getcpu) 19566+VEXTERN(getcpu)
19417+#undef VEXTERN 19567+#undef VEXTERN
19418diff -urNp linux-2.6.32.11/arch/x86/vdso/vextern.h linux-2.6.32.11/arch/x86/vdso/vextern.h 19568diff -urNp linux-2.6.32.12/arch/x86/vdso/vextern.h linux-2.6.32.12/arch/x86/vdso/vextern.h
19419--- linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400 19569--- linux-2.6.32.12/arch/x86/vdso/vextern.h 2010-03-15 11:52:04.000000000 -0400
19420+++ linux-2.6.32.11/arch/x86/vdso/vextern.h 2010-04-04 20:46:41.541133870 -0400 19570+++ linux-2.6.32.12/arch/x86/vdso/vextern.h 2010-04-04 20:46:41.541133870 -0400
19421@@ -11,6 +11,5 @@ 19571@@ -11,6 +11,5 @@
19422 put into vextern.h and be referenced as a pointer with vdso prefix. 19572 put into vextern.h and be referenced as a pointer with vdso prefix.
19423 The main kernel later fills in the values. */ 19573 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
19425-VEXTERN(jiffies) 19575-VEXTERN(jiffies)
19426 VEXTERN(vgetcpu_mode) 19576 VEXTERN(vgetcpu_mode)
19427 VEXTERN(vsyscall_gtod_data) 19577 VEXTERN(vsyscall_gtod_data)
19428diff -urNp linux-2.6.32.11/arch/x86/vdso/vma.c linux-2.6.32.11/arch/x86/vdso/vma.c 19578diff -urNp linux-2.6.32.12/arch/x86/vdso/vma.c linux-2.6.32.12/arch/x86/vdso/vma.c
19429--- linux-2.6.32.11/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400 19579--- linux-2.6.32.12/arch/x86/vdso/vma.c 2010-03-15 11:52:04.000000000 -0400
19430+++ linux-2.6.32.11/arch/x86/vdso/vma.c 2010-04-04 20:46:41.541133870 -0400 19580+++ linux-2.6.32.12/arch/x86/vdso/vma.c 2010-04-04 20:46:41.541133870 -0400
19431@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void) 19581@@ -57,7 +57,7 @@ static int __init init_vdso_vars(void)
19432 if (!vbase) 19582 if (!vbase)
19433 goto oom; 19583 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
19474- return 0; 19624- return 0;
19475-} 19625-}
19476-__setup("vdso=", vdso_setup); 19626-__setup("vdso=", vdso_setup);
19477diff -urNp linux-2.6.32.11/arch/x86/xen/enlighten.c linux-2.6.32.11/arch/x86/xen/enlighten.c 19627diff -urNp linux-2.6.32.12/arch/x86/xen/enlighten.c linux-2.6.32.12/arch/x86/xen/enlighten.c
19478--- linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400 19628--- linux-2.6.32.12/arch/x86/xen/enlighten.c 2010-03-15 11:52:04.000000000 -0400
19479+++ linux-2.6.32.11/arch/x86/xen/enlighten.c 2010-04-04 20:46:41.541133870 -0400 19629+++ linux-2.6.32.12/arch/x86/xen/enlighten.c 2010-04-04 20:46:41.541133870 -0400
19480@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); 19630@@ -71,8 +71,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
19481 19631
19482 struct shared_info xen_dummy_shared_info; 19632 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
19509 xen_smp_init(); 19659 xen_smp_init();
19510 19660
19511 pgd = (pgd_t *)xen_start_info->pt_base; 19661 pgd = (pgd_t *)xen_start_info->pt_base;
19512diff -urNp linux-2.6.32.11/arch/x86/xen/mmu.c linux-2.6.32.11/arch/x86/xen/mmu.c 19662diff -urNp linux-2.6.32.12/arch/x86/xen/mmu.c linux-2.6.32.12/arch/x86/xen/mmu.c
19513--- linux-2.6.32.11/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400 19663--- linux-2.6.32.12/arch/x86/xen/mmu.c 2010-03-15 11:52:04.000000000 -0400
19514+++ linux-2.6.32.11/arch/x86/xen/mmu.c 2010-04-04 20:46:41.541133870 -0400 19664+++ linux-2.6.32.12/arch/x86/xen/mmu.c 2010-04-04 20:46:41.541133870 -0400
19515@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable 19665@@ -1711,6 +1711,8 @@ __init pgd_t *xen_setup_kernel_pagetable
19516 convert_pfn_mfn(init_level4_pgt); 19666 convert_pfn_mfn(init_level4_pgt);
19517 convert_pfn_mfn(level3_ident_pgt); 19667 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
19532 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); 19682 set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
19533 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); 19683 set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
19534 19684
19535diff -urNp linux-2.6.32.11/arch/x86/xen/smp.c linux-2.6.32.11/arch/x86/xen/smp.c 19685diff -urNp linux-2.6.32.12/arch/x86/xen/smp.c linux-2.6.32.12/arch/x86/xen/smp.c
19536--- linux-2.6.32.11/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400 19686--- linux-2.6.32.12/arch/x86/xen/smp.c 2010-03-15 11:52:04.000000000 -0400
19537+++ linux-2.6.32.11/arch/x86/xen/smp.c 2010-04-04 20:46:41.541133870 -0400 19687+++ linux-2.6.32.12/arch/x86/xen/smp.c 2010-04-04 20:46:41.541133870 -0400
19538@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ 19688@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_
19539 { 19689 {
19540 BUG_ON(smp_processor_id() != 0); 19690 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
19558 ctxt->user_regs.ss = __KERNEL_DS; 19708 ctxt->user_regs.ss = __KERNEL_DS;
19559 #ifdef CONFIG_X86_32 19709 #ifdef CONFIG_X86_32
19560 ctxt->user_regs.fs = __KERNEL_PERCPU; 19710 ctxt->user_regs.fs = __KERNEL_PERCPU;
19561diff -urNp linux-2.6.32.11/arch/x86/xen/xen-ops.h linux-2.6.32.11/arch/x86/xen/xen-ops.h 19711diff -urNp linux-2.6.32.12/arch/x86/xen/xen-ops.h linux-2.6.32.12/arch/x86/xen/xen-ops.h
19562--- linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400 19712--- linux-2.6.32.12/arch/x86/xen/xen-ops.h 2010-03-15 11:52:04.000000000 -0400
19563+++ linux-2.6.32.11/arch/x86/xen/xen-ops.h 2010-04-04 20:46:41.541133870 -0400 19713+++ linux-2.6.32.12/arch/x86/xen/xen-ops.h 2010-04-04 20:46:41.541133870 -0400
19564@@ -10,8 +10,6 @@ 19714@@ -10,8 +10,6 @@
19565 extern const char xen_hypervisor_callback[]; 19715 extern const char xen_hypervisor_callback[];
19566 extern const char xen_failsafe_callback[]; 19716 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
19570 struct trap_info; 19720 struct trap_info;
19571 void xen_copy_trap_info(struct trap_info *traps); 19721 void xen_copy_trap_info(struct trap_info *traps);
19572 19722
19573diff -urNp linux-2.6.32.11/block/blk-integrity.c linux-2.6.32.11/block/blk-integrity.c 19723diff -urNp linux-2.6.32.12/block/blk-integrity.c linux-2.6.32.12/block/blk-integrity.c
19574--- linux-2.6.32.11/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400 19724--- linux-2.6.32.12/block/blk-integrity.c 2010-03-15 11:52:04.000000000 -0400
19575+++ linux-2.6.32.11/block/blk-integrity.c 2010-04-04 20:46:41.541133870 -0400 19725+++ linux-2.6.32.12/block/blk-integrity.c 2010-04-04 20:46:41.541133870 -0400
19576@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs 19726@@ -278,7 +278,7 @@ static struct attribute *integrity_attrs
19577 NULL, 19727 NULL,
19578 }; 19728 };
@@ -19582,9 +19732,9 @@ diff -urNp linux-2.6.32.11/block/blk-integrity.c linux-2.6.32.11/block/blk-integ
19582 .show = &integrity_attr_show, 19732 .show = &integrity_attr_show,
19583 .store = &integrity_attr_store, 19733 .store = &integrity_attr_store,
19584 }; 19734 };
19585diff -urNp linux-2.6.32.11/block/blk-iopoll.c linux-2.6.32.11/block/blk-iopoll.c 19735diff -urNp linux-2.6.32.12/block/blk-iopoll.c linux-2.6.32.12/block/blk-iopoll.c
19586--- linux-2.6.32.11/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400 19736--- linux-2.6.32.12/block/blk-iopoll.c 2010-03-15 11:52:04.000000000 -0400
19587+++ linux-2.6.32.11/block/blk-iopoll.c 2010-04-04 20:46:41.541133870 -0400 19737+++ linux-2.6.32.12/block/blk-iopoll.c 2010-04-04 20:46:41.541133870 -0400
19588@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo 19738@@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
19589 } 19739 }
19590 EXPORT_SYMBOL(blk_iopoll_complete); 19740 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
19594 { 19744 {
19595 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll); 19745 struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
19596 int rearm = 0, budget = blk_iopoll_budget; 19746 int rearm = 0, budget = blk_iopoll_budget;
19597diff -urNp linux-2.6.32.11/block/blk-map.c linux-2.6.32.11/block/blk-map.c 19747diff -urNp linux-2.6.32.12/block/blk-map.c linux-2.6.32.12/block/blk-map.c
19598--- linux-2.6.32.11/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400 19748--- linux-2.6.32.12/block/blk-map.c 2010-03-15 11:52:04.000000000 -0400
19599+++ linux-2.6.32.11/block/blk-map.c 2010-04-04 20:46:41.541133870 -0400 19749+++ linux-2.6.32.12/block/blk-map.c 2010-04-04 20:46:41.541133870 -0400
19600@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ 19750@@ -54,7 +54,7 @@ static int __blk_rq_map_user(struct requ
19601 * direct dma. else, set up kernel bounce buffers 19751 * direct dma. else, set up kernel bounce buffers
19602 */ 19752 */
@@ -19615,9 +19765,9 @@ diff -urNp linux-2.6.32.11/block/blk-map.c linux-2.6.32.11/block/blk-map.c
19615 if (do_copy) 19765 if (do_copy)
19616 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading); 19766 bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
19617 else 19767 else
19618diff -urNp linux-2.6.32.11/block/blk-softirq.c linux-2.6.32.11/block/blk-softirq.c 19768diff -urNp linux-2.6.32.12/block/blk-softirq.c linux-2.6.32.12/block/blk-softirq.c
19619--- linux-2.6.32.11/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400 19769--- linux-2.6.32.12/block/blk-softirq.c 2010-03-15 11:52:04.000000000 -0400
19620+++ linux-2.6.32.11/block/blk-softirq.c 2010-04-04 20:46:41.541133870 -0400 19770+++ linux-2.6.32.12/block/blk-softirq.c 2010-04-04 20:46:41.541133870 -0400
19621@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 19771@@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head,
19622 * Softirq action handler - move entries to local list and loop over them 19772 * Softirq action handler - move entries to local list and loop over them
19623 * while passing them to the queue registered handler. 19773 * 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
19627 { 19777 {
19628 struct list_head *cpu_list, local_list; 19778 struct list_head *cpu_list, local_list;
19629 19779
19630diff -urNp linux-2.6.32.11/block/blk-sysfs.c linux-2.6.32.11/block/blk-sysfs.c 19780diff -urNp linux-2.6.32.12/block/blk-sysfs.c linux-2.6.32.12/block/blk-sysfs.c
19631--- linux-2.6.32.11/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400 19781--- linux-2.6.32.12/block/blk-sysfs.c 2010-03-15 11:52:04.000000000 -0400
19632+++ linux-2.6.32.11/block/blk-sysfs.c 2010-04-04 20:46:41.541133870 -0400 19782+++ linux-2.6.32.12/block/blk-sysfs.c 2010-04-04 20:46:41.541133870 -0400
19633@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob 19783@@ -414,7 +414,7 @@ static void blk_release_queue(struct kob
19634 kmem_cache_free(blk_requestq_cachep, q); 19784 kmem_cache_free(blk_requestq_cachep, q);
19635 } 19785 }
@@ -19639,9 +19789,9 @@ diff -urNp linux-2.6.32.11/block/blk-sysfs.c linux-2.6.32.11/block/blk-sysfs.c
19639 .show = queue_attr_show, 19789 .show = queue_attr_show,
19640 .store = queue_attr_store, 19790 .store = queue_attr_store,
19641 }; 19791 };
19642diff -urNp linux-2.6.32.11/block/elevator.c linux-2.6.32.11/block/elevator.c 19792diff -urNp linux-2.6.32.12/block/elevator.c linux-2.6.32.12/block/elevator.c
19643--- linux-2.6.32.11/block/elevator.c 2010-03-15 11:52:04.000000000 -0400 19793--- linux-2.6.32.12/block/elevator.c 2010-03-15 11:52:04.000000000 -0400
19644+++ linux-2.6.32.11/block/elevator.c 2010-04-04 20:46:41.541133870 -0400 19794+++ linux-2.6.32.12/block/elevator.c 2010-04-04 20:46:41.541133870 -0400
19645@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str 19795@@ -889,7 +889,7 @@ elv_attr_store(struct kobject *kobj, str
19646 return error; 19796 return error;
19647 } 19797 }
@@ -19651,9 +19801,9 @@ diff -urNp linux-2.6.32.11/block/elevator.c linux-2.6.32.11/block/elevator.c
19651 .show = elv_attr_show, 19801 .show = elv_attr_show,
19652 .store = elv_attr_store, 19802 .store = elv_attr_store,
19653 }; 19803 };
19654diff -urNp linux-2.6.32.11/crypto/lrw.c linux-2.6.32.11/crypto/lrw.c 19804diff -urNp linux-2.6.32.12/crypto/lrw.c linux-2.6.32.12/crypto/lrw.c
19655--- linux-2.6.32.11/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400 19805--- linux-2.6.32.12/crypto/lrw.c 2010-03-15 11:52:04.000000000 -0400
19656+++ linux-2.6.32.11/crypto/lrw.c 2010-04-04 20:46:41.541133870 -0400 19806+++ linux-2.6.32.12/crypto/lrw.c 2010-04-04 20:46:41.541133870 -0400
19657@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par 19807@@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par
19658 struct priv *ctx = crypto_tfm_ctx(parent); 19808 struct priv *ctx = crypto_tfm_ctx(parent);
19659 struct crypto_cipher *child = ctx->child; 19809 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
19663 int bsize = crypto_cipher_blocksize(child); 19813 int bsize = crypto_cipher_blocksize(child);
19664 19814
19665 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); 19815 crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK);
19666diff -urNp linux-2.6.32.11/Documentation/dontdiff linux-2.6.32.11/Documentation/dontdiff 19816diff -urNp linux-2.6.32.12/Documentation/dontdiff linux-2.6.32.12/Documentation/dontdiff
19667--- linux-2.6.32.11/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400 19817--- linux-2.6.32.12/Documentation/dontdiff 2010-03-15 11:52:04.000000000 -0400
19668+++ linux-2.6.32.11/Documentation/dontdiff 2010-04-04 20:47:28.952733264 -0400 19818+++ linux-2.6.32.12/Documentation/dontdiff 2010-04-04 20:47:28.952733264 -0400
19669@@ -3,6 +3,7 @@ 19819@@ -3,6 +3,7 @@
19670 *.bin 19820 *.bin
19671 *.cpio 19821 *.cpio
@@ -19773,9 +19923,9 @@ diff -urNp linux-2.6.32.11/Documentation/dontdiff linux-2.6.32.11/Documentation/
19773 zImage* 19923 zImage*
19774 zconf.hash.c 19924 zconf.hash.c
19775+zoffset.h 19925+zoffset.h
19776diff -urNp linux-2.6.32.11/Documentation/kernel-parameters.txt linux-2.6.32.11/Documentation/kernel-parameters.txt 19926diff -urNp linux-2.6.32.12/Documentation/kernel-parameters.txt linux-2.6.32.12/Documentation/kernel-parameters.txt
19777--- linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400 19927--- linux-2.6.32.12/Documentation/kernel-parameters.txt 2010-03-15 11:52:04.000000000 -0400
19778+++ linux-2.6.32.11/Documentation/kernel-parameters.txt 2010-04-04 20:46:41.541133870 -0400 19928+++ linux-2.6.32.12/Documentation/kernel-parameters.txt 2010-04-04 20:46:41.541133870 -0400
19779@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters. 19929@@ -1833,6 +1833,12 @@ and is between 256 and 4096 characters.
19780 the specified number of seconds. This is to be used if 19930 the specified number of seconds. This is to be used if
19781 your oopses keep scrolling off the screen. 19931 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
19789 pcbit= [HW,ISDN] 19939 pcbit= [HW,ISDN]
19790 19940
19791 pcd. [PARIDE] 19941 pcd. [PARIDE]
19792diff -urNp linux-2.6.32.11/drivers/acpi/battery.c linux-2.6.32.11/drivers/acpi/battery.c 19942diff -urNp linux-2.6.32.12/drivers/acpi/battery.c linux-2.6.32.12/drivers/acpi/battery.c
19793--- linux-2.6.32.11/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400 19943--- linux-2.6.32.12/drivers/acpi/battery.c 2010-03-15 11:52:04.000000000 -0400
19794+++ linux-2.6.32.11/drivers/acpi/battery.c 2010-04-04 20:46:41.541133870 -0400 19944+++ linux-2.6.32.12/drivers/acpi/battery.c 2010-04-04 20:46:41.541133870 -0400
19795@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm); 19945@@ -763,7 +763,7 @@ DECLARE_FILE_FUNCTIONS(alarm);
19796 } 19946 }
19797 19947
@@ -19801,9 +19951,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/battery.c linux-2.6.32.11/drivers/acpi/b
19801 mode_t mode; 19951 mode_t mode;
19802 const char *name; 19952 const char *name;
19803 } acpi_battery_file[] = { 19953 } acpi_battery_file[] = {
19804diff -urNp linux-2.6.32.11/drivers/acpi/blacklist.c linux-2.6.32.11/drivers/acpi/blacklist.c 19954diff -urNp linux-2.6.32.12/drivers/acpi/blacklist.c linux-2.6.32.12/drivers/acpi/blacklist.c
19805--- linux-2.6.32.11/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400 19955--- linux-2.6.32.12/drivers/acpi/blacklist.c 2010-03-15 11:52:04.000000000 -0400
19806+++ linux-2.6.32.11/drivers/acpi/blacklist.c 2010-04-04 20:46:41.541133870 -0400 19956+++ linux-2.6.32.12/drivers/acpi/blacklist.c 2010-04-04 20:46:41.541133870 -0400
19807@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b 19957@@ -73,7 +73,7 @@ static struct acpi_blacklist_item acpi_b
19808 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, 19958 {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal,
19809 "Incorrect _ADR", 1}, 19959 "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
19813 }; 19963 };
19814 19964
19815 #if CONFIG_ACPI_BLACKLIST_YEAR 19965 #if CONFIG_ACPI_BLACKLIST_YEAR
19816diff -urNp linux-2.6.32.11/drivers/acpi/dock.c linux-2.6.32.11/drivers/acpi/dock.c 19966diff -urNp linux-2.6.32.12/drivers/acpi/dock.c linux-2.6.32.12/drivers/acpi/dock.c
19817--- linux-2.6.32.11/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400 19967--- linux-2.6.32.12/drivers/acpi/dock.c 2010-03-15 11:52:04.000000000 -0400
19818+++ linux-2.6.32.11/drivers/acpi/dock.c 2010-04-04 20:46:41.544756868 -0400 19968+++ linux-2.6.32.12/drivers/acpi/dock.c 2010-04-04 20:46:41.544756868 -0400
19819@@ -77,7 +77,7 @@ struct dock_dependent_device { 19969@@ -77,7 +77,7 @@ struct dock_dependent_device {
19820 struct list_head list; 19970 struct list_head list;
19821 struct list_head hotplug_list; 19971 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
19834 void *context) 19984 void *context)
19835 { 19985 {
19836 struct dock_dependent_device *dd; 19986 struct dock_dependent_device *dd;
19837diff -urNp linux-2.6.32.11/drivers/acpi/osl.c linux-2.6.32.11/drivers/acpi/osl.c 19987diff -urNp linux-2.6.32.12/drivers/acpi/osl.c linux-2.6.32.12/drivers/acpi/osl.c
19838--- linux-2.6.32.11/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400 19988--- linux-2.6.32.12/drivers/acpi/osl.c 2010-03-15 11:52:04.000000000 -0400
19839+++ linux-2.6.32.11/drivers/acpi/osl.c 2010-04-04 20:46:41.544756868 -0400 19989+++ linux-2.6.32.12/drivers/acpi/osl.c 2010-04-04 20:46:41.544756868 -0400
19840@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres 19990@@ -523,6 +523,8 @@ acpi_os_read_memory(acpi_physical_addres
19841 void __iomem *virt_addr; 19991 void __iomem *virt_addr;
19842 19992
@@ -19855,9 +20005,59 @@ diff -urNp linux-2.6.32.11/drivers/acpi/osl.c linux-2.6.32.11/drivers/acpi/osl.c
19855 20005
19856 switch (width) { 20006 switch (width) {
19857 case 8: 20007 case 8:
19858diff -urNp linux-2.6.32.11/drivers/acpi/processor_core.c linux-2.6.32.11/drivers/acpi/processor_core.c 20008diff -urNp linux-2.6.32.12/drivers/acpi/power_meter.c linux-2.6.32.12/drivers/acpi/power_meter.c
19859--- linux-2.6.32.11/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400 20009--- linux-2.6.32.12/drivers/acpi/power_meter.c 2010-03-15 11:52:04.000000000 -0400
19860+++ linux-2.6.32.11/drivers/acpi/processor_core.c 2010-04-04 20:46:41.544756868 -0400 20010+++ linux-2.6.32.12/drivers/acpi/power_meter.c 2010-04-29 17:46:37.081234462 -0400
20011@@ -315,8 +315,6 @@ static ssize_t set_trip(struct device *d
20012 return res;
20013
20014 temp /= 1000;
20015- if (temp < 0)
20016- return -EINVAL;
20017
20018 mutex_lock(&resource->lock);
20019 resource->trip[attr->index - 7] = temp;
20020diff -urNp linux-2.6.32.12/drivers/acpi/proc.c linux-2.6.32.12/drivers/acpi/proc.c
20021--- linux-2.6.32.12/drivers/acpi/proc.c 2010-03-15 11:52:04.000000000 -0400
20022+++ linux-2.6.32.12/drivers/acpi/proc.c 2010-04-29 17:46:37.081234462 -0400
20023@@ -391,20 +391,15 @@ acpi_system_write_wakeup_device(struct f
20024 size_t count, loff_t * ppos)
20025 {
20026 struct list_head *node, *next;
20027- char strbuf[5];
20028- char str[5] = "";
20029- unsigned int len = count;
20030+ char strbuf[5] = {0};
20031 struct acpi_device *found_dev = NULL;
20032
20033- if (len > 4)
20034- len = 4;
20035- if (len < 0)
20036- return -EFAULT;
20037+ if (count > 4)
20038+ count = 4;
20039
20040- if (copy_from_user(strbuf, buffer, len))
20041+ if (copy_from_user(strbuf, buffer, count))
20042 return -EFAULT;
20043- strbuf[len] = '\0';
20044- sscanf(strbuf, "%s", str);
20045+ strbuf[count] = '\0';
20046
20047 mutex_lock(&acpi_device_lock);
20048 list_for_each_safe(node, next, &acpi_wakeup_device_list) {
20049@@ -413,7 +408,7 @@ acpi_system_write_wakeup_device(struct f
20050 if (!dev->wakeup.flags.valid)
20051 continue;
20052
20053- if (!strncmp(dev->pnp.bus_id, str, 4)) {
20054+ if (!strncmp(dev->pnp.bus_id, strbuf, 4)) {
20055 dev->wakeup.state.enabled =
20056 dev->wakeup.state.enabled ? 0 : 1;
20057 found_dev = dev;
20058diff -urNp linux-2.6.32.12/drivers/acpi/processor_core.c linux-2.6.32.12/drivers/acpi/processor_core.c
20059--- linux-2.6.32.12/drivers/acpi/processor_core.c 2010-03-15 11:52:04.000000000 -0400
20060+++ linux-2.6.32.12/drivers/acpi/processor_core.c 2010-04-04 20:46:41.544756868 -0400
19861@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add( 20061@@ -796,7 +796,7 @@ static int __cpuinit acpi_processor_add(
19862 return 0; 20062 return 0;
19863 } 20063 }
@@ -19867,9 +20067,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/processor_core.c linux-2.6.32.11/drivers
19867 20067
19868 /* 20068 /*
19869 * Buggy BIOS check 20069 * Buggy BIOS check
19870diff -urNp linux-2.6.32.11/drivers/acpi/processor_idle.c linux-2.6.32.11/drivers/acpi/processor_idle.c 20070diff -urNp linux-2.6.32.12/drivers/acpi/processor_idle.c linux-2.6.32.12/drivers/acpi/processor_idle.c
19871--- linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400 20071--- linux-2.6.32.12/drivers/acpi/processor_idle.c 2010-03-15 11:52:04.000000000 -0400
19872+++ linux-2.6.32.11/drivers/acpi/processor_idle.c 2010-04-04 20:46:41.544756868 -0400 20072+++ linux-2.6.32.12/drivers/acpi/processor_idle.c 2010-04-04 20:46:41.544756868 -0400
19873@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat 20073@@ -118,7 +118,7 @@ static struct dmi_system_id __cpuinitdat
19874 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."), 20074 DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK Computer Inc."),
19875 DMI_MATCH(DMI_PRODUCT_NAME,"L8400B series Notebook PC")}, 20075 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
19879 }; 20079 };
19880 20080
19881 20081
19882diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sleep.c 20082diff -urNp linux-2.6.32.12/drivers/acpi/sleep.c linux-2.6.32.12/drivers/acpi/sleep.c
19883--- linux-2.6.32.11/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400 20083--- linux-2.6.32.12/drivers/acpi/sleep.c 2010-03-15 11:52:04.000000000 -0400
19884+++ linux-2.6.32.11/drivers/acpi/sleep.c 2010-04-04 20:46:41.544756868 -0400 20084+++ linux-2.6.32.12/drivers/acpi/sleep.c 2010-04-04 20:46:41.544756868 -0400
19885@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp 20085@@ -297,7 +297,7 @@ static int acpi_suspend_state_valid(susp
19886 } 20086 }
19887 } 20087 }
@@ -19918,9 +20118,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/sleep.c linux-2.6.32.11/drivers/acpi/sle
19918 .begin = acpi_hibernation_begin_old, 20118 .begin = acpi_hibernation_begin_old,
19919 .end = acpi_pm_end, 20119 .end = acpi_pm_end,
19920 .pre_snapshot = acpi_hibernation_pre_snapshot_old, 20120 .pre_snapshot = acpi_hibernation_pre_snapshot_old,
19921diff -urNp linux-2.6.32.11/drivers/acpi/video.c linux-2.6.32.11/drivers/acpi/video.c 20121diff -urNp linux-2.6.32.12/drivers/acpi/video.c linux-2.6.32.12/drivers/acpi/video.c
19922--- linux-2.6.32.11/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400 20122--- linux-2.6.32.12/drivers/acpi/video.c 2010-03-15 11:52:04.000000000 -0400
19923+++ linux-2.6.32.11/drivers/acpi/video.c 2010-04-04 20:46:41.544756868 -0400 20123+++ linux-2.6.32.12/drivers/acpi/video.c 2010-04-04 20:46:41.544756868 -0400
19924@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str 20124@@ -359,7 +359,7 @@ static int acpi_video_set_brightness(str
19925 vd->brightness->levels[request_level]); 20125 vd->brightness->levels[request_level]);
19926 } 20126 }
@@ -19930,9 +20130,9 @@ diff -urNp linux-2.6.32.11/drivers/acpi/video.c linux-2.6.32.11/drivers/acpi/vid
19930 .get_brightness = acpi_video_get_brightness, 20130 .get_brightness = acpi_video_get_brightness,
19931 .update_status = acpi_video_set_brightness, 20131 .update_status = acpi_video_set_brightness,
19932 }; 20132 };
19933diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c 20133diff -urNp linux-2.6.32.12/drivers/ata/ahci.c linux-2.6.32.12/drivers/ata/ahci.c
19934--- linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:41:49.920655481 -0400 20134--- linux-2.6.32.12/drivers/ata/ahci.c 2010-04-29 17:49:37.661448235 -0400
19935+++ linux-2.6.32.11/drivers/ata/ahci.c 2010-04-04 20:46:41.544756868 -0400 20135+++ linux-2.6.32.12/drivers/ata/ahci.c 2010-04-29 17:49:58.057498948 -0400
19936@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh 20136@@ -387,7 +387,7 @@ static struct scsi_host_template ahci_sh
19937 .sdev_attrs = ahci_sdev_attrs, 20137 .sdev_attrs = ahci_sdev_attrs,
19938 }; 20138 };
@@ -19963,7 +20163,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c
19963 .inherits = &ahci_ops, 20163 .inherits = &ahci_ops,
19964 .softreset = ahci_sb600_softreset, 20164 .softreset = ahci_sb600_softreset,
19965 .pmp_softreset = ahci_sb600_softreset, 20165 .pmp_softreset = ahci_sb600_softreset,
19966@@ -681,7 +681,7 @@ static const struct pci_device_id ahci_p 20166@@ -687,7 +687,7 @@ static const struct pci_device_id ahci_p
19967 { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, 20167 { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
19968 PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, 20168 PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci },
19969 20169
@@ -19972,9 +20172,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/ahci.c linux-2.6.32.11/drivers/ata/ahci.c
19972 }; 20172 };
19973 20173
19974 20174
19975diff -urNp linux-2.6.32.11/drivers/ata/ata_generic.c linux-2.6.32.11/drivers/ata/ata_generic.c 20175diff -urNp linux-2.6.32.12/drivers/ata/ata_generic.c linux-2.6.32.12/drivers/ata/ata_generic.c
19976--- linux-2.6.32.11/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400 20176--- linux-2.6.32.12/drivers/ata/ata_generic.c 2010-03-15 11:52:04.000000000 -0400
19977+++ linux-2.6.32.11/drivers/ata/ata_generic.c 2010-04-04 20:46:41.544756868 -0400 20177+++ linux-2.6.32.12/drivers/ata/ata_generic.c 2010-04-04 20:46:41.544756868 -0400
19978@@ -95,7 +95,7 @@ static struct scsi_host_template generic 20178@@ -95,7 +95,7 @@ static struct scsi_host_template generic
19979 ATA_BMDMA_SHT(DRV_NAME), 20179 ATA_BMDMA_SHT(DRV_NAME),
19980 }; 20180 };
@@ -19984,19 +20184,19 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_generic.c linux-2.6.32.11/drivers/ata
19984 .inherits = &ata_bmdma_port_ops, 20184 .inherits = &ata_bmdma_port_ops,
19985 .cable_detect = ata_cable_unknown, 20185 .cable_detect = ata_cable_unknown,
19986 .set_mode = generic_set_mode, 20186 .set_mode = generic_set_mode,
19987diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/ata_piix.c 20187diff -urNp linux-2.6.32.12/drivers/ata/ata_piix.c linux-2.6.32.12/drivers/ata/ata_piix.c
19988--- linux-2.6.32.11/drivers/ata/ata_piix.c 2010-03-15 11:52:04.000000000 -0400 20188--- linux-2.6.32.12/drivers/ata/ata_piix.c 2010-04-29 17:49:37.669446700 -0400
19989+++ linux-2.6.32.11/drivers/ata/ata_piix.c 2010-04-04 20:46:41.544756868 -0400 20189+++ linux-2.6.32.12/drivers/ata/ata_piix.c 2010-04-29 18:01:47.141162449 -0400
19990@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p 20190@@ -299,7 +299,7 @@ static const struct pci_device_id piix_p
19991 { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, 20191 { 0x8086, 0x1c08, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
19992 /* SATA Controller IDE (PCH) */ 20192 /* SATA Controller IDE (CPT) */
19993 { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, 20193 { 0x8086, 0x1c09, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata },
19994- { } /* terminate list */ 20194- { } /* terminate list */
19995+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */ 20195+ { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
19996 }; 20196 };
19997 20197
19998 static struct pci_driver piix_pci_driver = { 20198 static struct pci_driver piix_pci_driver = {
19999@@ -309,7 +309,7 @@ static struct scsi_host_template piix_sh 20199@@ -317,7 +317,7 @@ static struct scsi_host_template piix_sh
20000 ATA_BMDMA_SHT(DRV_NAME), 20200 ATA_BMDMA_SHT(DRV_NAME),
20001 }; 20201 };
20002 20202
@@ -20005,7 +20205,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at
20005 .inherits = &ata_bmdma32_port_ops, 20205 .inherits = &ata_bmdma32_port_ops,
20006 .cable_detect = ata_cable_40wire, 20206 .cable_detect = ata_cable_40wire,
20007 .set_piomode = piix_set_piomode, 20207 .set_piomode = piix_set_piomode,
20008@@ -317,22 +317,22 @@ static struct ata_port_operations piix_p 20208@@ -325,22 +325,22 @@ static struct ata_port_operations piix_p
20009 .prereset = piix_pata_prereset, 20209 .prereset = piix_pata_prereset,
20010 }; 20210 };
20011 20211
@@ -20032,7 +20232,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at
20032 .inherits = &piix_sata_ops, 20232 .inherits = &piix_sata_ops,
20033 .hardreset = sata_std_hardreset, 20233 .hardreset = sata_std_hardreset,
20034 .scr_read = piix_sidpr_scr_read, 20234 .scr_read = piix_sidpr_scr_read,
20035@@ -608,7 +608,7 @@ static const struct ich_laptop ich_lapto 20235@@ -616,7 +616,7 @@ static const struct ich_laptop ich_lapto
20036 { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ 20236 { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */
20037 { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ 20237 { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */
20038 /* end marker */ 20238 /* 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
20041 }; 20241 };
20042 20242
20043 /** 20243 /**
20044@@ -1086,7 +1086,7 @@ static int piix_broken_suspend(void) 20244@@ -1094,7 +1094,7 @@ static int piix_broken_suspend(void)
20045 }, 20245 },
20046 }, 20246 },
20047 20247
@@ -20050,9 +20250,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/ata_piix.c linux-2.6.32.11/drivers/ata/at
20050 }; 20250 };
20051 static const char *oemstrs[] = { 20251 static const char *oemstrs[] = {
20052 "Tecra M3,", 20252 "Tecra M3,",
20053diff -urNp linux-2.6.32.11/drivers/ata/libata-acpi.c linux-2.6.32.11/drivers/ata/libata-acpi.c 20253diff -urNp linux-2.6.32.12/drivers/ata/libata-acpi.c linux-2.6.32.12/drivers/ata/libata-acpi.c
20054--- linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400 20254--- linux-2.6.32.12/drivers/ata/libata-acpi.c 2010-03-15 11:52:04.000000000 -0400
20055+++ linux-2.6.32.11/drivers/ata/libata-acpi.c 2010-04-04 20:46:41.544756868 -0400 20255+++ linux-2.6.32.12/drivers/ata/libata-acpi.c 2010-04-04 20:46:41.544756868 -0400
20056@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han 20256@@ -223,12 +223,12 @@ static void ata_acpi_dev_uevent(acpi_han
20057 ata_acpi_uevent(dev->link->ap, dev, event); 20257 ata_acpi_uevent(dev->link->ap, dev, event);
20058 } 20258 }
@@ -20068,9 +20268,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-acpi.c linux-2.6.32.11/drivers/ata
20068 .handler = ata_acpi_ap_notify_dock, 20268 .handler = ata_acpi_ap_notify_dock,
20069 .uevent = ata_acpi_ap_uevent, 20269 .uevent = ata_acpi_ap_uevent,
20070 }; 20270 };
20071diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata/libata-core.c 20271diff -urNp linux-2.6.32.12/drivers/ata/libata-core.c linux-2.6.32.12/drivers/ata/libata-core.c
20072--- linux-2.6.32.11/drivers/ata/libata-core.c 2010-03-15 11:52:04.000000000 -0400 20272--- linux-2.6.32.12/drivers/ata/libata-core.c 2010-04-29 17:49:37.689144697 -0400
20073+++ linux-2.6.32.11/drivers/ata/libata-core.c 2010-04-04 20:46:41.544756868 -0400 20273+++ linux-2.6.32.12/drivers/ata/libata-core.c 2010-04-29 17:49:58.081481928 -0400
20074@@ -896,7 +896,7 @@ static const struct ata_xfer_ent { 20274@@ -896,7 +896,7 @@ static const struct ata_xfer_ent {
20075 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, 20275 { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 },
20076 { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, 20276 { 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
20089 }; 20289 };
20090 20290
20091 #define ENOUGH(v, unit) (((v)-1)/(unit)+1) 20291 #define ENOUGH(v, unit) (((v)-1)/(unit)+1)
20092@@ -4385,7 +4385,7 @@ static const struct ata_blacklist_entry 20292@@ -4388,7 +4388,7 @@ static const struct ata_blacklist_entry
20093 { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER }, 20293 { "PIONEER DVD-RW DVRTD08", "1.00", ATA_HORKAGE_NOSETXFER },
20094 20294
20095 /* End Marker */ 20295 /* 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
20098 }; 20298 };
20099 20299
20100 static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) 20300 static int strn_pattern_cmp(const char *patt, const char *name, int wildchar)
20101@@ -5961,7 +5961,7 @@ static void ata_host_stop(struct device 20301@@ -5964,7 +5964,7 @@ static void ata_host_stop(struct device
20102 * LOCKING: 20302 * LOCKING:
20103 * None. 20303 * None.
20104 */ 20304 */
@@ -20107,7 +20307,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
20107 { 20307 {
20108 static DEFINE_SPINLOCK(lock); 20308 static DEFINE_SPINLOCK(lock);
20109 const struct ata_port_operations *cur; 20309 const struct ata_port_operations *cur;
20110@@ -5973,6 +5973,7 @@ static void ata_finalize_port_ops(struct 20310@@ -5976,6 +5976,7 @@ static void ata_finalize_port_ops(struct
20111 return; 20311 return;
20112 20312
20113 spin_lock(&lock); 20313 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
20115 20315
20116 for (cur = ops->inherits; cur; cur = cur->inherits) { 20316 for (cur = ops->inherits; cur; cur = cur->inherits) {
20117 void **inherit = (void **)cur; 20317 void **inherit = (void **)cur;
20118@@ -5986,8 +5987,9 @@ static void ata_finalize_port_ops(struct 20318@@ -5989,8 +5990,9 @@ static void ata_finalize_port_ops(struct
20119 if (IS_ERR(*pp)) 20319 if (IS_ERR(*pp))
20120 *pp = NULL; 20320 *pp = NULL;
20121 20321
@@ -20126,7 +20326,7 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
20126 spin_unlock(&lock); 20326 spin_unlock(&lock);
20127 } 20327 }
20128 20328
20129@@ -6084,7 +6086,7 @@ int ata_host_start(struct ata_host *host 20329@@ -6087,7 +6089,7 @@ int ata_host_start(struct ata_host *host
20130 */ 20330 */
20131 /* KILLME - the only user left is ipr */ 20331 /* KILLME - the only user left is ipr */
20132 void ata_host_init(struct ata_host *host, struct device *dev, 20332 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
20135 { 20335 {
20136 spin_lock_init(&host->lock); 20336 spin_lock_init(&host->lock);
20137 host->dev = dev; 20337 host->dev = dev;
20138@@ -6747,7 +6749,7 @@ static void ata_dummy_error_handler(stru 20338@@ -6750,7 +6752,7 @@ static void ata_dummy_error_handler(stru
20139 /* truly dummy */ 20339 /* truly dummy */
20140 } 20340 }
20141 20341
@@ -20144,9 +20344,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/libata-core.c linux-2.6.32.11/drivers/ata
20144 .qc_prep = ata_noop_qc_prep, 20344 .qc_prep = ata_noop_qc_prep,
20145 .qc_issue = ata_dummy_qc_issue, 20345 .qc_issue = ata_dummy_qc_issue,
20146 .error_handler = ata_dummy_error_handler, 20346 .error_handler = ata_dummy_error_handler,
20147diff -urNp linux-2.6.32.11/drivers/ata/libata-eh.c linux-2.6.32.11/drivers/ata/libata-eh.c 20347diff -urNp linux-2.6.32.12/drivers/ata/libata-eh.c linux-2.6.32.12/drivers/ata/libata-eh.c
20148--- linux-2.6.32.11/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400 20348--- linux-2.6.32.12/drivers/ata/libata-eh.c 2010-03-15 11:52:04.000000000 -0400
20149+++ linux-2.6.32.11/drivers/ata/libata-eh.c 2010-04-04 20:46:41.544756868 -0400 20349+++ linux-2.6.32.12/drivers/ata/libata-eh.c 2010-04-04 20:46:41.544756868 -0400
20150@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_ 20350@@ -3581,7 +3581,7 @@ void ata_do_eh(struct ata_port *ap, ata_
20151 */ 20351 */
20152 void ata_std_error_handler(struct ata_port *ap) 20352 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
20156 ata_reset_fn_t hardreset = ops->hardreset; 20356 ata_reset_fn_t hardreset = ops->hardreset;
20157 20357
20158 /* ignore built-in hardreset if SCR access is not available */ 20358 /* ignore built-in hardreset if SCR access is not available */
20159diff -urNp linux-2.6.32.11/drivers/ata/libata-pmp.c linux-2.6.32.11/drivers/ata/libata-pmp.c 20359diff -urNp linux-2.6.32.12/drivers/ata/libata-pmp.c linux-2.6.32.12/drivers/ata/libata-pmp.c
20160--- linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400 20360--- linux-2.6.32.12/drivers/ata/libata-pmp.c 2010-03-15 11:52:04.000000000 -0400
20161+++ linux-2.6.32.11/drivers/ata/libata-pmp.c 2010-04-04 20:46:41.544756868 -0400 20361+++ linux-2.6.32.12/drivers/ata/libata-pmp.c 2010-04-04 20:46:41.544756868 -0400
20162@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str 20362@@ -841,7 +841,7 @@ static int sata_pmp_handle_link_fail(str
20163 */ 20363 */
20164 static int sata_pmp_eh_recover(struct ata_port *ap) 20364 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/
20168 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS]; 20368 int pmp_tries, link_tries[SATA_PMP_MAX_PORTS];
20169 struct ata_link *pmp_link = &ap->link; 20369 struct ata_link *pmp_link = &ap->link;
20170 struct ata_device *pmp_dev = pmp_link->device; 20370 struct ata_device *pmp_dev = pmp_link->device;
20171diff -urNp linux-2.6.32.11/drivers/ata/pata_acpi.c linux-2.6.32.11/drivers/ata/pata_acpi.c 20371diff -urNp linux-2.6.32.12/drivers/ata/pata_acpi.c linux-2.6.32.12/drivers/ata/pata_acpi.c
20172--- linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400 20372--- linux-2.6.32.12/drivers/ata/pata_acpi.c 2010-03-15 11:52:04.000000000 -0400
20173+++ linux-2.6.32.11/drivers/ata/pata_acpi.c 2010-04-04 20:46:41.549452547 -0400 20373+++ linux-2.6.32.12/drivers/ata/pata_acpi.c 2010-04-04 20:46:41.549452547 -0400
20174@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s 20374@@ -215,7 +215,7 @@ static struct scsi_host_template pacpi_s
20175 ATA_BMDMA_SHT(DRV_NAME), 20375 ATA_BMDMA_SHT(DRV_NAME),
20176 }; 20376 };
@@ -20180,9 +20380,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_acpi.c linux-2.6.32.11/drivers/ata/p
20180 .inherits = &ata_bmdma_port_ops, 20380 .inherits = &ata_bmdma_port_ops,
20181 .qc_issue = pacpi_qc_issue, 20381 .qc_issue = pacpi_qc_issue,
20182 .cable_detect = pacpi_cable_detect, 20382 .cable_detect = pacpi_cable_detect,
20183diff -urNp linux-2.6.32.11/drivers/ata/pata_ali.c linux-2.6.32.11/drivers/ata/pata_ali.c 20383diff -urNp linux-2.6.32.12/drivers/ata/pata_ali.c linux-2.6.32.12/drivers/ata/pata_ali.c
20184--- linux-2.6.32.11/drivers/ata/pata_ali.c 2010-03-15 11:52:04.000000000 -0400 20384--- linux-2.6.32.12/drivers/ata/pata_ali.c 2010-04-29 17:49:37.689144697 -0400
20185+++ linux-2.6.32.11/drivers/ata/pata_ali.c 2010-04-04 20:46:41.549452547 -0400 20385+++ linux-2.6.32.12/drivers/ata/pata_ali.c 2010-04-29 17:49:58.081481928 -0400
20186@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht 20386@@ -365,7 +365,7 @@ static struct scsi_host_template ali_sht
20187 * Port operations for PIO only ALi 20387 * Port operations for PIO only ALi
20188 */ 20388 */
@@ -20228,9 +20428,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ali.c linux-2.6.32.11/drivers/ata/pa
20228 .inherits = &ali_dma_base_ops, 20428 .inherits = &ali_dma_base_ops,
20229 .check_atapi_dma = ali_check_atapi_dma, 20429 .check_atapi_dma = ali_check_atapi_dma,
20230 .dev_config = ali_warn_atapi_dma, 20430 .dev_config = ali_warn_atapi_dma,
20231diff -urNp linux-2.6.32.11/drivers/ata/pata_amd.c linux-2.6.32.11/drivers/ata/pata_amd.c 20431diff -urNp linux-2.6.32.12/drivers/ata/pata_amd.c linux-2.6.32.12/drivers/ata/pata_amd.c
20232--- linux-2.6.32.11/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400 20432--- linux-2.6.32.12/drivers/ata/pata_amd.c 2010-03-15 11:52:04.000000000 -0400
20233+++ linux-2.6.32.11/drivers/ata/pata_amd.c 2010-04-04 20:46:41.549452547 -0400 20433+++ linux-2.6.32.12/drivers/ata/pata_amd.c 2010-04-04 20:46:41.549452547 -0400
20234@@ -397,28 +397,28 @@ static const struct ata_port_operations 20434@@ -397,28 +397,28 @@ static const struct ata_port_operations
20235 .prereset = amd_pre_reset, 20435 .prereset = amd_pre_reset,
20236 }; 20436 };
@@ -20280,9 +20480,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_amd.c linux-2.6.32.11/drivers/ata/pa
20280 .inherits = &nv_base_port_ops, 20480 .inherits = &nv_base_port_ops,
20281 .set_piomode = nv133_set_piomode, 20481 .set_piomode = nv133_set_piomode,
20282 .set_dmamode = nv133_set_dmamode, 20482 .set_dmamode = nv133_set_dmamode,
20283diff -urNp linux-2.6.32.11/drivers/ata/pata_artop.c linux-2.6.32.11/drivers/ata/pata_artop.c 20483diff -urNp linux-2.6.32.12/drivers/ata/pata_artop.c linux-2.6.32.12/drivers/ata/pata_artop.c
20284--- linux-2.6.32.11/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400 20484--- linux-2.6.32.12/drivers/ata/pata_artop.c 2010-03-15 11:52:04.000000000 -0400
20285+++ linux-2.6.32.11/drivers/ata/pata_artop.c 2010-04-04 20:46:41.549452547 -0400 20485+++ linux-2.6.32.12/drivers/ata/pata_artop.c 2010-04-04 20:46:41.549452547 -0400
20286@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s 20486@@ -311,7 +311,7 @@ static struct scsi_host_template artop_s
20287 ATA_BMDMA_SHT(DRV_NAME), 20487 ATA_BMDMA_SHT(DRV_NAME),
20288 }; 20488 };
@@ -20301,9 +20501,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_artop.c linux-2.6.32.11/drivers/ata/
20301 .inherits = &ata_bmdma_port_ops, 20501 .inherits = &ata_bmdma_port_ops,
20302 .cable_detect = artop6260_cable_detect, 20502 .cable_detect = artop6260_cable_detect,
20303 .set_piomode = artop6260_set_piomode, 20503 .set_piomode = artop6260_set_piomode,
20304diff -urNp linux-2.6.32.11/drivers/ata/pata_at32.c linux-2.6.32.11/drivers/ata/pata_at32.c 20504diff -urNp linux-2.6.32.12/drivers/ata/pata_at32.c linux-2.6.32.12/drivers/ata/pata_at32.c
20305--- linux-2.6.32.11/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400 20505--- linux-2.6.32.12/drivers/ata/pata_at32.c 2010-03-15 11:52:04.000000000 -0400
20306+++ linux-2.6.32.11/drivers/ata/pata_at32.c 2010-04-04 20:46:41.549452547 -0400 20506+++ linux-2.6.32.12/drivers/ata/pata_at32.c 2010-04-04 20:46:41.549452547 -0400
20307@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh 20507@@ -172,7 +172,7 @@ static struct scsi_host_template at32_sh
20308 ATA_PIO_SHT(DRV_NAME), 20508 ATA_PIO_SHT(DRV_NAME),
20309 }; 20509 };
@@ -20313,9 +20513,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_at32.c linux-2.6.32.11/drivers/ata/p
20313 .inherits = &ata_sff_port_ops, 20513 .inherits = &ata_sff_port_ops,
20314 .cable_detect = ata_cable_40wire, 20514 .cable_detect = ata_cable_40wire,
20315 .set_piomode = pata_at32_set_piomode, 20515 .set_piomode = pata_at32_set_piomode,
20316diff -urNp linux-2.6.32.11/drivers/ata/pata_at91.c linux-2.6.32.11/drivers/ata/pata_at91.c 20516diff -urNp linux-2.6.32.12/drivers/ata/pata_at91.c linux-2.6.32.12/drivers/ata/pata_at91.c
20317--- linux-2.6.32.11/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400 20517--- linux-2.6.32.12/drivers/ata/pata_at91.c 2010-03-15 11:52:04.000000000 -0400
20318+++ linux-2.6.32.11/drivers/ata/pata_at91.c 2010-04-04 20:46:41.549452547 -0400 20518+++ linux-2.6.32.12/drivers/ata/pata_at91.c 2010-04-04 20:46:41.549452547 -0400
20319@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at 20519@@ -195,7 +195,7 @@ static struct scsi_host_template pata_at
20320 ATA_PIO_SHT(DRV_NAME), 20520 ATA_PIO_SHT(DRV_NAME),
20321 }; 20521 };
@@ -20325,9 +20525,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_at91.c linux-2.6.32.11/drivers/ata/p
20325 .inherits = &ata_sff_port_ops, 20525 .inherits = &ata_sff_port_ops,
20326 20526
20327 .sff_data_xfer = pata_at91_data_xfer_noirq, 20527 .sff_data_xfer = pata_at91_data_xfer_noirq,
20328diff -urNp linux-2.6.32.11/drivers/ata/pata_atiixp.c linux-2.6.32.11/drivers/ata/pata_atiixp.c 20528diff -urNp linux-2.6.32.12/drivers/ata/pata_atiixp.c linux-2.6.32.12/drivers/ata/pata_atiixp.c
20329--- linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400 20529--- linux-2.6.32.12/drivers/ata/pata_atiixp.c 2010-03-15 11:52:04.000000000 -0400
20330+++ linux-2.6.32.11/drivers/ata/pata_atiixp.c 2010-04-04 20:46:41.549452547 -0400 20530+++ linux-2.6.32.12/drivers/ata/pata_atiixp.c 2010-04-04 20:46:41.549452547 -0400
20331@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_ 20531@@ -205,7 +205,7 @@ static struct scsi_host_template atiixp_
20332 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20532 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20333 }; 20533 };
@@ -20337,9 +20537,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_atiixp.c linux-2.6.32.11/drivers/ata
20337 .inherits = &ata_bmdma_port_ops, 20537 .inherits = &ata_bmdma_port_ops,
20338 20538
20339 .qc_prep = ata_sff_dumb_qc_prep, 20539 .qc_prep = ata_sff_dumb_qc_prep,
20340diff -urNp linux-2.6.32.11/drivers/ata/pata_atp867x.c linux-2.6.32.11/drivers/ata/pata_atp867x.c 20540diff -urNp linux-2.6.32.12/drivers/ata/pata_atp867x.c linux-2.6.32.12/drivers/ata/pata_atp867x.c
20341--- linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400 20541--- linux-2.6.32.12/drivers/ata/pata_atp867x.c 2010-03-15 11:52:04.000000000 -0400
20342+++ linux-2.6.32.11/drivers/ata/pata_atp867x.c 2010-04-04 20:46:41.549452547 -0400 20542+++ linux-2.6.32.12/drivers/ata/pata_atp867x.c 2010-04-04 20:46:41.549452547 -0400
20343@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x 20543@@ -274,7 +274,7 @@ static struct scsi_host_template atp867x
20344 ATA_BMDMA_SHT(DRV_NAME), 20544 ATA_BMDMA_SHT(DRV_NAME),
20345 }; 20545 };
@@ -20349,9 +20549,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_atp867x.c linux-2.6.32.11/drivers/at
20349 .inherits = &ata_bmdma_port_ops, 20549 .inherits = &ata_bmdma_port_ops,
20350 .cable_detect = atp867x_cable_detect, 20550 .cable_detect = atp867x_cable_detect,
20351 .set_piomode = atp867x_set_piomode, 20551 .set_piomode = atp867x_set_piomode,
20352diff -urNp linux-2.6.32.11/drivers/ata/pata_bf54x.c linux-2.6.32.11/drivers/ata/pata_bf54x.c 20552diff -urNp linux-2.6.32.12/drivers/ata/pata_bf54x.c linux-2.6.32.12/drivers/ata/pata_bf54x.c
20353--- linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400 20553--- linux-2.6.32.12/drivers/ata/pata_bf54x.c 2010-03-15 11:52:04.000000000 -0400
20354+++ linux-2.6.32.11/drivers/ata/pata_bf54x.c 2010-04-04 20:46:41.549452547 -0400 20554+++ linux-2.6.32.12/drivers/ata/pata_bf54x.c 2010-04-04 20:46:41.549452547 -0400
20355@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh 20555@@ -1464,7 +1464,7 @@ static struct scsi_host_template bfin_sh
20356 .dma_boundary = ATA_DMA_BOUNDARY, 20556 .dma_boundary = ATA_DMA_BOUNDARY,
20357 }; 20557 };
@@ -20361,9 +20561,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_bf54x.c linux-2.6.32.11/drivers/ata/
20361 .inherits = &ata_sff_port_ops, 20561 .inherits = &ata_sff_port_ops,
20362 20562
20363 .set_piomode = bfin_set_piomode, 20563 .set_piomode = bfin_set_piomode,
20364diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd640.c linux-2.6.32.11/drivers/ata/pata_cmd640.c 20564diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd640.c linux-2.6.32.12/drivers/ata/pata_cmd640.c
20365--- linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400 20565--- linux-2.6.32.12/drivers/ata/pata_cmd640.c 2010-03-15 11:52:04.000000000 -0400
20366+++ linux-2.6.32.11/drivers/ata/pata_cmd640.c 2010-04-04 20:46:41.549452547 -0400 20566+++ linux-2.6.32.12/drivers/ata/pata_cmd640.c 2010-04-04 20:46:41.549452547 -0400
20367@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_ 20567@@ -168,7 +168,7 @@ static struct scsi_host_template cmd640_
20368 ATA_BMDMA_SHT(DRV_NAME), 20568 ATA_BMDMA_SHT(DRV_NAME),
20369 }; 20569 };
@@ -20373,9 +20573,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd640.c linux-2.6.32.11/drivers/ata
20373 .inherits = &ata_bmdma_port_ops, 20573 .inherits = &ata_bmdma_port_ops,
20374 /* In theory xfer_noirq is not needed once we kill the prefetcher */ 20574 /* In theory xfer_noirq is not needed once we kill the prefetcher */
20375 .sff_data_xfer = ata_sff_data_xfer_noirq, 20575 .sff_data_xfer = ata_sff_data_xfer_noirq,
20376diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd64x.c linux-2.6.32.11/drivers/ata/pata_cmd64x.c 20576diff -urNp linux-2.6.32.12/drivers/ata/pata_cmd64x.c linux-2.6.32.12/drivers/ata/pata_cmd64x.c
20377--- linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400 20577--- linux-2.6.32.12/drivers/ata/pata_cmd64x.c 2010-03-15 11:52:04.000000000 -0400
20378+++ linux-2.6.32.11/drivers/ata/pata_cmd64x.c 2010-04-04 20:46:41.549452547 -0400 20578+++ linux-2.6.32.12/drivers/ata/pata_cmd64x.c 2010-04-04 20:46:41.549452547 -0400
20379@@ -275,18 +275,18 @@ static const struct ata_port_operations 20579@@ -275,18 +275,18 @@ static const struct ata_port_operations
20380 .set_dmamode = cmd64x_set_dmamode, 20580 .set_dmamode = cmd64x_set_dmamode,
20381 }; 20581 };
@@ -20398,9 +20598,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cmd64x.c linux-2.6.32.11/drivers/ata
20398 .inherits = &cmd64x_base_ops, 20598 .inherits = &cmd64x_base_ops,
20399 .bmdma_stop = cmd648_bmdma_stop, 20599 .bmdma_stop = cmd648_bmdma_stop,
20400 .cable_detect = cmd648_cable_detect, 20600 .cable_detect = cmd648_cable_detect,
20401diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5520.c linux-2.6.32.11/drivers/ata/pata_cs5520.c 20601diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5520.c linux-2.6.32.12/drivers/ata/pata_cs5520.c
20402--- linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400 20602--- linux-2.6.32.12/drivers/ata/pata_cs5520.c 2010-03-15 11:52:04.000000000 -0400
20403+++ linux-2.6.32.11/drivers/ata/pata_cs5520.c 2010-04-04 20:46:41.549452547 -0400 20603+++ linux-2.6.32.12/drivers/ata/pata_cs5520.c 2010-04-04 20:46:41.549452547 -0400
20404@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_ 20604@@ -144,7 +144,7 @@ static struct scsi_host_template cs5520_
20405 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20605 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20406 }; 20606 };
@@ -20410,9 +20610,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5520.c linux-2.6.32.11/drivers/ata
20410 .inherits = &ata_bmdma_port_ops, 20610 .inherits = &ata_bmdma_port_ops,
20411 .qc_prep = ata_sff_dumb_qc_prep, 20611 .qc_prep = ata_sff_dumb_qc_prep,
20412 .cable_detect = ata_cable_40wire, 20612 .cable_detect = ata_cable_40wire,
20413diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5530.c linux-2.6.32.11/drivers/ata/pata_cs5530.c 20613diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5530.c linux-2.6.32.12/drivers/ata/pata_cs5530.c
20414--- linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400 20614--- linux-2.6.32.12/drivers/ata/pata_cs5530.c 2010-03-15 11:52:04.000000000 -0400
20415+++ linux-2.6.32.11/drivers/ata/pata_cs5530.c 2010-04-04 20:46:41.549452547 -0400 20615+++ linux-2.6.32.12/drivers/ata/pata_cs5530.c 2010-04-04 20:46:41.549452547 -0400
20416@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_ 20616@@ -164,7 +164,7 @@ static struct scsi_host_template cs5530_
20417 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 20617 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
20418 }; 20618 };
@@ -20422,9 +20622,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5530.c linux-2.6.32.11/drivers/ata
20422 .inherits = &ata_bmdma_port_ops, 20622 .inherits = &ata_bmdma_port_ops,
20423 20623
20424 .qc_prep = ata_sff_dumb_qc_prep, 20624 .qc_prep = ata_sff_dumb_qc_prep,
20425diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5535.c linux-2.6.32.11/drivers/ata/pata_cs5535.c 20625diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5535.c linux-2.6.32.12/drivers/ata/pata_cs5535.c
20426--- linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400 20626--- linux-2.6.32.12/drivers/ata/pata_cs5535.c 2010-03-15 11:52:04.000000000 -0400
20427+++ linux-2.6.32.11/drivers/ata/pata_cs5535.c 2010-04-04 20:46:41.549452547 -0400 20627+++ linux-2.6.32.12/drivers/ata/pata_cs5535.c 2010-04-04 20:46:41.549452547 -0400
20428@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_ 20628@@ -160,7 +160,7 @@ static struct scsi_host_template cs5535_
20429 ATA_BMDMA_SHT(DRV_NAME), 20629 ATA_BMDMA_SHT(DRV_NAME),
20430 }; 20630 };
@@ -20434,9 +20634,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5535.c linux-2.6.32.11/drivers/ata
20434 .inherits = &ata_bmdma_port_ops, 20634 .inherits = &ata_bmdma_port_ops,
20435 .cable_detect = cs5535_cable_detect, 20635 .cable_detect = cs5535_cable_detect,
20436 .set_piomode = cs5535_set_piomode, 20636 .set_piomode = cs5535_set_piomode,
20437diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5536.c linux-2.6.32.11/drivers/ata/pata_cs5536.c 20637diff -urNp linux-2.6.32.12/drivers/ata/pata_cs5536.c linux-2.6.32.12/drivers/ata/pata_cs5536.c
20438--- linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400 20638--- linux-2.6.32.12/drivers/ata/pata_cs5536.c 2010-03-15 11:52:04.000000000 -0400
20439+++ linux-2.6.32.11/drivers/ata/pata_cs5536.c 2010-04-04 20:46:41.549452547 -0400 20639+++ linux-2.6.32.12/drivers/ata/pata_cs5536.c 2010-04-04 20:46:41.549452547 -0400
20440@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_ 20640@@ -223,7 +223,7 @@ static struct scsi_host_template cs5536_
20441 ATA_BMDMA_SHT(DRV_NAME), 20641 ATA_BMDMA_SHT(DRV_NAME),
20442 }; 20642 };
@@ -20446,9 +20646,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cs5536.c linux-2.6.32.11/drivers/ata
20446 .inherits = &ata_bmdma_port_ops, 20646 .inherits = &ata_bmdma_port_ops,
20447 .cable_detect = cs5536_cable_detect, 20647 .cable_detect = cs5536_cable_detect,
20448 .set_piomode = cs5536_set_piomode, 20648 .set_piomode = cs5536_set_piomode,
20449diff -urNp linux-2.6.32.11/drivers/ata/pata_cypress.c linux-2.6.32.11/drivers/ata/pata_cypress.c 20649diff -urNp linux-2.6.32.12/drivers/ata/pata_cypress.c linux-2.6.32.12/drivers/ata/pata_cypress.c
20450--- linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400 20650--- linux-2.6.32.12/drivers/ata/pata_cypress.c 2010-03-15 11:52:04.000000000 -0400
20451+++ linux-2.6.32.11/drivers/ata/pata_cypress.c 2010-04-04 20:46:41.549452547 -0400 20651+++ linux-2.6.32.12/drivers/ata/pata_cypress.c 2010-04-04 20:46:41.549452547 -0400
20452@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69 20652@@ -113,7 +113,7 @@ static struct scsi_host_template cy82c69
20453 ATA_BMDMA_SHT(DRV_NAME), 20653 ATA_BMDMA_SHT(DRV_NAME),
20454 }; 20654 };
@@ -20458,9 +20658,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_cypress.c linux-2.6.32.11/drivers/at
20458 .inherits = &ata_bmdma_port_ops, 20658 .inherits = &ata_bmdma_port_ops,
20459 .cable_detect = ata_cable_40wire, 20659 .cable_detect = ata_cable_40wire,
20460 .set_piomode = cy82c693_set_piomode, 20660 .set_piomode = cy82c693_set_piomode,
20461diff -urNp linux-2.6.32.11/drivers/ata/pata_efar.c linux-2.6.32.11/drivers/ata/pata_efar.c 20661diff -urNp linux-2.6.32.12/drivers/ata/pata_efar.c linux-2.6.32.12/drivers/ata/pata_efar.c
20462--- linux-2.6.32.11/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400 20662--- linux-2.6.32.12/drivers/ata/pata_efar.c 2010-03-15 11:52:04.000000000 -0400
20463+++ linux-2.6.32.11/drivers/ata/pata_efar.c 2010-04-04 20:46:41.549452547 -0400 20663+++ linux-2.6.32.12/drivers/ata/pata_efar.c 2010-04-04 20:46:41.549452547 -0400
20464@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh 20664@@ -222,7 +222,7 @@ static struct scsi_host_template efar_sh
20465 ATA_BMDMA_SHT(DRV_NAME), 20665 ATA_BMDMA_SHT(DRV_NAME),
20466 }; 20666 };
@@ -20470,9 +20670,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_efar.c linux-2.6.32.11/drivers/ata/p
20470 .inherits = &ata_bmdma_port_ops, 20670 .inherits = &ata_bmdma_port_ops,
20471 .cable_detect = efar_cable_detect, 20671 .cable_detect = efar_cable_detect,
20472 .set_piomode = efar_set_piomode, 20672 .set_piomode = efar_set_piomode,
20473diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt366.c linux-2.6.32.11/drivers/ata/pata_hpt366.c 20673diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt366.c linux-2.6.32.12/drivers/ata/pata_hpt366.c
20474--- linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400 20674--- linux-2.6.32.12/drivers/ata/pata_hpt366.c 2010-03-15 11:52:04.000000000 -0400
20475+++ linux-2.6.32.11/drivers/ata/pata_hpt366.c 2010-04-04 20:46:41.549452547 -0400 20675+++ linux-2.6.32.12/drivers/ata/pata_hpt366.c 2010-04-04 20:46:41.549452547 -0400
20476@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_ 20676@@ -282,7 +282,7 @@ static struct scsi_host_template hpt36x_
20477 * Configuration for HPT366/68 20677 * Configuration for HPT366/68
20478 */ 20678 */
@@ -20482,9 +20682,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt366.c linux-2.6.32.11/drivers/ata
20482 .inherits = &ata_bmdma_port_ops, 20682 .inherits = &ata_bmdma_port_ops,
20483 .cable_detect = hpt36x_cable_detect, 20683 .cable_detect = hpt36x_cable_detect,
20484 .mode_filter = hpt366_filter, 20684 .mode_filter = hpt366_filter,
20485diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt37x.c linux-2.6.32.11/drivers/ata/pata_hpt37x.c 20685diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt37x.c linux-2.6.32.12/drivers/ata/pata_hpt37x.c
20486--- linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400 20686--- linux-2.6.32.12/drivers/ata/pata_hpt37x.c 2010-03-15 11:52:04.000000000 -0400
20487+++ linux-2.6.32.11/drivers/ata/pata_hpt37x.c 2010-04-04 20:46:41.552552724 -0400 20687+++ linux-2.6.32.12/drivers/ata/pata_hpt37x.c 2010-04-04 20:46:41.552552724 -0400
20488@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_ 20688@@ -576,7 +576,7 @@ static struct scsi_host_template hpt37x_
20489 * Configuration for HPT370 20689 * Configuration for HPT370
20490 */ 20690 */
@@ -20521,9 +20721,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt37x.c linux-2.6.32.11/drivers/ata
20521 .inherits = &hpt372_port_ops, 20721 .inherits = &hpt372_port_ops,
20522 .prereset = hpt374_fn1_pre_reset, 20722 .prereset = hpt374_fn1_pre_reset,
20523 }; 20723 };
20524diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 20724diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c
20525--- linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400 20725--- linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c 2010-03-15 11:52:04.000000000 -0400
20526+++ linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c 2010-04-04 20:46:41.552552724 -0400 20726+++ linux-2.6.32.12/drivers/ata/pata_hpt3x2n.c 2010-04-04 20:46:41.552552724 -0400
20527@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n 20727@@ -337,7 +337,7 @@ static struct scsi_host_template hpt3x2n
20528 * Configuration for HPT3x2n. 20728 * Configuration for HPT3x2n.
20529 */ 20729 */
@@ -20533,9 +20733,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x2n.c linux-2.6.32.11/drivers/at
20533 .inherits = &ata_bmdma_port_ops, 20733 .inherits = &ata_bmdma_port_ops,
20534 20734
20535 .bmdma_stop = hpt3x2n_bmdma_stop, 20735 .bmdma_stop = hpt3x2n_bmdma_stop,
20536diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x3.c linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 20736diff -urNp linux-2.6.32.12/drivers/ata/pata_hpt3x3.c linux-2.6.32.12/drivers/ata/pata_hpt3x3.c
20537--- linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400 20737--- linux-2.6.32.12/drivers/ata/pata_hpt3x3.c 2010-03-15 11:52:04.000000000 -0400
20538+++ linux-2.6.32.11/drivers/ata/pata_hpt3x3.c 2010-04-04 20:46:41.552552724 -0400 20738+++ linux-2.6.32.12/drivers/ata/pata_hpt3x3.c 2010-04-04 20:46:41.552552724 -0400
20539@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_ 20739@@ -141,7 +141,7 @@ static struct scsi_host_template hpt3x3_
20540 ATA_BMDMA_SHT(DRV_NAME), 20740 ATA_BMDMA_SHT(DRV_NAME),
20541 }; 20741 };
@@ -20545,9 +20745,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_hpt3x3.c linux-2.6.32.11/drivers/ata
20545 .inherits = &ata_bmdma_port_ops, 20745 .inherits = &ata_bmdma_port_ops,
20546 .cable_detect = ata_cable_40wire, 20746 .cable_detect = ata_cable_40wire,
20547 .set_piomode = hpt3x3_set_piomode, 20747 .set_piomode = hpt3x3_set_piomode,
20548diff -urNp linux-2.6.32.11/drivers/ata/pata_icside.c linux-2.6.32.11/drivers/ata/pata_icside.c 20748diff -urNp linux-2.6.32.12/drivers/ata/pata_icside.c linux-2.6.32.12/drivers/ata/pata_icside.c
20549--- linux-2.6.32.11/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400 20749--- linux-2.6.32.12/drivers/ata/pata_icside.c 2010-03-15 11:52:04.000000000 -0400
20550+++ linux-2.6.32.11/drivers/ata/pata_icside.c 2010-04-04 20:46:41.552552724 -0400 20750+++ linux-2.6.32.12/drivers/ata/pata_icside.c 2010-04-04 20:46:41.552552724 -0400
20551@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct 20751@@ -319,7 +319,7 @@ static void pata_icside_postreset(struct
20552 } 20752 }
20553 } 20753 }
@@ -20557,9 +20757,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_icside.c linux-2.6.32.11/drivers/ata
20557 .inherits = &ata_sff_port_ops, 20757 .inherits = &ata_sff_port_ops,
20558 /* no need to build any PRD tables for DMA */ 20758 /* no need to build any PRD tables for DMA */
20559 .qc_prep = ata_noop_qc_prep, 20759 .qc_prep = ata_noop_qc_prep,
20560diff -urNp linux-2.6.32.11/drivers/ata/pata_isapnp.c linux-2.6.32.11/drivers/ata/pata_isapnp.c 20760diff -urNp linux-2.6.32.12/drivers/ata/pata_isapnp.c linux-2.6.32.12/drivers/ata/pata_isapnp.c
20561--- linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400 20761--- linux-2.6.32.12/drivers/ata/pata_isapnp.c 2010-03-15 11:52:04.000000000 -0400
20562+++ linux-2.6.32.11/drivers/ata/pata_isapnp.c 2010-04-04 20:46:41.552552724 -0400 20762+++ linux-2.6.32.12/drivers/ata/pata_isapnp.c 2010-04-04 20:46:41.552552724 -0400
20563@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_ 20763@@ -23,12 +23,12 @@ static struct scsi_host_template isapnp_
20564 ATA_PIO_SHT(DRV_NAME), 20764 ATA_PIO_SHT(DRV_NAME),
20565 }; 20765 };
@@ -20575,9 +20775,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_isapnp.c linux-2.6.32.11/drivers/ata
20575 .inherits = &ata_sff_port_ops, 20775 .inherits = &ata_sff_port_ops,
20576 .cable_detect = ata_cable_40wire, 20776 .cable_detect = ata_cable_40wire,
20577 /* No altstatus so we don't want to use the lost interrupt poll */ 20777 /* No altstatus so we don't want to use the lost interrupt poll */
20578diff -urNp linux-2.6.32.11/drivers/ata/pata_it8213.c linux-2.6.32.11/drivers/ata/pata_it8213.c 20778diff -urNp linux-2.6.32.12/drivers/ata/pata_it8213.c linux-2.6.32.12/drivers/ata/pata_it8213.c
20579--- linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400 20779--- linux-2.6.32.12/drivers/ata/pata_it8213.c 2010-03-15 11:52:04.000000000 -0400
20580+++ linux-2.6.32.11/drivers/ata/pata_it8213.c 2010-04-04 20:46:41.552552724 -0400 20780+++ linux-2.6.32.12/drivers/ata/pata_it8213.c 2010-04-04 20:46:41.552552724 -0400
20581@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_ 20781@@ -234,7 +234,7 @@ static struct scsi_host_template it8213_
20582 }; 20782 };
20583 20783
@@ -20587,9 +20787,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_it8213.c linux-2.6.32.11/drivers/ata
20587 .inherits = &ata_bmdma_port_ops, 20787 .inherits = &ata_bmdma_port_ops,
20588 .cable_detect = it8213_cable_detect, 20788 .cable_detect = it8213_cable_detect,
20589 .set_piomode = it8213_set_piomode, 20789 .set_piomode = it8213_set_piomode,
20590diff -urNp linux-2.6.32.11/drivers/ata/pata_it821x.c linux-2.6.32.11/drivers/ata/pata_it821x.c 20790diff -urNp linux-2.6.32.12/drivers/ata/pata_it821x.c linux-2.6.32.12/drivers/ata/pata_it821x.c
20591--- linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400 20791--- linux-2.6.32.12/drivers/ata/pata_it821x.c 2010-03-15 11:52:04.000000000 -0400
20592+++ linux-2.6.32.11/drivers/ata/pata_it821x.c 2010-04-04 20:46:41.552552724 -0400 20792+++ linux-2.6.32.12/drivers/ata/pata_it821x.c 2010-04-04 20:46:41.552552724 -0400
20593@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_ 20793@@ -800,7 +800,7 @@ static struct scsi_host_template it821x_
20594 ATA_BMDMA_SHT(DRV_NAME), 20794 ATA_BMDMA_SHT(DRV_NAME),
20595 }; 20795 };
@@ -20617,9 +20817,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_it821x.c linux-2.6.32.11/drivers/ata
20617 .inherits = &ata_bmdma_port_ops, 20817 .inherits = &ata_bmdma_port_ops,
20618 20818
20619 .check_atapi_dma= it821x_check_atapi_dma, 20819 .check_atapi_dma= it821x_check_atapi_dma,
20620diff -urNp linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 20820diff -urNp linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c
20621--- linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400 20821--- linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c 2010-03-15 11:52:04.000000000 -0400
20622+++ linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c 2010-04-04 20:46:41.552552724 -0400 20822+++ linux-2.6.32.12/drivers/ata/pata_ixp4xx_cf.c 2010-04-04 20:46:41.552552724 -0400
20623@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_ 20823@@ -89,7 +89,7 @@ static struct scsi_host_template ixp4xx_
20624 ATA_PIO_SHT(DRV_NAME), 20824 ATA_PIO_SHT(DRV_NAME),
20625 }; 20825 };
@@ -20629,9 +20829,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ixp4xx_cf.c linux-2.6.32.11/drivers/
20629 .inherits = &ata_sff_port_ops, 20829 .inherits = &ata_sff_port_ops,
20630 .sff_data_xfer = ixp4xx_mmio_data_xfer, 20830 .sff_data_xfer = ixp4xx_mmio_data_xfer,
20631 .cable_detect = ata_cable_40wire, 20831 .cable_detect = ata_cable_40wire,
20632diff -urNp linux-2.6.32.11/drivers/ata/pata_jmicron.c linux-2.6.32.11/drivers/ata/pata_jmicron.c 20832diff -urNp linux-2.6.32.12/drivers/ata/pata_jmicron.c linux-2.6.32.12/drivers/ata/pata_jmicron.c
20633--- linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400 20833--- linux-2.6.32.12/drivers/ata/pata_jmicron.c 2010-03-15 11:52:04.000000000 -0400
20634+++ linux-2.6.32.11/drivers/ata/pata_jmicron.c 2010-04-04 20:46:41.552552724 -0400 20834+++ linux-2.6.32.12/drivers/ata/pata_jmicron.c 2010-04-04 20:46:41.552552724 -0400
20635@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron 20835@@ -111,7 +111,7 @@ static struct scsi_host_template jmicron
20636 ATA_BMDMA_SHT(DRV_NAME), 20836 ATA_BMDMA_SHT(DRV_NAME),
20637 }; 20837 };
@@ -20641,9 +20841,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_jmicron.c linux-2.6.32.11/drivers/at
20641 .inherits = &ata_bmdma_port_ops, 20841 .inherits = &ata_bmdma_port_ops,
20642 .prereset = jmicron_pre_reset, 20842 .prereset = jmicron_pre_reset,
20643 }; 20843 };
20644diff -urNp linux-2.6.32.11/drivers/ata/pata_legacy.c linux-2.6.32.11/drivers/ata/pata_legacy.c 20844diff -urNp linux-2.6.32.12/drivers/ata/pata_legacy.c linux-2.6.32.12/drivers/ata/pata_legacy.c
20645--- linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400 20845--- linux-2.6.32.12/drivers/ata/pata_legacy.c 2010-03-15 11:52:04.000000000 -0400
20646+++ linux-2.6.32.11/drivers/ata/pata_legacy.c 2010-04-04 20:46:41.552552724 -0400 20846+++ linux-2.6.32.12/drivers/ata/pata_legacy.c 2010-04-04 20:46:41.552552724 -0400
20647@@ -106,7 +106,7 @@ struct legacy_probe { 20847@@ -106,7 +106,7 @@ struct legacy_probe {
20648 20848
20649 struct legacy_controller { 20849 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
20755 struct legacy_data *ld = &legacy_data[probe->slot]; 20955 struct legacy_data *ld = &legacy_data[probe->slot];
20756 struct ata_host *host = NULL; 20956 struct ata_host *host = NULL;
20757 struct ata_port *ap; 20957 struct ata_port *ap;
20758diff -urNp linux-2.6.32.11/drivers/ata/pata_marvell.c linux-2.6.32.11/drivers/ata/pata_marvell.c 20958diff -urNp linux-2.6.32.12/drivers/ata/pata_marvell.c linux-2.6.32.12/drivers/ata/pata_marvell.c
20759--- linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400 20959--- linux-2.6.32.12/drivers/ata/pata_marvell.c 2010-03-15 11:52:04.000000000 -0400
20760+++ linux-2.6.32.11/drivers/ata/pata_marvell.c 2010-04-04 20:46:41.552552724 -0400 20960+++ linux-2.6.32.12/drivers/ata/pata_marvell.c 2010-04-04 20:46:41.552552724 -0400
20761@@ -100,7 +100,7 @@ static struct scsi_host_template marvell 20961@@ -100,7 +100,7 @@ static struct scsi_host_template marvell
20762 ATA_BMDMA_SHT(DRV_NAME), 20962 ATA_BMDMA_SHT(DRV_NAME),
20763 }; 20963 };
@@ -20767,9 +20967,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_marvell.c linux-2.6.32.11/drivers/at
20767 .inherits = &ata_bmdma_port_ops, 20967 .inherits = &ata_bmdma_port_ops,
20768 .cable_detect = marvell_cable_detect, 20968 .cable_detect = marvell_cable_detect,
20769 .prereset = marvell_pre_reset, 20969 .prereset = marvell_pre_reset,
20770diff -urNp linux-2.6.32.11/drivers/ata/pata_mpc52xx.c linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 20970diff -urNp linux-2.6.32.12/drivers/ata/pata_mpc52xx.c linux-2.6.32.12/drivers/ata/pata_mpc52xx.c
20771--- linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400 20971--- linux-2.6.32.12/drivers/ata/pata_mpc52xx.c 2010-03-15 11:52:04.000000000 -0400
20772+++ linux-2.6.32.11/drivers/ata/pata_mpc52xx.c 2010-04-04 20:46:41.552552724 -0400 20972+++ linux-2.6.32.12/drivers/ata/pata_mpc52xx.c 2010-04-04 20:46:41.552552724 -0400
20773@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx 20973@@ -609,7 +609,7 @@ static struct scsi_host_template mpc52xx
20774 ATA_PIO_SHT(DRV_NAME), 20974 ATA_PIO_SHT(DRV_NAME),
20775 }; 20975 };
@@ -20779,9 +20979,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_mpc52xx.c linux-2.6.32.11/drivers/at
20779 .inherits = &ata_sff_port_ops, 20979 .inherits = &ata_sff_port_ops,
20780 .sff_dev_select = mpc52xx_ata_dev_select, 20980 .sff_dev_select = mpc52xx_ata_dev_select,
20781 .set_piomode = mpc52xx_ata_set_piomode, 20981 .set_piomode = mpc52xx_ata_set_piomode,
20782diff -urNp linux-2.6.32.11/drivers/ata/pata_mpiix.c linux-2.6.32.11/drivers/ata/pata_mpiix.c 20982diff -urNp linux-2.6.32.12/drivers/ata/pata_mpiix.c linux-2.6.32.12/drivers/ata/pata_mpiix.c
20783--- linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400 20983--- linux-2.6.32.12/drivers/ata/pata_mpiix.c 2010-03-15 11:52:04.000000000 -0400
20784+++ linux-2.6.32.11/drivers/ata/pata_mpiix.c 2010-04-04 20:46:41.552552724 -0400 20984+++ linux-2.6.32.12/drivers/ata/pata_mpiix.c 2010-04-04 20:46:41.552552724 -0400
20785@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s 20985@@ -140,7 +140,7 @@ static struct scsi_host_template mpiix_s
20786 ATA_PIO_SHT(DRV_NAME), 20986 ATA_PIO_SHT(DRV_NAME),
20787 }; 20987 };
@@ -20791,9 +20991,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_mpiix.c linux-2.6.32.11/drivers/ata/
20791 .inherits = &ata_sff_port_ops, 20991 .inherits = &ata_sff_port_ops,
20792 .qc_issue = mpiix_qc_issue, 20992 .qc_issue = mpiix_qc_issue,
20793 .cable_detect = ata_cable_40wire, 20993 .cable_detect = ata_cable_40wire,
20794diff -urNp linux-2.6.32.11/drivers/ata/pata_netcell.c linux-2.6.32.11/drivers/ata/pata_netcell.c 20994diff -urNp linux-2.6.32.12/drivers/ata/pata_netcell.c linux-2.6.32.12/drivers/ata/pata_netcell.c
20795--- linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400 20995--- linux-2.6.32.12/drivers/ata/pata_netcell.c 2010-03-15 11:52:04.000000000 -0400
20796+++ linux-2.6.32.11/drivers/ata/pata_netcell.c 2010-04-04 20:46:41.552552724 -0400 20996+++ linux-2.6.32.12/drivers/ata/pata_netcell.c 2010-04-04 20:46:41.552552724 -0400
20797@@ -34,7 +34,7 @@ static struct scsi_host_template netcell 20997@@ -34,7 +34,7 @@ static struct scsi_host_template netcell
20798 ATA_BMDMA_SHT(DRV_NAME), 20998 ATA_BMDMA_SHT(DRV_NAME),
20799 }; 20999 };
@@ -20803,9 +21003,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_netcell.c linux-2.6.32.11/drivers/at
20803 .inherits = &ata_bmdma_port_ops, 21003 .inherits = &ata_bmdma_port_ops,
20804 .cable_detect = ata_cable_80wire, 21004 .cable_detect = ata_cable_80wire,
20805 .read_id = netcell_read_id, 21005 .read_id = netcell_read_id,
20806diff -urNp linux-2.6.32.11/drivers/ata/pata_ninja32.c linux-2.6.32.11/drivers/ata/pata_ninja32.c 21006diff -urNp linux-2.6.32.12/drivers/ata/pata_ninja32.c linux-2.6.32.12/drivers/ata/pata_ninja32.c
20807--- linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400 21007--- linux-2.6.32.12/drivers/ata/pata_ninja32.c 2010-03-15 11:52:04.000000000 -0400
20808+++ linux-2.6.32.11/drivers/ata/pata_ninja32.c 2010-04-04 20:46:41.552552724 -0400 21008+++ linux-2.6.32.12/drivers/ata/pata_ninja32.c 2010-04-04 20:46:41.552552724 -0400
20809@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32 21009@@ -81,7 +81,7 @@ static struct scsi_host_template ninja32
20810 ATA_BMDMA_SHT(DRV_NAME), 21010 ATA_BMDMA_SHT(DRV_NAME),
20811 }; 21011 };
@@ -20815,9 +21015,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ninja32.c linux-2.6.32.11/drivers/at
20815 .inherits = &ata_bmdma_port_ops, 21015 .inherits = &ata_bmdma_port_ops,
20816 .sff_dev_select = ninja32_dev_select, 21016 .sff_dev_select = ninja32_dev_select,
20817 .cable_detect = ata_cable_40wire, 21017 .cable_detect = ata_cable_40wire,
20818diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87410.c linux-2.6.32.11/drivers/ata/pata_ns87410.c 21018diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87410.c linux-2.6.32.12/drivers/ata/pata_ns87410.c
20819--- linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400 21019--- linux-2.6.32.12/drivers/ata/pata_ns87410.c 2010-03-15 11:52:04.000000000 -0400
20820+++ linux-2.6.32.11/drivers/ata/pata_ns87410.c 2010-04-04 20:46:41.552552724 -0400 21020+++ linux-2.6.32.12/drivers/ata/pata_ns87410.c 2010-04-04 20:46:41.552552724 -0400
20821@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410 21021@@ -132,7 +132,7 @@ static struct scsi_host_template ns87410
20822 ATA_PIO_SHT(DRV_NAME), 21022 ATA_PIO_SHT(DRV_NAME),
20823 }; 21023 };
@@ -20827,9 +21027,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87410.c linux-2.6.32.11/drivers/at
20827 .inherits = &ata_sff_port_ops, 21027 .inherits = &ata_sff_port_ops,
20828 .qc_issue = ns87410_qc_issue, 21028 .qc_issue = ns87410_qc_issue,
20829 .cable_detect = ata_cable_40wire, 21029 .cable_detect = ata_cable_40wire,
20830diff -urNp linux-2.6.32.11/drivers/ata/pata_ns87415.c linux-2.6.32.11/drivers/ata/pata_ns87415.c 21030diff -urNp linux-2.6.32.12/drivers/ata/pata_ns87415.c linux-2.6.32.12/drivers/ata/pata_ns87415.c
20831--- linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400 21031--- linux-2.6.32.12/drivers/ata/pata_ns87415.c 2010-03-15 11:52:04.000000000 -0400
20832+++ linux-2.6.32.11/drivers/ata/pata_ns87415.c 2010-04-04 20:46:41.552552724 -0400 21032+++ linux-2.6.32.12/drivers/ata/pata_ns87415.c 2010-04-04 20:46:41.552552724 -0400
20833@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at 21033@@ -299,7 +299,7 @@ static u8 ns87560_bmdma_status(struct at
20834 } 21034 }
20835 #endif /* 87560 SuperIO Support */ 21035 #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
20848 .inherits = &ns87415_pata_ops, 21048 .inherits = &ns87415_pata_ops,
20849 .sff_tf_read = ns87560_tf_read, 21049 .sff_tf_read = ns87560_tf_read,
20850 .sff_check_status = ns87560_check_status, 21050 .sff_check_status = ns87560_check_status,
20851diff -urNp linux-2.6.32.11/drivers/ata/pata_octeon_cf.c linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 21051diff -urNp linux-2.6.32.12/drivers/ata/pata_octeon_cf.c linux-2.6.32.12/drivers/ata/pata_octeon_cf.c
20852--- linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400 21052--- linux-2.6.32.12/drivers/ata/pata_octeon_cf.c 2010-03-15 11:52:04.000000000 -0400
20853+++ linux-2.6.32.11/drivers/ata/pata_octeon_cf.c 2010-04-04 20:46:41.552552724 -0400 21053+++ linux-2.6.32.12/drivers/ata/pata_octeon_cf.c 2010-04-04 20:46:41.552552724 -0400
20854@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s 21054@@ -801,6 +801,7 @@ static unsigned int octeon_cf_qc_issue(s
20855 return 0; 21055 return 0;
20856 } 21056 }
@@ -20859,9 +21059,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_octeon_cf.c linux-2.6.32.11/drivers/
20859 static struct ata_port_operations octeon_cf_ops = { 21059 static struct ata_port_operations octeon_cf_ops = {
20860 .inherits = &ata_sff_port_ops, 21060 .inherits = &ata_sff_port_ops,
20861 .check_atapi_dma = octeon_cf_check_atapi_dma, 21061 .check_atapi_dma = octeon_cf_check_atapi_dma,
20862diff -urNp linux-2.6.32.11/drivers/ata/pata_oldpiix.c linux-2.6.32.11/drivers/ata/pata_oldpiix.c 21062diff -urNp linux-2.6.32.12/drivers/ata/pata_oldpiix.c linux-2.6.32.12/drivers/ata/pata_oldpiix.c
20863--- linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400 21063--- linux-2.6.32.12/drivers/ata/pata_oldpiix.c 2010-03-15 11:52:04.000000000 -0400
20864+++ linux-2.6.32.11/drivers/ata/pata_oldpiix.c 2010-04-04 20:46:41.552552724 -0400 21064+++ linux-2.6.32.12/drivers/ata/pata_oldpiix.c 2010-04-04 20:46:41.552552724 -0400
20865@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix 21065@@ -208,7 +208,7 @@ static struct scsi_host_template oldpiix
20866 ATA_BMDMA_SHT(DRV_NAME), 21066 ATA_BMDMA_SHT(DRV_NAME),
20867 }; 21067 };
@@ -20871,9 +21071,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_oldpiix.c linux-2.6.32.11/drivers/at
20871 .inherits = &ata_bmdma_port_ops, 21071 .inherits = &ata_bmdma_port_ops,
20872 .qc_issue = oldpiix_qc_issue, 21072 .qc_issue = oldpiix_qc_issue,
20873 .cable_detect = ata_cable_40wire, 21073 .cable_detect = ata_cable_40wire,
20874diff -urNp linux-2.6.32.11/drivers/ata/pata_opti.c linux-2.6.32.11/drivers/ata/pata_opti.c 21074diff -urNp linux-2.6.32.12/drivers/ata/pata_opti.c linux-2.6.32.12/drivers/ata/pata_opti.c
20875--- linux-2.6.32.11/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400 21075--- linux-2.6.32.12/drivers/ata/pata_opti.c 2010-03-15 11:52:04.000000000 -0400
20876+++ linux-2.6.32.11/drivers/ata/pata_opti.c 2010-04-04 20:46:41.552552724 -0400 21076+++ linux-2.6.32.12/drivers/ata/pata_opti.c 2010-04-04 20:46:41.552552724 -0400
20877@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh 21077@@ -152,7 +152,7 @@ static struct scsi_host_template opti_sh
20878 ATA_PIO_SHT(DRV_NAME), 21078 ATA_PIO_SHT(DRV_NAME),
20879 }; 21079 };
@@ -20883,9 +21083,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_opti.c linux-2.6.32.11/drivers/ata/p
20883 .inherits = &ata_sff_port_ops, 21083 .inherits = &ata_sff_port_ops,
20884 .cable_detect = ata_cable_40wire, 21084 .cable_detect = ata_cable_40wire,
20885 .set_piomode = opti_set_piomode, 21085 .set_piomode = opti_set_piomode,
20886diff -urNp linux-2.6.32.11/drivers/ata/pata_optidma.c linux-2.6.32.11/drivers/ata/pata_optidma.c 21086diff -urNp linux-2.6.32.12/drivers/ata/pata_optidma.c linux-2.6.32.12/drivers/ata/pata_optidma.c
20887--- linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400 21087--- linux-2.6.32.12/drivers/ata/pata_optidma.c 2010-03-15 11:52:04.000000000 -0400
20888+++ linux-2.6.32.11/drivers/ata/pata_optidma.c 2010-04-04 20:46:41.552552724 -0400 21088+++ linux-2.6.32.12/drivers/ata/pata_optidma.c 2010-04-04 20:46:41.552552724 -0400
20889@@ -337,7 +337,7 @@ static struct scsi_host_template optidma 21089@@ -337,7 +337,7 @@ static struct scsi_host_template optidma
20890 ATA_BMDMA_SHT(DRV_NAME), 21090 ATA_BMDMA_SHT(DRV_NAME),
20891 }; 21091 };
@@ -20904,9 +21104,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_optidma.c linux-2.6.32.11/drivers/at
20904 .inherits = &optidma_port_ops, 21104 .inherits = &optidma_port_ops,
20905 .set_piomode = optiplus_set_pio_mode, 21105 .set_piomode = optiplus_set_pio_mode,
20906 .set_dmamode = optiplus_set_dma_mode, 21106 .set_dmamode = optiplus_set_dma_mode,
20907diff -urNp linux-2.6.32.11/drivers/ata/pata_palmld.c linux-2.6.32.11/drivers/ata/pata_palmld.c 21107diff -urNp linux-2.6.32.12/drivers/ata/pata_palmld.c linux-2.6.32.12/drivers/ata/pata_palmld.c
20908--- linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400 21108--- linux-2.6.32.12/drivers/ata/pata_palmld.c 2010-03-15 11:52:04.000000000 -0400
20909+++ linux-2.6.32.11/drivers/ata/pata_palmld.c 2010-04-04 20:46:41.552552724 -0400 21109+++ linux-2.6.32.12/drivers/ata/pata_palmld.c 2010-04-04 20:46:41.552552724 -0400
20910@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_ 21110@@ -37,7 +37,7 @@ static struct scsi_host_template palmld_
20911 ATA_PIO_SHT(DRV_NAME), 21111 ATA_PIO_SHT(DRV_NAME),
20912 }; 21112 };
@@ -20916,9 +21116,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_palmld.c linux-2.6.32.11/drivers/ata
20916 .inherits = &ata_sff_port_ops, 21116 .inherits = &ata_sff_port_ops,
20917 .sff_data_xfer = ata_sff_data_xfer_noirq, 21117 .sff_data_xfer = ata_sff_data_xfer_noirq,
20918 .cable_detect = ata_cable_40wire, 21118 .cable_detect = ata_cable_40wire,
20919diff -urNp linux-2.6.32.11/drivers/ata/pata_pcmcia.c linux-2.6.32.11/drivers/ata/pata_pcmcia.c 21119diff -urNp linux-2.6.32.12/drivers/ata/pata_pcmcia.c linux-2.6.32.12/drivers/ata/pata_pcmcia.c
20920--- linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400 21120--- linux-2.6.32.12/drivers/ata/pata_pcmcia.c 2010-03-15 11:52:04.000000000 -0400
20921+++ linux-2.6.32.11/drivers/ata/pata_pcmcia.c 2010-04-04 20:46:41.552552724 -0400 21121+++ linux-2.6.32.12/drivers/ata/pata_pcmcia.c 2010-04-04 20:46:41.552552724 -0400
20922@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_ 21122@@ -162,14 +162,14 @@ static struct scsi_host_template pcmcia_
20923 ATA_PIO_SHT(DRV_NAME), 21123 ATA_PIO_SHT(DRV_NAME),
20924 }; 21124 };
@@ -20945,9 +21145,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pcmcia.c linux-2.6.32.11/drivers/ata
20945 21145
20946 info = kzalloc(sizeof(*info), GFP_KERNEL); 21146 info = kzalloc(sizeof(*info), GFP_KERNEL);
20947 if (info == NULL) 21147 if (info == NULL)
20948diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc2027x.c linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 21148diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc2027x.c linux-2.6.32.12/drivers/ata/pata_pdc2027x.c
20949--- linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400 21149--- linux-2.6.32.12/drivers/ata/pata_pdc2027x.c 2010-03-15 11:52:04.000000000 -0400
20950+++ linux-2.6.32.11/drivers/ata/pata_pdc2027x.c 2010-04-04 20:46:41.552552724 -0400 21150+++ linux-2.6.32.12/drivers/ata/pata_pdc2027x.c 2010-04-04 20:46:41.552552724 -0400
20951@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027 21151@@ -132,14 +132,14 @@ static struct scsi_host_template pdc2027
20952 ATA_BMDMA_SHT(DRV_NAME), 21152 ATA_BMDMA_SHT(DRV_NAME),
20953 }; 21153 };
@@ -20965,9 +21165,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc2027x.c linux-2.6.32.11/drivers/a
20965 .inherits = &pdc2027x_pata100_ops, 21165 .inherits = &pdc2027x_pata100_ops,
20966 .mode_filter = pdc2027x_mode_filter, 21166 .mode_filter = pdc2027x_mode_filter,
20967 .set_piomode = pdc2027x_set_piomode, 21167 .set_piomode = pdc2027x_set_piomode,
20968diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 21168diff -urNp linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c
20969--- linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400 21169--- linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c 2010-03-15 11:52:04.000000000 -0400
20970+++ linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c 2010-04-04 20:46:41.552552724 -0400 21170+++ linux-2.6.32.12/drivers/ata/pata_pdc202xx_old.c 2010-04-04 20:46:41.552552724 -0400
20971@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x 21171@@ -265,7 +265,7 @@ static struct scsi_host_template pdc202x
20972 ATA_BMDMA_SHT(DRV_NAME), 21172 ATA_BMDMA_SHT(DRV_NAME),
20973 }; 21173 };
@@ -20986,9 +21186,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_pdc202xx_old.c linux-2.6.32.11/drive
20986 .inherits = &pdc2024x_port_ops, 21186 .inherits = &pdc2024x_port_ops,
20987 21187
20988 .check_atapi_dma = pdc2026x_check_atapi_dma, 21188 .check_atapi_dma = pdc2026x_check_atapi_dma,
20989diff -urNp linux-2.6.32.11/drivers/ata/pata_platform.c linux-2.6.32.11/drivers/ata/pata_platform.c 21189diff -urNp linux-2.6.32.12/drivers/ata/pata_platform.c linux-2.6.32.12/drivers/ata/pata_platform.c
20990--- linux-2.6.32.11/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400 21190--- linux-2.6.32.12/drivers/ata/pata_platform.c 2010-03-15 11:52:04.000000000 -0400
20991+++ linux-2.6.32.11/drivers/ata/pata_platform.c 2010-04-04 20:46:41.552552724 -0400 21191+++ linux-2.6.32.12/drivers/ata/pata_platform.c 2010-04-04 20:46:41.552552724 -0400
20992@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl 21192@@ -48,7 +48,7 @@ static struct scsi_host_template pata_pl
20993 ATA_PIO_SHT(DRV_NAME), 21193 ATA_PIO_SHT(DRV_NAME),
20994 }; 21194 };
@@ -20998,9 +21198,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_platform.c linux-2.6.32.11/drivers/a
20998 .inherits = &ata_sff_port_ops, 21198 .inherits = &ata_sff_port_ops,
20999 .sff_data_xfer = ata_sff_data_xfer_noirq, 21199 .sff_data_xfer = ata_sff_data_xfer_noirq,
21000 .cable_detect = ata_cable_unknown, 21200 .cable_detect = ata_cable_unknown,
21001diff -urNp linux-2.6.32.11/drivers/ata/pata_qdi.c linux-2.6.32.11/drivers/ata/pata_qdi.c 21201diff -urNp linux-2.6.32.12/drivers/ata/pata_qdi.c linux-2.6.32.12/drivers/ata/pata_qdi.c
21002--- linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400 21202--- linux-2.6.32.12/drivers/ata/pata_qdi.c 2010-03-15 11:52:04.000000000 -0400
21003+++ linux-2.6.32.11/drivers/ata/pata_qdi.c 2010-04-04 20:46:41.552552724 -0400 21203+++ linux-2.6.32.12/drivers/ata/pata_qdi.c 2010-04-04 20:46:41.552552724 -0400
21004@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht 21204@@ -157,7 +157,7 @@ static struct scsi_host_template qdi_sht
21005 ATA_PIO_SHT(DRV_NAME), 21205 ATA_PIO_SHT(DRV_NAME),
21006 }; 21206 };
@@ -21019,9 +21219,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_qdi.c linux-2.6.32.11/drivers/ata/pa
21019 .inherits = &qdi6500_port_ops, 21219 .inherits = &qdi6500_port_ops,
21020 .set_piomode = qdi6580_set_piomode, 21220 .set_piomode = qdi6580_set_piomode,
21021 }; 21221 };
21022diff -urNp linux-2.6.32.11/drivers/ata/pata_radisys.c linux-2.6.32.11/drivers/ata/pata_radisys.c 21222diff -urNp linux-2.6.32.12/drivers/ata/pata_radisys.c linux-2.6.32.12/drivers/ata/pata_radisys.c
21023--- linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400 21223--- linux-2.6.32.12/drivers/ata/pata_radisys.c 2010-03-15 11:52:04.000000000 -0400
21024+++ linux-2.6.32.11/drivers/ata/pata_radisys.c 2010-04-04 20:46:41.556857392 -0400 21224+++ linux-2.6.32.12/drivers/ata/pata_radisys.c 2010-04-04 20:46:41.556857392 -0400
21025@@ -187,7 +187,7 @@ static struct scsi_host_template radisys 21225@@ -187,7 +187,7 @@ static struct scsi_host_template radisys
21026 ATA_BMDMA_SHT(DRV_NAME), 21226 ATA_BMDMA_SHT(DRV_NAME),
21027 }; 21227 };
@@ -21031,9 +21231,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_radisys.c linux-2.6.32.11/drivers/at
21031 .inherits = &ata_bmdma_port_ops, 21231 .inherits = &ata_bmdma_port_ops,
21032 .qc_issue = radisys_qc_issue, 21232 .qc_issue = radisys_qc_issue,
21033 .cable_detect = ata_cable_unknown, 21233 .cable_detect = ata_cable_unknown,
21034diff -urNp linux-2.6.32.11/drivers/ata/pata_rb532_cf.c linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 21234diff -urNp linux-2.6.32.12/drivers/ata/pata_rb532_cf.c linux-2.6.32.12/drivers/ata/pata_rb532_cf.c
21035--- linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400 21235--- linux-2.6.32.12/drivers/ata/pata_rb532_cf.c 2010-03-15 11:52:04.000000000 -0400
21036+++ linux-2.6.32.11/drivers/ata/pata_rb532_cf.c 2010-04-04 20:46:41.556857392 -0400 21236+++ linux-2.6.32.12/drivers/ata/pata_rb532_cf.c 2010-04-04 20:46:41.556857392 -0400
21037@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle 21237@@ -68,7 +68,7 @@ static irqreturn_t rb532_pata_irq_handle
21038 return IRQ_HANDLED; 21238 return IRQ_HANDLED;
21039 } 21239 }
@@ -21043,9 +21243,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rb532_cf.c linux-2.6.32.11/drivers/a
21043 .inherits = &ata_sff_port_ops, 21243 .inherits = &ata_sff_port_ops,
21044 .sff_data_xfer = ata_sff_data_xfer32, 21244 .sff_data_xfer = ata_sff_data_xfer32,
21045 }; 21245 };
21046diff -urNp linux-2.6.32.11/drivers/ata/pata_rdc.c linux-2.6.32.11/drivers/ata/pata_rdc.c 21246diff -urNp linux-2.6.32.12/drivers/ata/pata_rdc.c linux-2.6.32.12/drivers/ata/pata_rdc.c
21047--- linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400 21247--- linux-2.6.32.12/drivers/ata/pata_rdc.c 2010-03-15 11:52:04.000000000 -0400
21048+++ linux-2.6.32.11/drivers/ata/pata_rdc.c 2010-04-04 20:46:41.556857392 -0400 21248+++ linux-2.6.32.12/drivers/ata/pata_rdc.c 2010-04-04 20:46:41.556857392 -0400
21049@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p 21249@@ -272,7 +272,7 @@ static void rdc_set_dmamode(struct ata_p
21050 pci_write_config_byte(dev, 0x48, udma_enable); 21250 pci_write_config_byte(dev, 0x48, udma_enable);
21051 } 21251 }
@@ -21055,9 +21255,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rdc.c linux-2.6.32.11/drivers/ata/pa
21055 .inherits = &ata_bmdma32_port_ops, 21255 .inherits = &ata_bmdma32_port_ops,
21056 .cable_detect = rdc_pata_cable_detect, 21256 .cable_detect = rdc_pata_cable_detect,
21057 .set_piomode = rdc_set_piomode, 21257 .set_piomode = rdc_set_piomode,
21058diff -urNp linux-2.6.32.11/drivers/ata/pata_rz1000.c linux-2.6.32.11/drivers/ata/pata_rz1000.c 21258diff -urNp linux-2.6.32.12/drivers/ata/pata_rz1000.c linux-2.6.32.12/drivers/ata/pata_rz1000.c
21059--- linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400 21259--- linux-2.6.32.12/drivers/ata/pata_rz1000.c 2010-03-15 11:52:04.000000000 -0400
21060+++ linux-2.6.32.11/drivers/ata/pata_rz1000.c 2010-04-04 20:46:41.556857392 -0400 21260+++ linux-2.6.32.12/drivers/ata/pata_rz1000.c 2010-04-04 20:46:41.556857392 -0400
21061@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_ 21261@@ -54,7 +54,7 @@ static struct scsi_host_template rz1000_
21062 ATA_PIO_SHT(DRV_NAME), 21262 ATA_PIO_SHT(DRV_NAME),
21063 }; 21263 };
@@ -21067,9 +21267,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_rz1000.c linux-2.6.32.11/drivers/ata
21067 .inherits = &ata_sff_port_ops, 21267 .inherits = &ata_sff_port_ops,
21068 .cable_detect = ata_cable_40wire, 21268 .cable_detect = ata_cable_40wire,
21069 .set_mode = rz1000_set_mode, 21269 .set_mode = rz1000_set_mode,
21070diff -urNp linux-2.6.32.11/drivers/ata/pata_sc1200.c linux-2.6.32.11/drivers/ata/pata_sc1200.c 21270diff -urNp linux-2.6.32.12/drivers/ata/pata_sc1200.c linux-2.6.32.12/drivers/ata/pata_sc1200.c
21071--- linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400 21271--- linux-2.6.32.12/drivers/ata/pata_sc1200.c 2010-03-15 11:52:04.000000000 -0400
21072+++ linux-2.6.32.11/drivers/ata/pata_sc1200.c 2010-04-04 20:46:41.556857392 -0400 21272+++ linux-2.6.32.12/drivers/ata/pata_sc1200.c 2010-04-04 20:46:41.556857392 -0400
21073@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_ 21273@@ -207,7 +207,7 @@ static struct scsi_host_template sc1200_
21074 .sg_tablesize = LIBATA_DUMB_MAX_PRD, 21274 .sg_tablesize = LIBATA_DUMB_MAX_PRD,
21075 }; 21275 };
@@ -21079,9 +21279,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sc1200.c linux-2.6.32.11/drivers/ata
21079 .inherits = &ata_bmdma_port_ops, 21279 .inherits = &ata_bmdma_port_ops,
21080 .qc_prep = ata_sff_dumb_qc_prep, 21280 .qc_prep = ata_sff_dumb_qc_prep,
21081 .qc_issue = sc1200_qc_issue, 21281 .qc_issue = sc1200_qc_issue,
21082diff -urNp linux-2.6.32.11/drivers/ata/pata_scc.c linux-2.6.32.11/drivers/ata/pata_scc.c 21282diff -urNp linux-2.6.32.12/drivers/ata/pata_scc.c linux-2.6.32.12/drivers/ata/pata_scc.c
21083--- linux-2.6.32.11/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400 21283--- linux-2.6.32.12/drivers/ata/pata_scc.c 2010-03-15 11:52:04.000000000 -0400
21084+++ linux-2.6.32.11/drivers/ata/pata_scc.c 2010-04-04 20:46:41.556857392 -0400 21284+++ linux-2.6.32.12/drivers/ata/pata_scc.c 2010-04-04 20:46:41.556857392 -0400
21085@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht 21285@@ -965,7 +965,7 @@ static struct scsi_host_template scc_sht
21086 ATA_BMDMA_SHT(DRV_NAME), 21286 ATA_BMDMA_SHT(DRV_NAME),
21087 }; 21287 };
@@ -21091,9 +21291,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_scc.c linux-2.6.32.11/drivers/ata/pa
21091 .inherits = &ata_bmdma_port_ops, 21291 .inherits = &ata_bmdma_port_ops,
21092 21292
21093 .set_piomode = scc_set_piomode, 21293 .set_piomode = scc_set_piomode,
21094diff -urNp linux-2.6.32.11/drivers/ata/pata_sch.c linux-2.6.32.11/drivers/ata/pata_sch.c 21294diff -urNp linux-2.6.32.12/drivers/ata/pata_sch.c linux-2.6.32.12/drivers/ata/pata_sch.c
21095--- linux-2.6.32.11/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400 21295--- linux-2.6.32.12/drivers/ata/pata_sch.c 2010-03-15 11:52:04.000000000 -0400
21096+++ linux-2.6.32.11/drivers/ata/pata_sch.c 2010-04-04 20:46:41.556857392 -0400 21296+++ linux-2.6.32.12/drivers/ata/pata_sch.c 2010-04-04 20:46:41.556857392 -0400
21097@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht 21297@@ -75,7 +75,7 @@ static struct scsi_host_template sch_sht
21098 ATA_BMDMA_SHT(DRV_NAME), 21298 ATA_BMDMA_SHT(DRV_NAME),
21099 }; 21299 };
@@ -21103,9 +21303,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sch.c linux-2.6.32.11/drivers/ata/pa
21103 .inherits = &ata_bmdma_port_ops, 21303 .inherits = &ata_bmdma_port_ops,
21104 .cable_detect = ata_cable_unknown, 21304 .cable_detect = ata_cable_unknown,
21105 .set_piomode = sch_set_piomode, 21305 .set_piomode = sch_set_piomode,
21106diff -urNp linux-2.6.32.11/drivers/ata/pata_serverworks.c linux-2.6.32.11/drivers/ata/pata_serverworks.c 21306diff -urNp linux-2.6.32.12/drivers/ata/pata_serverworks.c linux-2.6.32.12/drivers/ata/pata_serverworks.c
21107--- linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400 21307--- linux-2.6.32.12/drivers/ata/pata_serverworks.c 2010-03-15 11:52:04.000000000 -0400
21108+++ linux-2.6.32.11/drivers/ata/pata_serverworks.c 2010-04-04 20:46:41.556857392 -0400 21308+++ linux-2.6.32.12/drivers/ata/pata_serverworks.c 2010-04-04 20:46:41.556857392 -0400
21109@@ -299,7 +299,7 @@ static struct scsi_host_template serverw 21309@@ -299,7 +299,7 @@ static struct scsi_host_template serverw
21110 ATA_BMDMA_SHT(DRV_NAME), 21310 ATA_BMDMA_SHT(DRV_NAME),
21111 }; 21311 };
@@ -21124,9 +21324,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_serverworks.c linux-2.6.32.11/driver
21124 .inherits = &serverworks_osb4_port_ops, 21324 .inherits = &serverworks_osb4_port_ops,
21125 .mode_filter = serverworks_csb_filter, 21325 .mode_filter = serverworks_csb_filter,
21126 }; 21326 };
21127diff -urNp linux-2.6.32.11/drivers/ata/pata_sil680.c linux-2.6.32.11/drivers/ata/pata_sil680.c 21327diff -urNp linux-2.6.32.12/drivers/ata/pata_sil680.c linux-2.6.32.12/drivers/ata/pata_sil680.c
21128--- linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400 21328--- linux-2.6.32.12/drivers/ata/pata_sil680.c 2010-03-15 11:52:04.000000000 -0400
21129+++ linux-2.6.32.11/drivers/ata/pata_sil680.c 2010-04-04 20:46:41.556857392 -0400 21329+++ linux-2.6.32.12/drivers/ata/pata_sil680.c 2010-04-04 20:46:41.556857392 -0400
21130@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_ 21330@@ -194,7 +194,7 @@ static struct scsi_host_template sil680_
21131 ATA_BMDMA_SHT(DRV_NAME), 21331 ATA_BMDMA_SHT(DRV_NAME),
21132 }; 21332 };
@@ -21136,9 +21336,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sil680.c linux-2.6.32.11/drivers/ata
21136 .inherits = &ata_bmdma32_port_ops, 21336 .inherits = &ata_bmdma32_port_ops,
21137 .cable_detect = sil680_cable_detect, 21337 .cable_detect = sil680_cable_detect,
21138 .set_piomode = sil680_set_piomode, 21338 .set_piomode = sil680_set_piomode,
21139diff -urNp linux-2.6.32.11/drivers/ata/pata_sis.c linux-2.6.32.11/drivers/ata/pata_sis.c 21339diff -urNp linux-2.6.32.12/drivers/ata/pata_sis.c linux-2.6.32.12/drivers/ata/pata_sis.c
21140--- linux-2.6.32.11/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400 21340--- linux-2.6.32.12/drivers/ata/pata_sis.c 2010-03-15 11:52:04.000000000 -0400
21141+++ linux-2.6.32.11/drivers/ata/pata_sis.c 2010-04-04 20:46:41.556857392 -0400 21341+++ linux-2.6.32.12/drivers/ata/pata_sis.c 2010-04-04 20:46:41.556857392 -0400
21142@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht 21342@@ -503,47 +503,47 @@ static struct scsi_host_template sis_sht
21143 ATA_BMDMA_SHT(DRV_NAME), 21343 ATA_BMDMA_SHT(DRV_NAME),
21144 }; 21344 };
@@ -21194,9 +21394,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sis.c linux-2.6.32.11/drivers/ata/pa
21194 .inherits = &sis_base_ops, 21394 .inherits = &sis_base_ops,
21195 .set_piomode = sis_old_set_piomode, 21395 .set_piomode = sis_old_set_piomode,
21196 .set_dmamode = sis_old_set_dmamode, 21396 .set_dmamode = sis_old_set_dmamode,
21197diff -urNp linux-2.6.32.11/drivers/ata/pata_sl82c105.c linux-2.6.32.11/drivers/ata/pata_sl82c105.c 21397diff -urNp linux-2.6.32.12/drivers/ata/pata_sl82c105.c linux-2.6.32.12/drivers/ata/pata_sl82c105.c
21198--- linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400 21398--- linux-2.6.32.12/drivers/ata/pata_sl82c105.c 2010-03-15 11:52:04.000000000 -0400
21199+++ linux-2.6.32.11/drivers/ata/pata_sl82c105.c 2010-04-04 20:46:41.556857392 -0400 21399+++ linux-2.6.32.12/drivers/ata/pata_sl82c105.c 2010-04-04 20:46:41.556857392 -0400
21200@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10 21400@@ -231,7 +231,7 @@ static struct scsi_host_template sl82c10
21201 ATA_BMDMA_SHT(DRV_NAME), 21401 ATA_BMDMA_SHT(DRV_NAME),
21202 }; 21402 };
@@ -21206,9 +21406,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_sl82c105.c linux-2.6.32.11/drivers/a
21206 .inherits = &ata_bmdma_port_ops, 21406 .inherits = &ata_bmdma_port_ops,
21207 .qc_defer = sl82c105_qc_defer, 21407 .qc_defer = sl82c105_qc_defer,
21208 .bmdma_start = sl82c105_bmdma_start, 21408 .bmdma_start = sl82c105_bmdma_start,
21209diff -urNp linux-2.6.32.11/drivers/ata/pata_triflex.c linux-2.6.32.11/drivers/ata/pata_triflex.c 21409diff -urNp linux-2.6.32.12/drivers/ata/pata_triflex.c linux-2.6.32.12/drivers/ata/pata_triflex.c
21210--- linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400 21410--- linux-2.6.32.12/drivers/ata/pata_triflex.c 2010-03-15 11:52:04.000000000 -0400
21211+++ linux-2.6.32.11/drivers/ata/pata_triflex.c 2010-04-04 20:46:41.556857392 -0400 21411+++ linux-2.6.32.12/drivers/ata/pata_triflex.c 2010-04-04 20:46:41.556857392 -0400
21212@@ -178,7 +178,7 @@ static struct scsi_host_template triflex 21412@@ -178,7 +178,7 @@ static struct scsi_host_template triflex
21213 ATA_BMDMA_SHT(DRV_NAME), 21413 ATA_BMDMA_SHT(DRV_NAME),
21214 }; 21414 };
@@ -21218,9 +21418,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_triflex.c linux-2.6.32.11/drivers/at
21218 .inherits = &ata_bmdma_port_ops, 21418 .inherits = &ata_bmdma_port_ops,
21219 .bmdma_start = triflex_bmdma_start, 21419 .bmdma_start = triflex_bmdma_start,
21220 .bmdma_stop = triflex_bmdma_stop, 21420 .bmdma_stop = triflex_bmdma_stop,
21221diff -urNp linux-2.6.32.11/drivers/ata/pata_via.c linux-2.6.32.11/drivers/ata/pata_via.c 21421diff -urNp linux-2.6.32.12/drivers/ata/pata_via.c linux-2.6.32.12/drivers/ata/pata_via.c
21222--- linux-2.6.32.11/drivers/ata/pata_via.c 2010-03-15 11:52:04.000000000 -0400 21422--- linux-2.6.32.12/drivers/ata/pata_via.c 2010-04-29 17:49:37.709698369 -0400
21223+++ linux-2.6.32.11/drivers/ata/pata_via.c 2010-04-04 20:46:41.556857392 -0400 21423+++ linux-2.6.32.12/drivers/ata/pata_via.c 2010-04-29 17:49:58.093238510 -0400
21224@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht 21424@@ -419,7 +419,7 @@ static struct scsi_host_template via_sht
21225 ATA_BMDMA_SHT(DRV_NAME), 21425 ATA_BMDMA_SHT(DRV_NAME),
21226 }; 21426 };
@@ -21239,9 +21439,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_via.c linux-2.6.32.11/drivers/ata/pa
21239 .inherits = &via_port_ops, 21439 .inherits = &via_port_ops,
21240 .sff_data_xfer = ata_sff_data_xfer_noirq, 21440 .sff_data_xfer = ata_sff_data_xfer_noirq,
21241 }; 21441 };
21242diff -urNp linux-2.6.32.11/drivers/ata/pata_winbond.c linux-2.6.32.11/drivers/ata/pata_winbond.c 21442diff -urNp linux-2.6.32.12/drivers/ata/pata_winbond.c linux-2.6.32.12/drivers/ata/pata_winbond.c
21243--- linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400 21443--- linux-2.6.32.12/drivers/ata/pata_winbond.c 2010-03-15 11:52:04.000000000 -0400
21244+++ linux-2.6.32.11/drivers/ata/pata_winbond.c 2010-04-04 20:46:41.556857392 -0400 21444+++ linux-2.6.32.12/drivers/ata/pata_winbond.c 2010-04-04 20:46:41.556857392 -0400
21245@@ -125,7 +125,7 @@ static struct scsi_host_template winbond 21445@@ -125,7 +125,7 @@ static struct scsi_host_template winbond
21246 ATA_PIO_SHT(DRV_NAME), 21446 ATA_PIO_SHT(DRV_NAME),
21247 }; 21447 };
@@ -21251,9 +21451,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pata_winbond.c linux-2.6.32.11/drivers/at
21251 .inherits = &ata_sff_port_ops, 21451 .inherits = &ata_sff_port_ops,
21252 .sff_data_xfer = winbond_data_xfer, 21452 .sff_data_xfer = winbond_data_xfer,
21253 .cable_detect = ata_cable_40wire, 21453 .cable_detect = ata_cable_40wire,
21254diff -urNp linux-2.6.32.11/drivers/ata/pdc_adma.c linux-2.6.32.11/drivers/ata/pdc_adma.c 21454diff -urNp linux-2.6.32.12/drivers/ata/pdc_adma.c linux-2.6.32.12/drivers/ata/pdc_adma.c
21255--- linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400 21455--- linux-2.6.32.12/drivers/ata/pdc_adma.c 2010-03-15 11:52:04.000000000 -0400
21256+++ linux-2.6.32.11/drivers/ata/pdc_adma.c 2010-04-04 20:46:41.556857392 -0400 21456+++ linux-2.6.32.12/drivers/ata/pdc_adma.c 2010-04-04 20:46:41.556857392 -0400
21257@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at 21457@@ -145,7 +145,7 @@ static struct scsi_host_template adma_at
21258 .dma_boundary = ADMA_DMA_BOUNDARY, 21458 .dma_boundary = ADMA_DMA_BOUNDARY,
21259 }; 21459 };
@@ -21263,9 +21463,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/pdc_adma.c linux-2.6.32.11/drivers/ata/pd
21263 .inherits = &ata_sff_port_ops, 21463 .inherits = &ata_sff_port_ops,
21264 21464
21265 .lost_interrupt = ATA_OP_NULL, 21465 .lost_interrupt = ATA_OP_NULL,
21266diff -urNp linux-2.6.32.11/drivers/ata/sata_fsl.c linux-2.6.32.11/drivers/ata/sata_fsl.c 21466diff -urNp linux-2.6.32.12/drivers/ata/sata_fsl.c linux-2.6.32.12/drivers/ata/sata_fsl.c
21267--- linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400 21467--- linux-2.6.32.12/drivers/ata/sata_fsl.c 2010-03-15 11:52:04.000000000 -0400
21268+++ linux-2.6.32.11/drivers/ata/sata_fsl.c 2010-04-04 20:46:41.556857392 -0400 21468+++ linux-2.6.32.12/drivers/ata/sata_fsl.c 2010-04-04 20:46:41.556857392 -0400
21269@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs 21469@@ -1258,7 +1258,7 @@ static struct scsi_host_template sata_fs
21270 .dma_boundary = ATA_DMA_BOUNDARY, 21470 .dma_boundary = ATA_DMA_BOUNDARY,
21271 }; 21471 };
@@ -21275,9 +21475,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_fsl.c linux-2.6.32.11/drivers/ata/sa
21275 .inherits = &sata_pmp_port_ops, 21475 .inherits = &sata_pmp_port_ops,
21276 21476
21277 .qc_defer = ata_std_qc_defer, 21477 .qc_defer = ata_std_qc_defer,
21278diff -urNp linux-2.6.32.11/drivers/ata/sata_inic162x.c linux-2.6.32.11/drivers/ata/sata_inic162x.c 21478diff -urNp linux-2.6.32.12/drivers/ata/sata_inic162x.c linux-2.6.32.12/drivers/ata/sata_inic162x.c
21279--- linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400 21479--- linux-2.6.32.12/drivers/ata/sata_inic162x.c 2010-03-15 11:52:04.000000000 -0400
21280+++ linux-2.6.32.11/drivers/ata/sata_inic162x.c 2010-04-04 20:46:41.556857392 -0400 21480+++ linux-2.6.32.12/drivers/ata/sata_inic162x.c 2010-04-04 20:46:41.556857392 -0400
21281@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po 21481@@ -721,7 +721,7 @@ static int inic_port_start(struct ata_po
21282 return 0; 21482 return 0;
21283 } 21483 }
@@ -21287,9 +21487,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_inic162x.c linux-2.6.32.11/drivers/a
21287 .inherits = &sata_port_ops, 21487 .inherits = &sata_port_ops,
21288 21488
21289 .check_atapi_dma = inic_check_atapi_dma, 21489 .check_atapi_dma = inic_check_atapi_dma,
21290diff -urNp linux-2.6.32.11/drivers/ata/sata_mv.c linux-2.6.32.11/drivers/ata/sata_mv.c 21490diff -urNp linux-2.6.32.12/drivers/ata/sata_mv.c linux-2.6.32.12/drivers/ata/sata_mv.c
21291--- linux-2.6.32.11/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400 21491--- linux-2.6.32.12/drivers/ata/sata_mv.c 2010-03-15 11:52:04.000000000 -0400
21292+++ linux-2.6.32.11/drivers/ata/sata_mv.c 2010-04-04 20:46:41.556857392 -0400 21492+++ linux-2.6.32.12/drivers/ata/sata_mv.c 2010-04-04 20:46:41.556857392 -0400
21293@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht 21493@@ -656,7 +656,7 @@ static struct scsi_host_template mv6_sht
21294 .dma_boundary = MV_DMA_BOUNDARY, 21494 .dma_boundary = MV_DMA_BOUNDARY,
21295 }; 21495 };
@@ -21317,9 +21517,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_mv.c linux-2.6.32.11/drivers/ata/sat
21317 .inherits = &mv6_ops, 21517 .inherits = &mv6_ops,
21318 .dev_config = ATA_OP_NULL, 21518 .dev_config = ATA_OP_NULL,
21319 .qc_prep = mv_qc_prep_iie, 21519 .qc_prep = mv_qc_prep_iie,
21320diff -urNp linux-2.6.32.11/drivers/ata/sata_nv.c linux-2.6.32.11/drivers/ata/sata_nv.c 21520diff -urNp linux-2.6.32.12/drivers/ata/sata_nv.c linux-2.6.32.12/drivers/ata/sata_nv.c
21321--- linux-2.6.32.11/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400 21521--- linux-2.6.32.12/drivers/ata/sata_nv.c 2010-03-15 11:52:04.000000000 -0400
21322+++ linux-2.6.32.11/drivers/ata/sata_nv.c 2010-04-04 20:46:41.556857392 -0400 21522+++ linux-2.6.32.12/drivers/ata/sata_nv.c 2010-04-04 20:46:41.556857392 -0400
21323@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc 21523@@ -464,7 +464,7 @@ static struct scsi_host_template nv_swnc
21324 * cases. Define nv_hardreset() which only kicks in for post-boot 21524 * cases. Define nv_hardreset() which only kicks in for post-boot
21325 * probing and use it for all variants. 21525 * 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
21362 .inherits = &nv_generic_ops, 21562 .inherits = &nv_generic_ops,
21363 21563
21364 .qc_defer = ata_std_qc_defer, 21564 .qc_defer = ata_std_qc_defer,
21365diff -urNp linux-2.6.32.11/drivers/ata/sata_promise.c linux-2.6.32.11/drivers/ata/sata_promise.c 21565diff -urNp linux-2.6.32.12/drivers/ata/sata_promise.c linux-2.6.32.12/drivers/ata/sata_promise.c
21366--- linux-2.6.32.11/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400 21566--- linux-2.6.32.12/drivers/ata/sata_promise.c 2010-03-15 11:52:04.000000000 -0400
21367+++ linux-2.6.32.11/drivers/ata/sata_promise.c 2010-04-04 20:46:41.556857392 -0400 21567+++ linux-2.6.32.12/drivers/ata/sata_promise.c 2010-04-04 20:46:41.556857392 -0400
21368@@ -195,7 +195,7 @@ static const struct ata_port_operations 21568@@ -195,7 +195,7 @@ static const struct ata_port_operations
21369 .error_handler = pdc_error_handler, 21569 .error_handler = pdc_error_handler,
21370 }; 21570 };
@@ -21391,9 +21591,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_promise.c linux-2.6.32.11/drivers/at
21391 .inherits = &pdc_common_ops, 21591 .inherits = &pdc_common_ops,
21392 .cable_detect = pdc_pata_cable_detect, 21592 .cable_detect = pdc_pata_cable_detect,
21393 .freeze = pdc_freeze, 21593 .freeze = pdc_freeze,
21394diff -urNp linux-2.6.32.11/drivers/ata/sata_qstor.c linux-2.6.32.11/drivers/ata/sata_qstor.c 21594diff -urNp linux-2.6.32.12/drivers/ata/sata_qstor.c linux-2.6.32.12/drivers/ata/sata_qstor.c
21395--- linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400 21595--- linux-2.6.32.12/drivers/ata/sata_qstor.c 2010-03-15 11:52:04.000000000 -0400
21396+++ linux-2.6.32.11/drivers/ata/sata_qstor.c 2010-04-04 20:46:41.556857392 -0400 21596+++ linux-2.6.32.12/drivers/ata/sata_qstor.c 2010-04-04 20:46:41.556857392 -0400
21397@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_ 21597@@ -132,7 +132,7 @@ static struct scsi_host_template qs_ata_
21398 .dma_boundary = QS_DMA_BOUNDARY, 21598 .dma_boundary = QS_DMA_BOUNDARY,
21399 }; 21599 };
@@ -21403,9 +21603,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_qstor.c linux-2.6.32.11/drivers/ata/
21403 .inherits = &ata_sff_port_ops, 21603 .inherits = &ata_sff_port_ops,
21404 21604
21405 .check_atapi_dma = qs_check_atapi_dma, 21605 .check_atapi_dma = qs_check_atapi_dma,
21406diff -urNp linux-2.6.32.11/drivers/ata/sata_sil24.c linux-2.6.32.11/drivers/ata/sata_sil24.c 21606diff -urNp linux-2.6.32.12/drivers/ata/sata_sil24.c linux-2.6.32.12/drivers/ata/sata_sil24.c
21407--- linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400 21607--- linux-2.6.32.12/drivers/ata/sata_sil24.c 2010-03-15 11:52:04.000000000 -0400
21408+++ linux-2.6.32.11/drivers/ata/sata_sil24.c 2010-04-04 20:46:41.556857392 -0400 21608+++ linux-2.6.32.12/drivers/ata/sata_sil24.c 2010-04-04 20:46:41.556857392 -0400
21409@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s 21609@@ -388,7 +388,7 @@ static struct scsi_host_template sil24_s
21410 .dma_boundary = ATA_DMA_BOUNDARY, 21610 .dma_boundary = ATA_DMA_BOUNDARY,
21411 }; 21611 };
@@ -21415,9 +21615,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sil24.c linux-2.6.32.11/drivers/ata/
21415 .inherits = &sata_pmp_port_ops, 21615 .inherits = &sata_pmp_port_ops,
21416 21616
21417 .qc_defer = sil24_qc_defer, 21617 .qc_defer = sil24_qc_defer,
21418diff -urNp linux-2.6.32.11/drivers/ata/sata_sil.c linux-2.6.32.11/drivers/ata/sata_sil.c 21618diff -urNp linux-2.6.32.12/drivers/ata/sata_sil.c linux-2.6.32.12/drivers/ata/sata_sil.c
21419--- linux-2.6.32.11/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400 21619--- linux-2.6.32.12/drivers/ata/sata_sil.c 2010-03-15 11:52:04.000000000 -0400
21420+++ linux-2.6.32.11/drivers/ata/sata_sil.c 2010-04-04 20:46:41.556857392 -0400 21620+++ linux-2.6.32.12/drivers/ata/sata_sil.c 2010-04-04 20:46:41.556857392 -0400
21421@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht 21621@@ -182,7 +182,7 @@ static struct scsi_host_template sil_sht
21422 .sg_tablesize = ATA_MAX_PRD 21622 .sg_tablesize = ATA_MAX_PRD
21423 }; 21623 };
@@ -21427,9 +21627,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sil.c linux-2.6.32.11/drivers/ata/sa
21427 .inherits = &ata_bmdma32_port_ops, 21627 .inherits = &ata_bmdma32_port_ops,
21428 .dev_config = sil_dev_config, 21628 .dev_config = sil_dev_config,
21429 .set_mode = sil_set_mode, 21629 .set_mode = sil_set_mode,
21430diff -urNp linux-2.6.32.11/drivers/ata/sata_sis.c linux-2.6.32.11/drivers/ata/sata_sis.c 21630diff -urNp linux-2.6.32.12/drivers/ata/sata_sis.c linux-2.6.32.12/drivers/ata/sata_sis.c
21431--- linux-2.6.32.11/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400 21631--- linux-2.6.32.12/drivers/ata/sata_sis.c 2010-03-15 11:52:04.000000000 -0400
21432+++ linux-2.6.32.11/drivers/ata/sata_sis.c 2010-04-04 20:46:41.561786507 -0400 21632+++ linux-2.6.32.12/drivers/ata/sata_sis.c 2010-04-04 20:46:41.561786507 -0400
21433@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht 21633@@ -89,7 +89,7 @@ static struct scsi_host_template sis_sht
21434 ATA_BMDMA_SHT(DRV_NAME), 21634 ATA_BMDMA_SHT(DRV_NAME),
21435 }; 21635 };
@@ -21439,9 +21639,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sis.c linux-2.6.32.11/drivers/ata/sa
21439 .inherits = &ata_bmdma_port_ops, 21639 .inherits = &ata_bmdma_port_ops,
21440 .scr_read = sis_scr_read, 21640 .scr_read = sis_scr_read,
21441 .scr_write = sis_scr_write, 21641 .scr_write = sis_scr_write,
21442diff -urNp linux-2.6.32.11/drivers/ata/sata_svw.c linux-2.6.32.11/drivers/ata/sata_svw.c 21642diff -urNp linux-2.6.32.12/drivers/ata/sata_svw.c linux-2.6.32.12/drivers/ata/sata_svw.c
21443--- linux-2.6.32.11/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400 21643--- linux-2.6.32.12/drivers/ata/sata_svw.c 2010-03-15 11:52:04.000000000 -0400
21444+++ linux-2.6.32.11/drivers/ata/sata_svw.c 2010-04-04 20:46:41.561786507 -0400 21644+++ linux-2.6.32.12/drivers/ata/sata_svw.c 2010-04-04 20:46:41.561786507 -0400
21445@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata 21645@@ -344,7 +344,7 @@ static struct scsi_host_template k2_sata
21446 }; 21646 };
21447 21647
@@ -21451,9 +21651,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_svw.c linux-2.6.32.11/drivers/ata/sa
21451 .inherits = &ata_bmdma_port_ops, 21651 .inherits = &ata_bmdma_port_ops,
21452 .sff_tf_load = k2_sata_tf_load, 21652 .sff_tf_load = k2_sata_tf_load,
21453 .sff_tf_read = k2_sata_tf_read, 21653 .sff_tf_read = k2_sata_tf_read,
21454diff -urNp linux-2.6.32.11/drivers/ata/sata_sx4.c linux-2.6.32.11/drivers/ata/sata_sx4.c 21654diff -urNp linux-2.6.32.12/drivers/ata/sata_sx4.c linux-2.6.32.12/drivers/ata/sata_sx4.c
21455--- linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400 21655--- linux-2.6.32.12/drivers/ata/sata_sx4.c 2010-03-15 11:52:04.000000000 -0400
21456+++ linux-2.6.32.11/drivers/ata/sata_sx4.c 2010-04-04 20:46:41.561786507 -0400 21656+++ linux-2.6.32.12/drivers/ata/sata_sx4.c 2010-04-04 20:46:41.561786507 -0400
21457@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat 21657@@ -248,7 +248,7 @@ static struct scsi_host_template pdc_sat
21458 }; 21658 };
21459 21659
@@ -21463,9 +21663,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_sx4.c linux-2.6.32.11/drivers/ata/sa
21463 .inherits = &ata_sff_port_ops, 21663 .inherits = &ata_sff_port_ops,
21464 21664
21465 .check_atapi_dma = pdc_check_atapi_dma, 21665 .check_atapi_dma = pdc_check_atapi_dma,
21466diff -urNp linux-2.6.32.11/drivers/ata/sata_uli.c linux-2.6.32.11/drivers/ata/sata_uli.c 21666diff -urNp linux-2.6.32.12/drivers/ata/sata_uli.c linux-2.6.32.12/drivers/ata/sata_uli.c
21467--- linux-2.6.32.11/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400 21667--- linux-2.6.32.12/drivers/ata/sata_uli.c 2010-03-15 11:52:04.000000000 -0400
21468+++ linux-2.6.32.11/drivers/ata/sata_uli.c 2010-04-04 20:46:41.561786507 -0400 21668+++ linux-2.6.32.12/drivers/ata/sata_uli.c 2010-04-04 20:46:41.561786507 -0400
21469@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht 21669@@ -79,7 +79,7 @@ static struct scsi_host_template uli_sht
21470 ATA_BMDMA_SHT(DRV_NAME), 21670 ATA_BMDMA_SHT(DRV_NAME),
21471 }; 21671 };
@@ -21475,9 +21675,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_uli.c linux-2.6.32.11/drivers/ata/sa
21475 .inherits = &ata_bmdma_port_ops, 21675 .inherits = &ata_bmdma_port_ops,
21476 .scr_read = uli_scr_read, 21676 .scr_read = uli_scr_read,
21477 .scr_write = uli_scr_write, 21677 .scr_write = uli_scr_write,
21478diff -urNp linux-2.6.32.11/drivers/ata/sata_via.c linux-2.6.32.11/drivers/ata/sata_via.c 21678diff -urNp linux-2.6.32.12/drivers/ata/sata_via.c linux-2.6.32.12/drivers/ata/sata_via.c
21479--- linux-2.6.32.11/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400 21679--- linux-2.6.32.12/drivers/ata/sata_via.c 2010-03-15 11:52:04.000000000 -0400
21480+++ linux-2.6.32.11/drivers/ata/sata_via.c 2010-04-04 20:46:41.561786507 -0400 21680+++ linux-2.6.32.12/drivers/ata/sata_via.c 2010-04-04 20:46:41.561786507 -0400
21481@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh 21681@@ -112,31 +112,31 @@ static struct scsi_host_template svia_sh
21482 ATA_BMDMA_SHT(DRV_NAME), 21682 ATA_BMDMA_SHT(DRV_NAME),
21483 }; 21683 };
@@ -21515,9 +21715,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_via.c linux-2.6.32.11/drivers/ata/sa
21515 .inherits = &svia_base_ops, 21715 .inherits = &svia_base_ops,
21516 .hardreset = sata_std_hardreset, 21716 .hardreset = sata_std_hardreset,
21517 .scr_read = vt8251_scr_read, 21717 .scr_read = vt8251_scr_read,
21518diff -urNp linux-2.6.32.11/drivers/ata/sata_vsc.c linux-2.6.32.11/drivers/ata/sata_vsc.c 21718diff -urNp linux-2.6.32.12/drivers/ata/sata_vsc.c linux-2.6.32.12/drivers/ata/sata_vsc.c
21519--- linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400 21719--- linux-2.6.32.12/drivers/ata/sata_vsc.c 2010-03-15 11:52:04.000000000 -0400
21520+++ linux-2.6.32.11/drivers/ata/sata_vsc.c 2010-04-04 20:46:41.561786507 -0400 21720+++ linux-2.6.32.12/drivers/ata/sata_vsc.c 2010-04-04 20:46:41.561786507 -0400
21521@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat 21721@@ -306,7 +306,7 @@ static struct scsi_host_template vsc_sat
21522 }; 21722 };
21523 21723
@@ -21527,9 +21727,9 @@ diff -urNp linux-2.6.32.11/drivers/ata/sata_vsc.c linux-2.6.32.11/drivers/ata/sa
21527 .inherits = &ata_bmdma_port_ops, 21727 .inherits = &ata_bmdma_port_ops,
21528 /* The IRQ handling is not quite standard SFF behaviour so we 21728 /* The IRQ handling is not quite standard SFF behaviour so we
21529 cannot use the default lost interrupt handler */ 21729 cannot use the default lost interrupt handler */
21530diff -urNp linux-2.6.32.11/drivers/atm/adummy.c linux-2.6.32.11/drivers/atm/adummy.c 21730diff -urNp linux-2.6.32.12/drivers/atm/adummy.c linux-2.6.32.12/drivers/atm/adummy.c
21531--- linux-2.6.32.11/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400 21731--- linux-2.6.32.12/drivers/atm/adummy.c 2010-03-15 11:52:04.000000000 -0400
21532+++ linux-2.6.32.11/drivers/atm/adummy.c 2010-04-04 20:46:41.561786507 -0400 21732+++ linux-2.6.32.12/drivers/atm/adummy.c 2010-04-04 20:46:41.561786507 -0400
21533@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct 21733@@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct
21534 vcc->pop(vcc, skb); 21734 vcc->pop(vcc, skb);
21535 else 21735 else
@@ -21539,9 +21739,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/adummy.c linux-2.6.32.11/drivers/atm/adum
21539 21739
21540 return 0; 21740 return 0;
21541 } 21741 }
21542diff -urNp linux-2.6.32.11/drivers/atm/ambassador.c linux-2.6.32.11/drivers/atm/ambassador.c 21742diff -urNp linux-2.6.32.12/drivers/atm/ambassador.c linux-2.6.32.12/drivers/atm/ambassador.c
21543--- linux-2.6.32.11/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400 21743--- linux-2.6.32.12/drivers/atm/ambassador.c 2010-03-15 11:52:04.000000000 -0400
21544+++ linux-2.6.32.11/drivers/atm/ambassador.c 2010-04-04 20:46:41.561786507 -0400 21744+++ linux-2.6.32.12/drivers/atm/ambassador.c 2010-04-04 20:46:41.561786507 -0400
21545@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, 21745@@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev,
21546 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); 21746 PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
21547 21747
@@ -21578,9 +21778,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/ambassador.c linux-2.6.32.11/drivers/atm/
21578 return -ENOMEM; // ? 21778 return -ENOMEM; // ?
21579 } 21779 }
21580 21780
21581diff -urNp linux-2.6.32.11/drivers/atm/atmtcp.c linux-2.6.32.11/drivers/atm/atmtcp.c 21781diff -urNp linux-2.6.32.12/drivers/atm/atmtcp.c linux-2.6.32.12/drivers/atm/atmtcp.c
21582--- linux-2.6.32.11/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400 21782--- linux-2.6.32.12/drivers/atm/atmtcp.c 2010-03-15 11:52:04.000000000 -0400
21583+++ linux-2.6.32.11/drivers/atm/atmtcp.c 2010-04-04 20:46:41.561786507 -0400 21783+++ linux-2.6.32.12/drivers/atm/atmtcp.c 2010-04-04 20:46:41.561786507 -0400
21584@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc 21784@@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc
21585 if (vcc->pop) vcc->pop(vcc,skb); 21785 if (vcc->pop) vcc->pop(vcc,skb);
21586 else dev_kfree_skb(skb); 21786 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
21630 done: 21830 done:
21631 if (vcc->pop) vcc->pop(vcc,skb); 21831 if (vcc->pop) vcc->pop(vcc,skb);
21632 else dev_kfree_skb(skb); 21832 else dev_kfree_skb(skb);
21633diff -urNp linux-2.6.32.11/drivers/atm/eni.c linux-2.6.32.11/drivers/atm/eni.c 21833diff -urNp linux-2.6.32.12/drivers/atm/eni.c linux-2.6.32.12/drivers/atm/eni.c
21634--- linux-2.6.32.11/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400 21834--- linux-2.6.32.12/drivers/atm/eni.c 2010-03-15 11:52:04.000000000 -0400
21635+++ linux-2.6.32.11/drivers/atm/eni.c 2010-04-04 20:46:41.561786507 -0400 21835+++ linux-2.6.32.12/drivers/atm/eni.c 2010-04-04 20:46:41.561786507 -0400
21636@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) 21836@@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc)
21637 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", 21837 DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
21638 vcc->dev->number); 21838 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
21678 wake_up(&eni_dev->tx_wait); 21878 wake_up(&eni_dev->tx_wait);
21679 dma_complete++; 21879 dma_complete++;
21680 } 21880 }
21681diff -urNp linux-2.6.32.11/drivers/atm/firestream.c linux-2.6.32.11/drivers/atm/firestream.c 21881diff -urNp linux-2.6.32.12/drivers/atm/firestream.c linux-2.6.32.12/drivers/atm/firestream.c
21682--- linux-2.6.32.11/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400 21882--- linux-2.6.32.12/drivers/atm/firestream.c 2010-03-15 11:52:04.000000000 -0400
21683+++ linux-2.6.32.11/drivers/atm/firestream.c 2010-04-04 20:46:41.561786507 -0400 21883+++ linux-2.6.32.12/drivers/atm/firestream.c 2010-04-04 20:46:41.561786507 -0400
21684@@ -748,7 +748,7 @@ static void process_txdone_queue (struct 21884@@ -748,7 +748,7 @@ static void process_txdone_queue (struct
21685 } 21885 }
21686 } 21886 }
@@ -21714,9 +21914,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/firestream.c linux-2.6.32.11/drivers/atm/
21714 break; 21914 break;
21715 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ 21915 default: /* Hmm. Haven't written the code to handle the others yet... -- REW */
21716 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", 21916 printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n",
21717diff -urNp linux-2.6.32.11/drivers/atm/fore200e.c linux-2.6.32.11/drivers/atm/fore200e.c 21917diff -urNp linux-2.6.32.12/drivers/atm/fore200e.c linux-2.6.32.12/drivers/atm/fore200e.c
21718--- linux-2.6.32.11/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400 21918--- linux-2.6.32.12/drivers/atm/fore200e.c 2010-03-15 11:52:04.000000000 -0400
21719+++ linux-2.6.32.11/drivers/atm/fore200e.c 2010-04-04 20:46:41.561786507 -0400 21919+++ linux-2.6.32.12/drivers/atm/fore200e.c 2010-04-04 20:46:41.561786507 -0400
21720@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 21920@@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200
21721 #endif 21921 #endif
21722 /* check error condition */ 21922 /* 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
21773 21973
21774 fore200e->tx_sat++; 21974 fore200e->tx_sat++;
21775 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", 21975 DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
21776diff -urNp linux-2.6.32.11/drivers/atm/he.c linux-2.6.32.11/drivers/atm/he.c 21976diff -urNp linux-2.6.32.12/drivers/atm/he.c linux-2.6.32.12/drivers/atm/he.c
21777--- linux-2.6.32.11/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400 21977--- linux-2.6.32.12/drivers/atm/he.c 2010-03-15 11:52:04.000000000 -0400
21778+++ linux-2.6.32.11/drivers/atm/he.c 2010-04-04 20:46:41.565779517 -0400 21978+++ linux-2.6.32.12/drivers/atm/he.c 2010-04-04 20:46:41.565779517 -0400
21779@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i 21979@@ -1769,7 +1769,7 @@ he_service_rbrq(struct he_dev *he_dev, i
21780 21980
21781 if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { 21981 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
21857 22057
21858 return 0; 22058 return 0;
21859 } 22059 }
21860diff -urNp linux-2.6.32.11/drivers/atm/horizon.c linux-2.6.32.11/drivers/atm/horizon.c 22060diff -urNp linux-2.6.32.12/drivers/atm/horizon.c linux-2.6.32.12/drivers/atm/horizon.c
21861--- linux-2.6.32.11/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400 22061--- linux-2.6.32.12/drivers/atm/horizon.c 2010-03-15 11:52:04.000000000 -0400
21862+++ linux-2.6.32.11/drivers/atm/horizon.c 2010-04-04 20:46:41.565779517 -0400 22062+++ linux-2.6.32.12/drivers/atm/horizon.c 2010-04-04 20:46:41.565779517 -0400
21863@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, 22063@@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev,
21864 { 22064 {
21865 struct atm_vcc * vcc = ATM_SKB(skb)->vcc; 22065 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
21878 22078
21879 // free the skb 22079 // free the skb
21880 hrz_kfree_skb (skb); 22080 hrz_kfree_skb (skb);
21881diff -urNp linux-2.6.32.11/drivers/atm/idt77252.c linux-2.6.32.11/drivers/atm/idt77252.c 22081diff -urNp linux-2.6.32.12/drivers/atm/idt77252.c linux-2.6.32.12/drivers/atm/idt77252.c
21882--- linux-2.6.32.11/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400 22082--- linux-2.6.32.12/drivers/atm/idt77252.c 2010-03-15 11:52:04.000000000 -0400
21883+++ linux-2.6.32.11/drivers/atm/idt77252.c 2010-04-04 20:46:41.565779517 -0400 22083+++ linux-2.6.32.12/drivers/atm/idt77252.c 2010-04-04 20:46:41.565779517 -0400
21884@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str 22084@@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str
21885 else 22085 else
21886 dev_kfree_skb(skb); 22086 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
22035 return -ENOMEM; 22235 return -ENOMEM;
22036 } 22236 }
22037 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); 22237 atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
22038diff -urNp linux-2.6.32.11/drivers/atm/iphase.c linux-2.6.32.11/drivers/atm/iphase.c 22238diff -urNp linux-2.6.32.12/drivers/atm/iphase.c linux-2.6.32.12/drivers/atm/iphase.c
22039--- linux-2.6.32.11/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400 22239--- linux-2.6.32.12/drivers/atm/iphase.c 2010-03-15 11:52:04.000000000 -0400
22040+++ linux-2.6.32.11/drivers/atm/iphase.c 2010-04-04 20:46:41.565779517 -0400 22240+++ linux-2.6.32.12/drivers/atm/iphase.c 2010-04-04 20:46:41.565779517 -0400
22041@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) 22241@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev)
22042 status = (u_short) (buf_desc_ptr->desc_mode); 22242 status = (u_short) (buf_desc_ptr->desc_mode);
22043 if (status & (RX_CER | RX_PTE | RX_OFL)) 22243 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
22134 if (iavcc->vc_desc_cnt > 10) { 22334 if (iavcc->vc_desc_cnt > 10) {
22135 vcc->tx_quota = vcc->tx_quota * 3 / 4; 22335 vcc->tx_quota = vcc->tx_quota * 3 / 4;
22136 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota ); 22336 printk("Tx1: vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
22137diff -urNp linux-2.6.32.11/drivers/atm/lanai.c linux-2.6.32.11/drivers/atm/lanai.c 22337diff -urNp linux-2.6.32.12/drivers/atm/lanai.c linux-2.6.32.12/drivers/atm/lanai.c
22138--- linux-2.6.32.11/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400 22338--- linux-2.6.32.12/drivers/atm/lanai.c 2010-03-15 11:52:04.000000000 -0400
22139+++ linux-2.6.32.11/drivers/atm/lanai.c 2010-04-04 20:46:41.565779517 -0400 22339+++ linux-2.6.32.12/drivers/atm/lanai.c 2010-04-04 20:46:41.565779517 -0400
22140@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l 22340@@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l
22141 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); 22341 vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
22142 lanai_endtx(lanai, lvcc); 22342 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
22191 lvcc->stats.x.aal5.service_rxcrc++; 22391 lvcc->stats.x.aal5.service_rxcrc++;
22192 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; 22392 lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4];
22193 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); 22393 cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr);
22194diff -urNp linux-2.6.32.11/drivers/atm/nicstar.c linux-2.6.32.11/drivers/atm/nicstar.c 22394diff -urNp linux-2.6.32.12/drivers/atm/nicstar.c linux-2.6.32.12/drivers/atm/nicstar.c
22195--- linux-2.6.32.11/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400 22395--- linux-2.6.32.12/drivers/atm/nicstar.c 2010-03-15 11:52:04.000000000 -0400
22196+++ linux-2.6.32.11/drivers/atm/nicstar.c 2010-04-04 20:46:41.565779517 -0400 22396+++ linux-2.6.32.12/drivers/atm/nicstar.c 2010-04-04 20:46:41.565779517 -0400
22197@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, 22397@@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc,
22198 if ((vc = (vc_map *) vcc->dev_data) == NULL) 22398 if ((vc = (vc_map *) vcc->dev_data) == NULL)
22199 { 22399 {
@@ -22396,9 +22596,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/nicstar.c linux-2.6.32.11/drivers/atm/nic
22396 } 22596 }
22397 } 22597 }
22398 22598
22399diff -urNp linux-2.6.32.11/drivers/atm/solos-pci.c linux-2.6.32.11/drivers/atm/solos-pci.c 22599diff -urNp linux-2.6.32.12/drivers/atm/solos-pci.c linux-2.6.32.12/drivers/atm/solos-pci.c
22400--- linux-2.6.32.11/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400 22600--- linux-2.6.32.12/drivers/atm/solos-pci.c 2010-03-15 11:52:04.000000000 -0400
22401+++ linux-2.6.32.11/drivers/atm/solos-pci.c 2010-04-04 20:46:41.565779517 -0400 22601+++ linux-2.6.32.12/drivers/atm/solos-pci.c 2010-04-04 20:46:41.565779517 -0400
22402@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg) 22602@@ -708,7 +708,7 @@ void solos_bh(unsigned long card_arg)
22403 } 22603 }
22404 atm_charge(vcc, skb->truesize); 22604 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
22417 solos_pop(vcc, oldskb); 22617 solos_pop(vcc, oldskb);
22418 } else 22618 } else
22419 dev_kfree_skb_irq(oldskb); 22619 dev_kfree_skb_irq(oldskb);
22420diff -urNp linux-2.6.32.11/drivers/atm/suni.c linux-2.6.32.11/drivers/atm/suni.c 22620diff -urNp linux-2.6.32.12/drivers/atm/suni.c linux-2.6.32.12/drivers/atm/suni.c
22421--- linux-2.6.32.11/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400 22621--- linux-2.6.32.12/drivers/atm/suni.c 2010-03-15 11:52:04.000000000 -0400
22422+++ linux-2.6.32.11/drivers/atm/suni.c 2010-04-04 20:46:41.565779517 -0400 22622+++ linux-2.6.32.12/drivers/atm/suni.c 2010-04-04 20:46:41.565779517 -0400
22423@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock); 22623@@ -49,8 +49,8 @@ static DEFINE_SPINLOCK(sunis_lock);
22424 22624
22425 22625
@@ -22431,9 +22631,9 @@ diff -urNp linux-2.6.32.11/drivers/atm/suni.c linux-2.6.32.11/drivers/atm/suni.c
22431 22631
22432 22632
22433 static void suni_hz(unsigned long from_timer) 22633 static void suni_hz(unsigned long from_timer)
22434diff -urNp linux-2.6.32.11/drivers/atm/uPD98402.c linux-2.6.32.11/drivers/atm/uPD98402.c 22634diff -urNp linux-2.6.32.12/drivers/atm/uPD98402.c linux-2.6.32.12/drivers/atm/uPD98402.c
22435--- linux-2.6.32.11/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400 22635--- linux-2.6.32.12/drivers/atm/uPD98402.c 2010-03-15 11:52:04.000000000 -0400
22436+++ linux-2.6.32.11/drivers/atm/uPD98402.c 2010-04-04 20:46:41.565779517 -0400 22636+++ linux-2.6.32.12/drivers/atm/uPD98402.c 2010-04-04 20:46:41.565779517 -0400
22437@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d 22637@@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d
22438 struct sonet_stats tmp; 22638 struct sonet_stats tmp;
22439 int error = 0; 22639 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
22478 return 0; 22678 return 0;
22479 } 22679 }
22480 22680
22481diff -urNp linux-2.6.32.11/drivers/atm/zatm.c linux-2.6.32.11/drivers/atm/zatm.c 22681diff -urNp linux-2.6.32.12/drivers/atm/zatm.c linux-2.6.32.12/drivers/atm/zatm.c
22482--- linux-2.6.32.11/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400 22682--- linux-2.6.32.12/drivers/atm/zatm.c 2010-03-15 11:52:04.000000000 -0400
22483+++ linux-2.6.32.11/drivers/atm/zatm.c 2010-04-04 20:46:41.569782507 -0400 22683+++ linux-2.6.32.12/drivers/atm/zatm.c 2010-04-04 20:46:41.569782507 -0400
22484@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy 22684@@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
22485 } 22685 }
22486 if (!size) { 22686 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
22508 wake_up(&zatm_vcc->tx_wait); 22708 wake_up(&zatm_vcc->tx_wait);
22509 } 22709 }
22510 22710
22511diff -urNp linux-2.6.32.11/drivers/base/bus.c linux-2.6.32.11/drivers/base/bus.c 22711diff -urNp linux-2.6.32.12/drivers/base/bus.c linux-2.6.32.12/drivers/base/bus.c
22512--- linux-2.6.32.11/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400 22712--- linux-2.6.32.12/drivers/base/bus.c 2010-03-15 11:52:04.000000000 -0400
22513+++ linux-2.6.32.11/drivers/base/bus.c 2010-04-04 20:46:41.569782507 -0400 22713+++ linux-2.6.32.12/drivers/base/bus.c 2010-04-04 20:46:41.569782507 -0400
22514@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob 22714@@ -70,7 +70,7 @@ static ssize_t drv_attr_store(struct kob
22515 return ret; 22715 return ret;
22516 } 22716 }
@@ -22538,9 +22738,9 @@ diff -urNp linux-2.6.32.11/drivers/base/bus.c linux-2.6.32.11/drivers/base/bus.c
22538 .filter = bus_uevent_filter, 22738 .filter = bus_uevent_filter,
22539 }; 22739 };
22540 22740
22541diff -urNp linux-2.6.32.11/drivers/base/class.c linux-2.6.32.11/drivers/base/class.c 22741diff -urNp linux-2.6.32.12/drivers/base/class.c linux-2.6.32.12/drivers/base/class.c
22542--- linux-2.6.32.11/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400 22742--- linux-2.6.32.12/drivers/base/class.c 2010-03-15 11:52:04.000000000 -0400
22543+++ linux-2.6.32.11/drivers/base/class.c 2010-04-04 20:46:41.569782507 -0400 22743+++ linux-2.6.32.12/drivers/base/class.c 2010-04-04 20:46:41.569782507 -0400
22544@@ -63,7 +63,7 @@ static void class_release(struct kobject 22744@@ -63,7 +63,7 @@ static void class_release(struct kobject
22545 kfree(cp); 22745 kfree(cp);
22546 } 22746 }
@@ -22550,9 +22750,9 @@ diff -urNp linux-2.6.32.11/drivers/base/class.c linux-2.6.32.11/drivers/base/cla
22550 .show = class_attr_show, 22750 .show = class_attr_show,
22551 .store = class_attr_store, 22751 .store = class_attr_store,
22552 }; 22752 };
22553diff -urNp linux-2.6.32.11/drivers/base/core.c linux-2.6.32.11/drivers/base/core.c 22753diff -urNp linux-2.6.32.12/drivers/base/core.c linux-2.6.32.12/drivers/base/core.c
22554--- linux-2.6.32.11/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400 22754--- linux-2.6.32.12/drivers/base/core.c 2010-03-15 11:52:04.000000000 -0400
22555+++ linux-2.6.32.11/drivers/base/core.c 2010-04-04 20:46:41.569782507 -0400 22755+++ linux-2.6.32.12/drivers/base/core.c 2010-04-04 20:46:41.569782507 -0400
22556@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob 22756@@ -100,7 +100,7 @@ static ssize_t dev_attr_store(struct kob
22557 return ret; 22757 return ret;
22558 } 22758 }
@@ -22571,9 +22771,9 @@ diff -urNp linux-2.6.32.11/drivers/base/core.c linux-2.6.32.11/drivers/base/core
22571 .filter = dev_uevent_filter, 22771 .filter = dev_uevent_filter,
22572 .name = dev_uevent_name, 22772 .name = dev_uevent_name,
22573 .uevent = dev_uevent, 22773 .uevent = dev_uevent,
22574diff -urNp linux-2.6.32.11/drivers/base/memory.c linux-2.6.32.11/drivers/base/memory.c 22774diff -urNp linux-2.6.32.12/drivers/base/memory.c linux-2.6.32.12/drivers/base/memory.c
22575--- linux-2.6.32.11/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400 22775--- linux-2.6.32.12/drivers/base/memory.c 2010-03-15 11:52:04.000000000 -0400
22576+++ linux-2.6.32.11/drivers/base/memory.c 2010-04-04 20:46:41.569782507 -0400 22776+++ linux-2.6.32.12/drivers/base/memory.c 2010-04-04 20:46:41.569782507 -0400
22577@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks 22777@@ -44,7 +44,7 @@ static int memory_uevent(struct kset *ks
22578 return retval; 22778 return retval;
22579 } 22779 }
@@ -22583,9 +22783,9 @@ diff -urNp linux-2.6.32.11/drivers/base/memory.c linux-2.6.32.11/drivers/base/me
22583 .name = memory_uevent_name, 22783 .name = memory_uevent_name,
22584 .uevent = memory_uevent, 22784 .uevent = memory_uevent,
22585 }; 22785 };
22586diff -urNp linux-2.6.32.11/drivers/base/sys.c linux-2.6.32.11/drivers/base/sys.c 22786diff -urNp linux-2.6.32.12/drivers/base/sys.c linux-2.6.32.12/drivers/base/sys.c
22587--- linux-2.6.32.11/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400 22787--- linux-2.6.32.12/drivers/base/sys.c 2010-03-15 11:52:04.000000000 -0400
22588+++ linux-2.6.32.11/drivers/base/sys.c 2010-04-04 20:46:41.569782507 -0400 22788+++ linux-2.6.32.12/drivers/base/sys.c 2010-04-04 20:46:41.569782507 -0400
22589@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc 22789@@ -54,7 +54,7 @@ sysdev_store(struct kobject *kobj, struc
22590 return -EIO; 22790 return -EIO;
22591 } 22791 }
@@ -22604,9 +22804,9 @@ diff -urNp linux-2.6.32.11/drivers/base/sys.c linux-2.6.32.11/drivers/base/sys.c
22604 .show = sysdev_class_show, 22804 .show = sysdev_class_show,
22605 .store = sysdev_class_store, 22805 .store = sysdev_class_store,
22606 }; 22806 };
22607diff -urNp linux-2.6.32.11/drivers/block/pktcdvd.c linux-2.6.32.11/drivers/block/pktcdvd.c 22807diff -urNp linux-2.6.32.12/drivers/block/pktcdvd.c linux-2.6.32.12/drivers/block/pktcdvd.c
22608--- linux-2.6.32.11/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400 22808--- linux-2.6.32.12/drivers/block/pktcdvd.c 2010-03-15 11:52:04.000000000 -0400
22609+++ linux-2.6.32.11/drivers/block/pktcdvd.c 2010-04-04 20:46:41.569782507 -0400 22809+++ linux-2.6.32.12/drivers/block/pktcdvd.c 2010-04-04 20:46:41.569782507 -0400
22610@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob 22810@@ -284,7 +284,7 @@ static ssize_t kobj_pkt_store(struct kob
22611 return len; 22811 return len;
22612 } 22812 }
@@ -22616,9 +22816,9 @@ diff -urNp linux-2.6.32.11/drivers/block/pktcdvd.c linux-2.6.32.11/drivers/block
22616 .show = kobj_pkt_show, 22816 .show = kobj_pkt_show,
22617 .store = kobj_pkt_store 22817 .store = kobj_pkt_store
22618 }; 22818 };
22619diff -urNp linux-2.6.32.11/drivers/char/agp/frontend.c linux-2.6.32.11/drivers/char/agp/frontend.c 22819diff -urNp linux-2.6.32.12/drivers/char/agp/frontend.c linux-2.6.32.12/drivers/char/agp/frontend.c
22620--- linux-2.6.32.11/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400 22820--- linux-2.6.32.12/drivers/char/agp/frontend.c 2010-03-15 11:52:04.000000000 -0400
22621+++ linux-2.6.32.11/drivers/char/agp/frontend.c 2010-04-04 20:46:41.569782507 -0400 22821+++ linux-2.6.32.12/drivers/char/agp/frontend.c 2010-04-04 20:46:41.569782507 -0400
22622@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag 22822@@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag
22623 if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) 22823 if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
22624 return -EFAULT; 22824 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
22628 return -EFAULT; 22828 return -EFAULT;
22629 22829
22630 client = agp_find_client_by_pid(reserve.pid); 22830 client = agp_find_client_by_pid(reserve.pid);
22631diff -urNp linux-2.6.32.11/drivers/char/agp/intel-agp.c linux-2.6.32.11/drivers/char/agp/intel-agp.c 22831diff -urNp linux-2.6.32.12/drivers/char/agp/intel-agp.c linux-2.6.32.12/drivers/char/agp/intel-agp.c
22632--- linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-03-15 11:52:04.000000000 -0400 22832--- linux-2.6.32.12/drivers/char/agp/intel-agp.c 2010-04-29 17:49:37.777981896 -0400
22633+++ linux-2.6.32.11/drivers/char/agp/intel-agp.c 2010-04-04 20:46:41.569782507 -0400 22833+++ linux-2.6.32.12/drivers/char/agp/intel-agp.c 2010-04-29 17:49:58.121109354 -0400
22634@@ -2571,7 +2571,7 @@ static struct pci_device_id agp_intel_pc 22834@@ -2564,7 +2564,7 @@ static struct pci_device_id agp_intel_pc
22635 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB), 22835 ID(PCI_DEVICE_ID_INTEL_IGDNG_M_HB),
22636 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB), 22836 ID(PCI_DEVICE_ID_INTEL_IGDNG_MA_HB),
22637 ID(PCI_DEVICE_ID_INTEL_IGDNG_MC2_HB), 22837 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/
22640 }; 22840 };
22641 22841
22642 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); 22842 MODULE_DEVICE_TABLE(pci, agp_intel_pci_table);
22643diff -urNp linux-2.6.32.11/drivers/char/hpet.c linux-2.6.32.11/drivers/char/hpet.c 22843diff -urNp linux-2.6.32.12/drivers/char/hpet.c linux-2.6.32.12/drivers/char/hpet.c
22644--- linux-2.6.32.11/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400 22844--- linux-2.6.32.12/drivers/char/hpet.c 2010-03-15 11:52:04.000000000 -0400
22645+++ linux-2.6.32.11/drivers/char/hpet.c 2010-04-04 20:46:41.569782507 -0400 22845+++ linux-2.6.32.12/drivers/char/hpet.c 2010-04-29 17:46:36.909235393 -0400
22846@@ -430,7 +430,7 @@ static int hpet_release(struct inode *in
22847 return 0;
22848 }
22849
22850-static int hpet_ioctl_common(struct hpet_dev *, int, unsigned long, int);
22851+static int hpet_ioctl_common(struct hpet_dev *, unsigned int, unsigned long, int);
22852
22853 static int
22854 hpet_ioctl(struct inode *inode, struct file *file, unsigned int cmd,
22855@@ -550,7 +550,7 @@ static inline unsigned long hpet_time_di
22856 }
22857
22858 static int
22859-hpet_ioctl_common(struct hpet_dev *devp, int cmd, unsigned long arg, int kernel)
22860+hpet_ioctl_common(struct hpet_dev *devp, unsigned int cmd, unsigned long arg, int kernel)
22861 {
22862 struct hpet_timer __iomem *timer;
22863 struct hpet __iomem *hpet;
22646@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv 22864@@ -998,7 +998,7 @@ static struct acpi_driver hpet_acpi_driv
22647 }, 22865 },
22648 }; 22866 };
@@ -22652,9 +22870,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hpet.c linux-2.6.32.11/drivers/char/hpet
22652 22870
22653 static int __init hpet_init(void) 22871 static int __init hpet_init(void)
22654 { 22872 {
22655diff -urNp linux-2.6.32.11/drivers/char/hvc_beat.c linux-2.6.32.11/drivers/char/hvc_beat.c 22873diff -urNp linux-2.6.32.12/drivers/char/hvc_beat.c linux-2.6.32.12/drivers/char/hvc_beat.c
22656--- linux-2.6.32.11/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400 22874--- linux-2.6.32.12/drivers/char/hvc_beat.c 2010-03-15 11:52:04.000000000 -0400
22657+++ linux-2.6.32.11/drivers/char/hvc_beat.c 2010-04-04 20:46:41.569782507 -0400 22875+++ linux-2.6.32.12/drivers/char/hvc_beat.c 2010-04-04 20:46:41.569782507 -0400
22658@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v 22876@@ -84,7 +84,7 @@ static int hvc_beat_put_chars(uint32_t v
22659 return cnt; 22877 return cnt;
22660 } 22878 }
@@ -22664,9 +22882,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_beat.c linux-2.6.32.11/drivers/char/
22664 .get_chars = hvc_beat_get_chars, 22882 .get_chars = hvc_beat_get_chars,
22665 .put_chars = hvc_beat_put_chars, 22883 .put_chars = hvc_beat_put_chars,
22666 }; 22884 };
22667diff -urNp linux-2.6.32.11/drivers/char/hvc_console.c linux-2.6.32.11/drivers/char/hvc_console.c 22885diff -urNp linux-2.6.32.12/drivers/char/hvc_console.c linux-2.6.32.12/drivers/char/hvc_console.c
22668--- linux-2.6.32.11/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400 22886--- linux-2.6.32.12/drivers/char/hvc_console.c 2010-03-15 11:52:04.000000000 -0400
22669+++ linux-2.6.32.11/drivers/char/hvc_console.c 2010-04-04 20:46:41.569782507 -0400 22887+++ linux-2.6.32.12/drivers/char/hvc_console.c 2010-04-04 20:46:41.569782507 -0400
22670@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind 22888@@ -125,7 +125,7 @@ static struct hvc_struct *hvc_get_by_ind
22671 * console interfaces but can still be used as a tty device. This has to be 22889 * console interfaces but can still be used as a tty device. This has to be
22672 * static because kmalloc will not work during early console init. 22890 * 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
22694 { 22912 {
22695 struct hvc_struct *hp; 22913 struct hvc_struct *hp;
22696 int i; 22914 int i;
22697diff -urNp linux-2.6.32.11/drivers/char/hvc_console.h linux-2.6.32.11/drivers/char/hvc_console.h 22915diff -urNp linux-2.6.32.12/drivers/char/hvc_console.h linux-2.6.32.12/drivers/char/hvc_console.h
22698--- linux-2.6.32.11/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400 22916--- linux-2.6.32.12/drivers/char/hvc_console.h 2010-03-15 11:52:04.000000000 -0400
22699+++ linux-2.6.32.11/drivers/char/hvc_console.h 2010-04-04 20:46:41.569782507 -0400 22917+++ linux-2.6.32.12/drivers/char/hvc_console.h 2010-04-04 20:46:41.569782507 -0400
22700@@ -55,7 +55,7 @@ struct hvc_struct { 22918@@ -55,7 +55,7 @@ struct hvc_struct {
22701 int outbuf_size; 22919 int outbuf_size;
22702 int n_outbuf; 22920 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
22720 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */ 22938 /* remove a vterm from hvc tty operation (module_exit or hotplug remove) */
22721 extern int hvc_remove(struct hvc_struct *hp); 22939 extern int hvc_remove(struct hvc_struct *hp);
22722 22940
22723diff -urNp linux-2.6.32.11/drivers/char/hvc_iseries.c linux-2.6.32.11/drivers/char/hvc_iseries.c 22941diff -urNp linux-2.6.32.12/drivers/char/hvc_iseries.c linux-2.6.32.12/drivers/char/hvc_iseries.c
22724--- linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400 22942--- linux-2.6.32.12/drivers/char/hvc_iseries.c 2010-03-15 11:52:04.000000000 -0400
22725+++ linux-2.6.32.11/drivers/char/hvc_iseries.c 2010-04-04 20:46:41.569782507 -0400 22943+++ linux-2.6.32.12/drivers/char/hvc_iseries.c 2010-04-04 20:46:41.569782507 -0400
22726@@ -197,7 +197,7 @@ done: 22944@@ -197,7 +197,7 @@ done:
22727 return sent; 22945 return sent;
22728 } 22946 }
@@ -22732,9 +22950,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_iseries.c linux-2.6.32.11/drivers/ch
22732 .get_chars = get_chars, 22950 .get_chars = get_chars,
22733 .put_chars = put_chars, 22951 .put_chars = put_chars,
22734 .notifier_add = notifier_add_irq, 22952 .notifier_add = notifier_add_irq,
22735diff -urNp linux-2.6.32.11/drivers/char/hvc_iucv.c linux-2.6.32.11/drivers/char/hvc_iucv.c 22953diff -urNp linux-2.6.32.12/drivers/char/hvc_iucv.c linux-2.6.32.12/drivers/char/hvc_iucv.c
22736--- linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400 22954--- linux-2.6.32.12/drivers/char/hvc_iucv.c 2010-03-15 11:52:04.000000000 -0400
22737+++ linux-2.6.32.11/drivers/char/hvc_iucv.c 2010-04-04 20:46:41.569782507 -0400 22955+++ linux-2.6.32.12/drivers/char/hvc_iucv.c 2010-04-04 20:46:41.569782507 -0400
22738@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru 22956@@ -922,7 +922,7 @@ static int hvc_iucv_pm_restore_thaw(stru
22739 22957
22740 22958
@@ -22744,9 +22962,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_iucv.c linux-2.6.32.11/drivers/char/
22744 .get_chars = hvc_iucv_get_chars, 22962 .get_chars = hvc_iucv_get_chars,
22745 .put_chars = hvc_iucv_put_chars, 22963 .put_chars = hvc_iucv_put_chars,
22746 .notifier_add = hvc_iucv_notifier_add, 22964 .notifier_add = hvc_iucv_notifier_add,
22747diff -urNp linux-2.6.32.11/drivers/char/hvc_rtas.c linux-2.6.32.11/drivers/char/hvc_rtas.c 22965diff -urNp linux-2.6.32.12/drivers/char/hvc_rtas.c linux-2.6.32.12/drivers/char/hvc_rtas.c
22748--- linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400 22966--- linux-2.6.32.12/drivers/char/hvc_rtas.c 2010-03-15 11:52:04.000000000 -0400
22749+++ linux-2.6.32.11/drivers/char/hvc_rtas.c 2010-04-04 20:46:41.569782507 -0400 22967+++ linux-2.6.32.12/drivers/char/hvc_rtas.c 2010-04-04 20:46:41.569782507 -0400
22750@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_ 22968@@ -71,7 +71,7 @@ static int hvc_rtas_read_console(uint32_
22751 return i; 22969 return i;
22752 } 22970 }
@@ -22756,9 +22974,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_rtas.c linux-2.6.32.11/drivers/char/
22756 .get_chars = hvc_rtas_read_console, 22974 .get_chars = hvc_rtas_read_console,
22757 .put_chars = hvc_rtas_write_console, 22975 .put_chars = hvc_rtas_write_console,
22758 }; 22976 };
22759diff -urNp linux-2.6.32.11/drivers/char/hvcs.c linux-2.6.32.11/drivers/char/hvcs.c 22977diff -urNp linux-2.6.32.12/drivers/char/hvcs.c linux-2.6.32.12/drivers/char/hvcs.c
22760--- linux-2.6.32.11/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400 22978--- linux-2.6.32.12/drivers/char/hvcs.c 2010-03-15 11:52:04.000000000 -0400
22761+++ linux-2.6.32.11/drivers/char/hvcs.c 2010-04-04 20:46:41.573523483 -0400 22979+++ linux-2.6.32.12/drivers/char/hvcs.c 2010-04-04 20:46:41.573523483 -0400
22762@@ -269,7 +269,7 @@ struct hvcs_struct { 22980@@ -269,7 +269,7 @@ struct hvcs_struct {
22763 unsigned int index; 22981 unsigned int index;
22764 22982
@@ -22853,9 +23071,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvcs.c linux-2.6.32.11/drivers/char/hvcs
22853 return 0; 23071 return 0;
22854 23072
22855 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer; 23073 return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
22856diff -urNp linux-2.6.32.11/drivers/char/hvc_udbg.c linux-2.6.32.11/drivers/char/hvc_udbg.c 23074diff -urNp linux-2.6.32.12/drivers/char/hvc_udbg.c linux-2.6.32.12/drivers/char/hvc_udbg.c
22857--- linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400 23075--- linux-2.6.32.12/drivers/char/hvc_udbg.c 2010-03-15 11:52:04.000000000 -0400
22858+++ linux-2.6.32.11/drivers/char/hvc_udbg.c 2010-04-04 20:46:41.573523483 -0400 23076+++ linux-2.6.32.12/drivers/char/hvc_udbg.c 2010-04-04 20:46:41.573523483 -0400
22859@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno 23077@@ -58,7 +58,7 @@ static int hvc_udbg_get(uint32_t vtermno
22860 return i; 23078 return i;
22861 } 23079 }
@@ -22865,9 +23083,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_udbg.c linux-2.6.32.11/drivers/char/
22865 .get_chars = hvc_udbg_get, 23083 .get_chars = hvc_udbg_get,
22866 .put_chars = hvc_udbg_put, 23084 .put_chars = hvc_udbg_put,
22867 }; 23085 };
22868diff -urNp linux-2.6.32.11/drivers/char/hvc_vio.c linux-2.6.32.11/drivers/char/hvc_vio.c 23086diff -urNp linux-2.6.32.12/drivers/char/hvc_vio.c linux-2.6.32.12/drivers/char/hvc_vio.c
22869--- linux-2.6.32.11/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400 23087--- linux-2.6.32.12/drivers/char/hvc_vio.c 2010-03-15 11:52:04.000000000 -0400
22870+++ linux-2.6.32.11/drivers/char/hvc_vio.c 2010-04-04 20:46:41.573523483 -0400 23088+++ linux-2.6.32.12/drivers/char/hvc_vio.c 2010-04-04 20:46:41.573523483 -0400
22871@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v 23089@@ -77,7 +77,7 @@ static int filtered_get_chars(uint32_t v
22872 return got; 23090 return got;
22873 } 23091 }
@@ -22877,9 +23095,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_vio.c linux-2.6.32.11/drivers/char/h
22877 .get_chars = filtered_get_chars, 23095 .get_chars = filtered_get_chars,
22878 .put_chars = hvc_put_chars, 23096 .put_chars = hvc_put_chars,
22879 .notifier_add = notifier_add_irq, 23097 .notifier_add = notifier_add_irq,
22880diff -urNp linux-2.6.32.11/drivers/char/hvc_xen.c linux-2.6.32.11/drivers/char/hvc_xen.c 23098diff -urNp linux-2.6.32.12/drivers/char/hvc_xen.c linux-2.6.32.12/drivers/char/hvc_xen.c
22881--- linux-2.6.32.11/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400 23099--- linux-2.6.32.12/drivers/char/hvc_xen.c 2010-03-15 11:52:04.000000000 -0400
22882+++ linux-2.6.32.11/drivers/char/hvc_xen.c 2010-04-04 20:46:41.573523483 -0400 23100+++ linux-2.6.32.12/drivers/char/hvc_xen.c 2010-04-04 20:46:41.573523483 -0400
22883@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno 23101@@ -120,7 +120,7 @@ static int read_console(uint32_t vtermno
22884 return recv; 23102 return recv;
22885 } 23103 }
@@ -22889,9 +23107,9 @@ diff -urNp linux-2.6.32.11/drivers/char/hvc_xen.c linux-2.6.32.11/drivers/char/h
22889 .get_chars = read_console, 23107 .get_chars = read_console,
22890 .put_chars = write_console, 23108 .put_chars = write_console,
22891 .notifier_add = notifier_add_irq, 23109 .notifier_add = notifier_add_irq,
22892diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 23110diff -urNp linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c
22893--- linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400 23111--- linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c 2010-03-15 11:52:04.000000000 -0400
22894+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_msghandler.c 2010-04-04 20:46:41.573523483 -0400 23112+++ linux-2.6.32.12/drivers/char/ipmi/ipmi_msghandler.c 2010-04-04 20:46:41.573523483 -0400
22895@@ -414,7 +414,7 @@ struct ipmi_smi { 23113@@ -414,7 +414,7 @@ struct ipmi_smi {
22896 struct proc_dir_entry *proc_dir; 23114 struct proc_dir_entry *proc_dir;
22897 char proc_dir_name[10]; 23115 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
22922 23140
22923 intf->proc_dir = NULL; 23141 intf->proc_dir = NULL;
22924 23142
22925diff -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 23143diff -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
22926--- linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400 23144--- linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c 2010-03-15 11:52:04.000000000 -0400
22927+++ linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c 2010-04-04 20:46:41.573523483 -0400 23145+++ linux-2.6.32.12/drivers/char/ipmi/ipmi_si_intf.c 2010-04-04 20:46:41.573523483 -0400
22928@@ -277,7 +277,7 @@ struct smi_info { 23146@@ -277,7 +277,7 @@ struct smi_info {
22929 unsigned char slave_addr; 23147 unsigned char slave_addr;
22930 23148
@@ -22955,9 +23173,9 @@ diff -urNp linux-2.6.32.11/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.32.11/driv
22955 23173
22956 new_smi->interrupt_disabled = 0; 23174 new_smi->interrupt_disabled = 0;
22957 atomic_set(&new_smi->stop_operation, 0); 23175 atomic_set(&new_smi->stop_operation, 0);
22958diff -urNp linux-2.6.32.11/drivers/char/keyboard.c linux-2.6.32.11/drivers/char/keyboard.c 23176diff -urNp linux-2.6.32.12/drivers/char/keyboard.c linux-2.6.32.12/drivers/char/keyboard.c
22959--- linux-2.6.32.11/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400 23177--- linux-2.6.32.12/drivers/char/keyboard.c 2010-03-15 11:52:04.000000000 -0400
22960+++ linux-2.6.32.11/drivers/char/keyboard.c 2010-04-04 20:46:41.573523483 -0400 23178+++ linux-2.6.32.12/drivers/char/keyboard.c 2010-04-04 20:46:41.573523483 -0400
22961@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u 23179@@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u
22962 kbd->kbdmode == VC_MEDIUMRAW) && 23180 kbd->kbdmode == VC_MEDIUMRAW) &&
22963 value != KVAL(K_SAK)) 23181 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/
22984 }; 23202 };
22985 23203
22986 MODULE_DEVICE_TABLE(input, kbd_ids); 23204 MODULE_DEVICE_TABLE(input, kbd_ids);
22987diff -urNp linux-2.6.32.11/drivers/char/mem.c linux-2.6.32.11/drivers/char/mem.c 23205diff -urNp linux-2.6.32.12/drivers/char/mem.c linux-2.6.32.12/drivers/char/mem.c
22988--- linux-2.6.32.11/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400 23206--- linux-2.6.32.12/drivers/char/mem.c 2010-03-15 11:52:04.000000000 -0400
22989+++ linux-2.6.32.11/drivers/char/mem.c 2010-04-04 20:46:41.573523483 -0400 23207+++ linux-2.6.32.12/drivers/char/mem.c 2010-04-04 20:46:41.573523483 -0400
22990@@ -18,6 +18,7 @@ 23208@@ -18,6 +18,7 @@
22991 #include <linux/raw.h> 23209 #include <linux/raw.h>
22992 #include <linux/tty.h> 23210 #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
23077 }; 23295 };
23078 23296
23079 static int memory_open(struct inode *inode, struct file *filp) 23297 static int memory_open(struct inode *inode, struct file *filp)
23080diff -urNp linux-2.6.32.11/drivers/char/nvram.c linux-2.6.32.11/drivers/char/nvram.c 23298diff -urNp linux-2.6.32.12/drivers/char/nvram.c linux-2.6.32.12/drivers/char/nvram.c
23081--- linux-2.6.32.11/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400 23299--- linux-2.6.32.12/drivers/char/nvram.c 2010-03-15 11:52:04.000000000 -0400
23082+++ linux-2.6.32.11/drivers/char/nvram.c 2010-04-04 20:46:41.573523483 -0400 23300+++ linux-2.6.32.12/drivers/char/nvram.c 2010-04-04 20:46:41.573523483 -0400
23083@@ -429,7 +429,10 @@ static const struct file_operations nvra 23301@@ -429,7 +429,10 @@ static const struct file_operations nvra
23084 static struct miscdevice nvram_dev = { 23302 static struct miscdevice nvram_dev = {
23085 NVRAM_MINOR, 23303 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
23092 }; 23310 };
23093 23311
23094 static int __init nvram_init(void) 23312 static int __init nvram_init(void)
23095diff -urNp linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 23313diff -urNp linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c
23096--- linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400 23314--- linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c 2010-03-15 11:52:04.000000000 -0400
23097+++ linux-2.6.32.11/drivers/char/pcmcia/ipwireless/tty.c 2010-04-04 20:46:41.573523483 -0400 23315+++ linux-2.6.32.12/drivers/char/pcmcia/ipwireless/tty.c 2010-04-04 20:46:41.573523483 -0400
23098@@ -51,7 +51,7 @@ struct ipw_tty { 23316@@ -51,7 +51,7 @@ struct ipw_tty {
23099 int tty_type; 23317 int tty_type;
23100 struct ipw_network *network; 23318 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/
23209 do_ipw_close(ttyj); 23427 do_ipw_close(ttyj);
23210 ipwireless_disassociate_network_ttys(network, 23428 ipwireless_disassociate_network_ttys(network,
23211 ttyj->channel_idx); 23429 ttyj->channel_idx);
23212diff -urNp linux-2.6.32.11/drivers/char/pty.c linux-2.6.32.11/drivers/char/pty.c 23430diff -urNp linux-2.6.32.12/drivers/char/pty.c linux-2.6.32.12/drivers/char/pty.c
23213--- linux-2.6.32.11/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400 23431--- linux-2.6.32.12/drivers/char/pty.c 2010-03-15 11:52:04.000000000 -0400
23214+++ linux-2.6.32.11/drivers/char/pty.c 2010-04-04 20:46:41.573523483 -0400 23432+++ linux-2.6.32.12/drivers/char/pty.c 2010-04-04 20:46:41.573523483 -0400
23215@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode 23433@@ -682,7 +682,18 @@ static int ptmx_open(struct inode *inode
23216 return ret; 23434 return ret;
23217 } 23435 }
@@ -23242,9 +23460,9 @@ diff -urNp linux-2.6.32.11/drivers/char/pty.c linux-2.6.32.11/drivers/char/pty.c
23242 cdev_init(&ptmx_cdev, &ptmx_fops); 23460 cdev_init(&ptmx_cdev, &ptmx_fops);
23243 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) || 23461 if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
23244 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0) 23462 register_chrdev_region(MKDEV(TTYAUX_MAJOR, 2), 1, "/dev/ptmx") < 0)
23245diff -urNp linux-2.6.32.11/drivers/char/random.c linux-2.6.32.11/drivers/char/random.c 23463diff -urNp linux-2.6.32.12/drivers/char/random.c linux-2.6.32.12/drivers/char/random.c
23246--- linux-2.6.32.11/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400 23464--- linux-2.6.32.12/drivers/char/random.c 2010-03-15 11:52:04.000000000 -0400
23247+++ linux-2.6.32.11/drivers/char/random.c 2010-04-04 20:46:41.573523483 -0400 23465+++ linux-2.6.32.12/drivers/char/random.c 2010-04-04 20:46:41.573523483 -0400
23248@@ -254,8 +254,13 @@ 23466@@ -254,8 +254,13 @@
23249 /* 23467 /*
23250 * Configuration information 23468 * 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
23286 static int max_write_thresh = INPUT_POOL_WORDS * 32; 23504 static int max_write_thresh = INPUT_POOL_WORDS * 32;
23287 static char sysctl_bootid[16]; 23505 static char sysctl_bootid[16];
23288 23506
23289diff -urNp linux-2.6.32.11/drivers/char/sonypi.c linux-2.6.32.11/drivers/char/sonypi.c 23507diff -urNp linux-2.6.32.12/drivers/char/sonypi.c linux-2.6.32.12/drivers/char/sonypi.c
23290--- linux-2.6.32.11/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400 23508--- linux-2.6.32.12/drivers/char/sonypi.c 2010-03-15 11:52:04.000000000 -0400
23291+++ linux-2.6.32.11/drivers/char/sonypi.c 2010-04-04 20:46:41.573523483 -0400 23509+++ linux-2.6.32.12/drivers/char/sonypi.c 2010-04-04 20:46:41.573523483 -0400
23292@@ -491,7 +491,7 @@ static struct sonypi_device { 23510@@ -491,7 +491,7 @@ static struct sonypi_device {
23293 spinlock_t fifo_lock; 23511 spinlock_t fifo_lock;
23294 wait_queue_head_t fifo_proc_list; 23512 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
23319 mutex_unlock(&sonypi_device.lock); 23537 mutex_unlock(&sonypi_device.lock);
23320 unlock_kernel(); 23538 unlock_kernel();
23321 return 0; 23539 return 0;
23322diff -urNp linux-2.6.32.11/drivers/char/tpm/tpm_bios.c linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 23540diff -urNp linux-2.6.32.12/drivers/char/tpm/tpm_bios.c linux-2.6.32.12/drivers/char/tpm/tpm_bios.c
23323--- linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400 23541--- linux-2.6.32.12/drivers/char/tpm/tpm_bios.c 2010-03-15 11:52:04.000000000 -0400
23324+++ linux-2.6.32.11/drivers/char/tpm/tpm_bios.c 2010-04-04 20:46:41.573523483 -0400 23542+++ linux-2.6.32.12/drivers/char/tpm/tpm_bios.c 2010-04-04 20:46:41.573523483 -0400
23325@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start 23543@@ -172,7 +172,7 @@ static void *tpm_bios_measurements_start
23326 event = addr; 23544 event = addr;
23327 23545
@@ -23362,9 +23580,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tpm/tpm_bios.c linux-2.6.32.11/drivers/c
23362 23580
23363 memcpy(log->bios_event_log, virt, len); 23581 memcpy(log->bios_event_log, virt, len);
23364 23582
23365diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tty_io.c 23583diff -urNp linux-2.6.32.12/drivers/char/tty_io.c linux-2.6.32.12/drivers/char/tty_io.c
23366--- linux-2.6.32.11/drivers/char/tty_io.c 2010-03-15 11:52:04.000000000 -0400 23584--- linux-2.6.32.12/drivers/char/tty_io.c 2010-04-29 17:49:37.826084348 -0400
23367+++ linux-2.6.32.11/drivers/char/tty_io.c 2010-04-04 20:46:41.577798214 -0400 23585+++ linux-2.6.32.12/drivers/char/tty_io.c 2010-04-29 17:49:58.141506968 -0400
23368@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list 23586@@ -136,21 +136,10 @@ LIST_HEAD(tty_drivers); /* linked list
23369 DEFINE_MUTEX(tty_mutex); 23587 DEFINE_MUTEX(tty_mutex);
23370 EXPORT_SYMBOL(tty_mutex); 23588 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
23423 ssize_t redirected_tty_write(struct file *file, const char __user *buf, 23641 ssize_t redirected_tty_write(struct file *file, const char __user *buf,
23424 size_t count, loff_t *ppos) 23642 size_t count, loff_t *ppos)
23425 { 23643 {
23426@@ -1865,7 +1858,7 @@ static int tty_open(struct inode *inode, 23644@@ -1867,7 +1860,7 @@ static int tty_open(struct inode *inode,
23427 * Takes bkl. See tty_release_dev 23645 * Takes bkl. See tty_release_dev
23428 */ 23646 */
23429 23647
@@ -23432,7 +23650,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23432 { 23650 {
23433 lock_kernel(); 23651 lock_kernel();
23434 tty_release_dev(filp); 23652 tty_release_dev(filp);
23435@@ -1873,6 +1866,8 @@ static int tty_release(struct inode *ino 23653@@ -1875,6 +1868,8 @@ static int tty_release(struct inode *ino
23436 return 0; 23654 return 0;
23437 } 23655 }
23438 23656
@@ -23441,7 +23659,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23441 /** 23659 /**
23442 * tty_poll - check tty status 23660 * tty_poll - check tty status
23443 * @filp: file being polled 23661 * @filp: file being polled
23444@@ -1885,7 +1880,7 @@ static int tty_release(struct inode *ino 23662@@ -1887,7 +1882,7 @@ static int tty_release(struct inode *ino
23445 * may be re-entered freely by other callers. 23663 * may be re-entered freely by other callers.
23446 */ 23664 */
23447 23665
@@ -23450,7 +23668,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23450 { 23668 {
23451 struct tty_struct *tty; 23669 struct tty_struct *tty;
23452 struct tty_ldisc *ld; 23670 struct tty_ldisc *ld;
23453@@ -1902,7 +1897,9 @@ static unsigned int tty_poll(struct file 23671@@ -1904,7 +1899,9 @@ static unsigned int tty_poll(struct file
23454 return ret; 23672 return ret;
23455 } 23673 }
23456 23674
@@ -23461,7 +23679,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23461 { 23679 {
23462 struct tty_struct *tty; 23680 struct tty_struct *tty;
23463 unsigned long flags; 23681 unsigned long flags;
23464@@ -1946,6 +1943,8 @@ out: 23682@@ -1948,6 +1945,8 @@ out:
23465 return retval; 23683 return retval;
23466 } 23684 }
23467 23685
@@ -23470,7 +23688,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23470 /** 23688 /**
23471 * tiocsti - fake input character 23689 * tiocsti - fake input character
23472 * @tty: tty to fake input into 23690 * @tty: tty to fake input into
23473@@ -2580,8 +2579,10 @@ long tty_ioctl(struct file *file, unsign 23691@@ -2582,8 +2581,10 @@ long tty_ioctl(struct file *file, unsign
23474 return retval; 23692 return retval;
23475 } 23693 }
23476 23694
@@ -23482,7 +23700,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23482 unsigned long arg) 23700 unsigned long arg)
23483 { 23701 {
23484 struct inode *inode = file->f_dentry->d_inode; 23702 struct inode *inode = file->f_dentry->d_inode;
23485@@ -2605,6 +2606,8 @@ static long tty_compat_ioctl(struct file 23703@@ -2607,6 +2608,8 @@ static long tty_compat_ioctl(struct file
23486 23704
23487 return retval; 23705 return retval;
23488 } 23706 }
@@ -23491,7 +23709,7 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23491 #endif 23709 #endif
23492 23710
23493 /* 23711 /*
23494@@ -3048,11 +3051,6 @@ struct tty_struct *get_current_tty(void) 23712@@ -3050,11 +3053,6 @@ struct tty_struct *get_current_tty(void)
23495 } 23713 }
23496 EXPORT_SYMBOL_GPL(get_current_tty); 23714 EXPORT_SYMBOL_GPL(get_current_tty);
23497 23715
@@ -23503,9 +23721,9 @@ diff -urNp linux-2.6.32.11/drivers/char/tty_io.c linux-2.6.32.11/drivers/char/tt
23503 /* 23721 /*
23504 * Initialize the console device. This is called *early*, so 23722 * Initialize the console device. This is called *early*, so
23505 * we can't necessarily depend on lots of kernel help here. 23723 * we can't necessarily depend on lots of kernel help here.
23506diff -urNp linux-2.6.32.11/drivers/char/tty_ldisc.c linux-2.6.32.11/drivers/char/tty_ldisc.c 23724diff -urNp linux-2.6.32.12/drivers/char/tty_ldisc.c linux-2.6.32.12/drivers/char/tty_ldisc.c
23507--- linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400 23725--- linux-2.6.32.12/drivers/char/tty_ldisc.c 2010-03-15 11:52:04.000000000 -0400
23508+++ linux-2.6.32.11/drivers/char/tty_ldisc.c 2010-04-04 20:46:41.577798214 -0400 23726+++ linux-2.6.32.12/drivers/char/tty_ldisc.c 2010-04-04 20:46:41.577798214 -0400
23509@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc * 23727@@ -73,7 +73,7 @@ static void put_ldisc(struct tty_ldisc *
23510 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) { 23728 if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
23511 struct tty_ldisc_ops *ldo = ld->ops; 23729 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
23551 module_put(ldops->owner); 23769 module_put(ldops->owner);
23552 spin_unlock_irqrestore(&tty_ldisc_lock, flags); 23770 spin_unlock_irqrestore(&tty_ldisc_lock, flags);
23553 } 23771 }
23554diff -urNp linux-2.6.32.11/drivers/char/virtio_console.c linux-2.6.32.11/drivers/char/virtio_console.c 23772diff -urNp linux-2.6.32.12/drivers/char/virtio_console.c linux-2.6.32.12/drivers/char/virtio_console.c
23555--- linux-2.6.32.11/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400 23773--- linux-2.6.32.12/drivers/char/virtio_console.c 2010-03-15 11:52:04.000000000 -0400
23556+++ linux-2.6.32.11/drivers/char/virtio_console.c 2010-04-04 20:46:41.577798214 -0400 23774+++ linux-2.6.32.12/drivers/char/virtio_console.c 2010-04-04 20:46:41.577798214 -0400
23557@@ -44,6 +44,7 @@ static unsigned int in_len; 23775@@ -44,6 +44,7 @@ static unsigned int in_len;
23558 static char *in, *inbuf; 23776 static char *in, *inbuf;
23559 23777
@@ -23562,9 +23780,9 @@ diff -urNp linux-2.6.32.11/drivers/char/virtio_console.c linux-2.6.32.11/drivers
23562 static struct hv_ops virtio_cons; 23780 static struct hv_ops virtio_cons;
23563 23781
23564 /* The hvc device */ 23782 /* The hvc device */
23565diff -urNp linux-2.6.32.11/drivers/char/vt_ioctl.c linux-2.6.32.11/drivers/char/vt_ioctl.c 23783diff -urNp linux-2.6.32.12/drivers/char/vt_ioctl.c linux-2.6.32.12/drivers/char/vt_ioctl.c
23566--- linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400 23784--- linux-2.6.32.12/drivers/char/vt_ioctl.c 2010-03-15 11:52:04.000000000 -0400
23567+++ linux-2.6.32.11/drivers/char/vt_ioctl.c 2010-04-04 20:46:41.577798214 -0400 23785+++ linux-2.6.32.12/drivers/char/vt_ioctl.c 2010-04-04 20:46:41.577798214 -0400
23568@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ 23786@@ -226,6 +226,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __
23569 case KDSKBENT: 23787 case KDSKBENT:
23570 if (!perm) 23788 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/
23592 q = func_table[i]; 23810 q = func_table[i];
23593 first_free = funcbufptr + (funcbufsize - funcbufleft); 23811 first_free = funcbufptr + (funcbufsize - funcbufleft);
23594 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) 23812 for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++)
23595diff -urNp linux-2.6.32.11/drivers/cpufreq/cpufreq.c linux-2.6.32.11/drivers/cpufreq/cpufreq.c 23813diff -urNp linux-2.6.32.12/drivers/cpufreq/cpufreq.c linux-2.6.32.12/drivers/cpufreq/cpufreq.c
23596--- linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400 23814--- linux-2.6.32.12/drivers/cpufreq/cpufreq.c 2010-03-15 11:52:04.000000000 -0400
23597+++ linux-2.6.32.11/drivers/cpufreq/cpufreq.c 2010-04-04 20:46:41.577798214 -0400 23815+++ linux-2.6.32.12/drivers/cpufreq/cpufreq.c 2010-04-04 20:46:41.577798214 -0400
23598@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct 23816@@ -750,7 +750,7 @@ static void cpufreq_sysfs_release(struct
23599 complete(&policy->kobj_unregister); 23817 complete(&policy->kobj_unregister);
23600 } 23818 }
@@ -23604,9 +23822,9 @@ diff -urNp linux-2.6.32.11/drivers/cpufreq/cpufreq.c linux-2.6.32.11/drivers/cpu
23604 .show = show, 23822 .show = show,
23605 .store = store, 23823 .store = store,
23606 }; 23824 };
23607diff -urNp linux-2.6.32.11/drivers/cpuidle/sysfs.c linux-2.6.32.11/drivers/cpuidle/sysfs.c 23825diff -urNp linux-2.6.32.12/drivers/cpuidle/sysfs.c linux-2.6.32.12/drivers/cpuidle/sysfs.c
23608--- linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400 23826--- linux-2.6.32.12/drivers/cpuidle/sysfs.c 2010-03-15 11:52:04.000000000 -0400
23609+++ linux-2.6.32.11/drivers/cpuidle/sysfs.c 2010-04-04 20:46:41.577798214 -0400 23827+++ linux-2.6.32.12/drivers/cpuidle/sysfs.c 2010-04-29 17:46:36.917238919 -0400
23610@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj 23828@@ -191,7 +191,7 @@ static ssize_t cpuidle_store(struct kobj
23611 return ret; 23829 return ret;
23612 } 23830 }
@@ -23625,9 +23843,18 @@ diff -urNp linux-2.6.32.11/drivers/cpuidle/sysfs.c linux-2.6.32.11/drivers/cpuid
23625 .show = cpuidle_state_show, 23843 .show = cpuidle_state_show,
23626 }; 23844 };
23627 23845
23628diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.c linux-2.6.32.11/drivers/dma/ioat/dma.c 23846@@ -294,7 +294,7 @@ static struct kobj_type ktype_state_cpui
23629--- linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400 23847 .release = cpuidle_state_sysfs_release,
23630+++ linux-2.6.32.11/drivers/dma/ioat/dma.c 2010-04-04 20:46:41.577798214 -0400 23848 };
23849
23850-static void inline cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
23851+static inline void cpuidle_free_state_kobj(struct cpuidle_device *device, int i)
23852 {
23853 kobject_put(&device->kobjs[i]->kobj);
23854 wait_for_completion(&device->kobjs[i]->kobj_unregister);
23855diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.c linux-2.6.32.12/drivers/dma/ioat/dma.c
23856--- linux-2.6.32.12/drivers/dma/ioat/dma.c 2010-03-15 11:52:04.000000000 -0400
23857+++ linux-2.6.32.12/drivers/dma/ioat/dma.c 2010-04-04 20:46:41.577798214 -0400
23631@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str 23858@@ -1146,7 +1146,7 @@ ioat_attr_show(struct kobject *kobj, str
23632 return entry->show(&chan->common, page); 23859 return entry->show(&chan->common, page);
23633 } 23860 }
@@ -23637,9 +23864,9 @@ diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.c linux-2.6.32.11/drivers/dma/io
23637 .show = ioat_attr_show, 23864 .show = ioat_attr_show,
23638 }; 23865 };
23639 23866
23640diff -urNp linux-2.6.32.11/drivers/dma/ioat/dma.h linux-2.6.32.11/drivers/dma/ioat/dma.h 23867diff -urNp linux-2.6.32.12/drivers/dma/ioat/dma.h linux-2.6.32.12/drivers/dma/ioat/dma.h
23641--- linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400 23868--- linux-2.6.32.12/drivers/dma/ioat/dma.h 2010-03-15 11:52:04.000000000 -0400
23642+++ linux-2.6.32.11/drivers/dma/ioat/dma.h 2010-04-04 20:46:41.577798214 -0400 23869+++ linux-2.6.32.12/drivers/dma/ioat/dma.h 2010-04-04 20:46:41.577798214 -0400
23643@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c 23870@@ -347,7 +347,7 @@ bool ioat_cleanup_preamble(struct ioat_c
23644 unsigned long *phys_complete); 23871 unsigned long *phys_complete);
23645 void ioat_kobject_add(struct ioatdma_device *device, struct kobj_type *type); 23872 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
23649 extern struct ioat_sysfs_entry ioat_version_attr; 23876 extern struct ioat_sysfs_entry ioat_version_attr;
23650 extern struct ioat_sysfs_entry ioat_cap_attr; 23877 extern struct ioat_sysfs_entry ioat_cap_attr;
23651 #endif /* IOATDMA_H */ 23878 #endif /* IOATDMA_H */
23652diff -urNp linux-2.6.32.11/drivers/edac/edac_core.h linux-2.6.32.11/drivers/edac/edac_core.h 23879diff -urNp linux-2.6.32.12/drivers/edac/edac_core.h linux-2.6.32.12/drivers/edac/edac_core.h
23653--- linux-2.6.32.11/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400 23880--- linux-2.6.32.12/drivers/edac/edac_core.h 2010-03-15 11:52:04.000000000 -0400
23654+++ linux-2.6.32.11/drivers/edac/edac_core.h 2010-04-04 20:46:41.577798214 -0400 23881+++ linux-2.6.32.12/drivers/edac/edac_core.h 2010-04-04 20:46:41.577798214 -0400
23655@@ -99,11 +99,11 @@ extern int edac_debug_level; 23882@@ -99,11 +99,11 @@ extern int edac_debug_level;
23656 23883
23657 #else /* !CONFIG_EDAC_DEBUG */ 23884 #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
23669 23896
23670 #endif /* !CONFIG_EDAC_DEBUG */ 23897 #endif /* !CONFIG_EDAC_DEBUG */
23671 23898
23672diff -urNp linux-2.6.32.11/drivers/edac/edac_device_sysfs.c linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 23899diff -urNp linux-2.6.32.12/drivers/edac/edac_device_sysfs.c linux-2.6.32.12/drivers/edac/edac_device_sysfs.c
23673--- linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400 23900--- linux-2.6.32.12/drivers/edac/edac_device_sysfs.c 2010-03-15 11:52:04.000000000 -0400
23674+++ linux-2.6.32.11/drivers/edac/edac_device_sysfs.c 2010-04-04 20:46:41.577798214 -0400 23901+++ linux-2.6.32.12/drivers/edac/edac_device_sysfs.c 2010-04-04 20:46:41.577798214 -0400
23675@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s 23902@@ -137,7 +137,7 @@ static ssize_t edac_dev_ctl_info_store(s
23676 } 23903 }
23677 23904
@@ -23699,9 +23926,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_device_sysfs.c linux-2.6.32.11/driv
23699 .show = edac_dev_block_show, 23926 .show = edac_dev_block_show,
23700 .store = edac_dev_block_store 23927 .store = edac_dev_block_store
23701 }; 23928 };
23702diff -urNp linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 23929diff -urNp linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c
23703--- linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400 23930--- linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c 2010-03-15 11:52:04.000000000 -0400
23704+++ linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c 2010-04-04 20:46:41.577798214 -0400 23931+++ linux-2.6.32.12/drivers/edac/edac_mc_sysfs.c 2010-04-04 20:46:41.577798214 -0400
23705@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob 23932@@ -245,7 +245,7 @@ static ssize_t csrowdev_store(struct kob
23706 return -EIO; 23933 return -EIO;
23707 } 23934 }
@@ -23720,9 +23947,9 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_mc_sysfs.c linux-2.6.32.11/drivers/
23720 .show = mcidev_show, 23947 .show = mcidev_show,
23721 .store = mcidev_store 23948 .store = mcidev_store
23722 }; 23949 };
23723diff -urNp linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 23950diff -urNp linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c
23724--- linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400 23951--- linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c 2010-03-15 11:52:04.000000000 -0400
23725+++ linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c 2010-04-04 20:46:41.577798214 -0400 23952+++ linux-2.6.32.12/drivers/edac/edac_pci_sysfs.c 2010-04-04 20:46:41.577798214 -0400
23726@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s 23953@@ -121,7 +121,7 @@ static ssize_t edac_pci_instance_store(s
23727 } 23954 }
23728 23955
@@ -23741,9 +23968,22 @@ diff -urNp linux-2.6.32.11/drivers/edac/edac_pci_sysfs.c linux-2.6.32.11/drivers
23741 .show = edac_pci_dev_show, 23968 .show = edac_pci_dev_show,
23742 .store = edac_pci_dev_store 23969 .store = edac_pci_dev_store
23743 }; 23970 };
23744diff -urNp linux-2.6.32.11/drivers/firmware/dmi_scan.c linux-2.6.32.11/drivers/firmware/dmi_scan.c 23971diff -urNp linux-2.6.32.12/drivers/firewire/core-cdev.c linux-2.6.32.12/drivers/firewire/core-cdev.c
23745--- linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400 23972--- linux-2.6.32.12/drivers/firewire/core-cdev.c 2010-03-15 11:52:04.000000000 -0400
23746+++ linux-2.6.32.11/drivers/firmware/dmi_scan.c 2010-04-04 20:46:41.577798214 -0400 23973+++ linux-2.6.32.12/drivers/firewire/core-cdev.c 2010-04-29 17:46:37.101039010 -0400
23974@@ -1141,8 +1141,7 @@ static int init_iso_resource(struct clie
23975 int ret;
23976
23977 if ((request->channels == 0 && request->bandwidth == 0) ||
23978- request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL ||
23979- request->bandwidth < 0)
23980+ request->bandwidth > BANDWIDTH_AVAILABLE_INITIAL)
23981 return -EINVAL;
23982
23983 r = kmalloc(sizeof(*r), GFP_KERNEL);
23984diff -urNp linux-2.6.32.12/drivers/firmware/dmi_scan.c linux-2.6.32.12/drivers/firmware/dmi_scan.c
23985--- linux-2.6.32.12/drivers/firmware/dmi_scan.c 2010-03-15 11:52:04.000000000 -0400
23986+++ linux-2.6.32.12/drivers/firmware/dmi_scan.c 2010-04-04 20:46:41.577798214 -0400
23747@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) 23987@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void)
23748 } 23988 }
23749 } 23989 }
@@ -23756,9 +23996,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/dmi_scan.c linux-2.6.32.11/drivers/f
23756 p = dmi_ioremap(0xF0000, 0x10000); 23996 p = dmi_ioremap(0xF0000, 0x10000);
23757 if (p == NULL) 23997 if (p == NULL)
23758 goto error; 23998 goto error;
23759diff -urNp linux-2.6.32.11/drivers/firmware/edd.c linux-2.6.32.11/drivers/firmware/edd.c 23999diff -urNp linux-2.6.32.12/drivers/firmware/edd.c linux-2.6.32.12/drivers/firmware/edd.c
23760--- linux-2.6.32.11/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400 24000--- linux-2.6.32.12/drivers/firmware/edd.c 2010-03-15 11:52:04.000000000 -0400
23761+++ linux-2.6.32.11/drivers/firmware/edd.c 2010-04-04 20:46:41.577798214 -0400 24001+++ linux-2.6.32.12/drivers/firmware/edd.c 2010-04-04 20:46:41.577798214 -0400
23762@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str 24002@@ -122,7 +122,7 @@ edd_attr_show(struct kobject * kobj, str
23763 return ret; 24003 return ret;
23764 } 24004 }
@@ -23768,9 +24008,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/edd.c linux-2.6.32.11/drivers/firmwa
23768 .show = edd_attr_show, 24008 .show = edd_attr_show,
23769 }; 24009 };
23770 24010
23771diff -urNp linux-2.6.32.11/drivers/firmware/efivars.c linux-2.6.32.11/drivers/firmware/efivars.c 24011diff -urNp linux-2.6.32.12/drivers/firmware/efivars.c linux-2.6.32.12/drivers/firmware/efivars.c
23772--- linux-2.6.32.11/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400 24012--- linux-2.6.32.12/drivers/firmware/efivars.c 2010-03-15 11:52:04.000000000 -0400
23773+++ linux-2.6.32.11/drivers/firmware/efivars.c 2010-04-04 20:46:41.577798214 -0400 24013+++ linux-2.6.32.12/drivers/firmware/efivars.c 2010-04-04 20:46:41.577798214 -0400
23774@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct 24014@@ -362,7 +362,7 @@ static ssize_t efivar_attr_store(struct
23775 return ret; 24015 return ret;
23776 } 24016 }
@@ -23780,9 +24020,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/efivars.c linux-2.6.32.11/drivers/fi
23780 .show = efivar_attr_show, 24020 .show = efivar_attr_show,
23781 .store = efivar_attr_store, 24021 .store = efivar_attr_store,
23782 }; 24022 };
23783diff -urNp linux-2.6.32.11/drivers/firmware/iscsi_ibft.c linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 24023diff -urNp linux-2.6.32.12/drivers/firmware/iscsi_ibft.c linux-2.6.32.12/drivers/firmware/iscsi_ibft.c
23784--- linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400 24024--- linux-2.6.32.12/drivers/firmware/iscsi_ibft.c 2010-03-15 11:52:04.000000000 -0400
23785+++ linux-2.6.32.11/drivers/firmware/iscsi_ibft.c 2010-04-04 20:46:41.581454607 -0400 24025+++ linux-2.6.32.12/drivers/firmware/iscsi_ibft.c 2010-04-04 20:46:41.581454607 -0400
23786@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc 24026@@ -525,7 +525,7 @@ static ssize_t ibft_show_attribute(struc
23787 return ret; 24027 return ret;
23788 } 24028 }
@@ -23792,9 +24032,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/iscsi_ibft.c linux-2.6.32.11/drivers
23792 .show = ibft_show_attribute, 24032 .show = ibft_show_attribute,
23793 }; 24033 };
23794 24034
23795diff -urNp linux-2.6.32.11/drivers/firmware/memmap.c linux-2.6.32.11/drivers/firmware/memmap.c 24035diff -urNp linux-2.6.32.12/drivers/firmware/memmap.c linux-2.6.32.12/drivers/firmware/memmap.c
23796--- linux-2.6.32.11/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400 24036--- linux-2.6.32.12/drivers/firmware/memmap.c 2010-03-15 11:52:04.000000000 -0400
23797+++ linux-2.6.32.11/drivers/firmware/memmap.c 2010-04-04 20:46:41.581454607 -0400 24037+++ linux-2.6.32.12/drivers/firmware/memmap.c 2010-04-04 20:46:41.581454607 -0400
23798@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = { 24038@@ -74,7 +74,7 @@ static struct attribute *def_attrs[] = {
23799 NULL 24039 NULL
23800 }; 24040 };
@@ -23804,9 +24044,9 @@ diff -urNp linux-2.6.32.11/drivers/firmware/memmap.c linux-2.6.32.11/drivers/fir
23804 .show = memmap_attr_show, 24044 .show = memmap_attr_show,
23805 }; 24045 };
23806 24046
23807diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_drv.c linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 24047diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_drv.c linux-2.6.32.12/drivers/gpu/drm/drm_drv.c
23808--- linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400 24048--- linux-2.6.32.12/drivers/gpu/drm/drm_drv.c 2010-03-15 11:52:04.000000000 -0400
23809+++ linux-2.6.32.11/drivers/gpu/drm/drm_drv.c 2010-04-04 20:46:41.581454607 -0400 24049+++ linux-2.6.32.12/drivers/gpu/drm/drm_drv.c 2010-04-04 20:46:41.581454607 -0400
23810@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc 24050@@ -417,7 +417,7 @@ int drm_ioctl(struct inode *inode, struc
23811 char *kdata = NULL; 24051 char *kdata = NULL;
23812 24052
@@ -23816,9 +24056,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_drv.c linux-2.6.32.11/drivers/gpu
23816 ++file_priv->ioctl_count; 24056 ++file_priv->ioctl_count;
23817 24057
23818 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", 24058 DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
23819diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 24059diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_fops.c linux-2.6.32.12/drivers/gpu/drm/drm_fops.c
23820--- linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-03-15 11:52:04.000000000 -0400 24060--- linux-2.6.32.12/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:37.845185844 -0400
23821+++ linux-2.6.32.11/drivers/gpu/drm/drm_fops.c 2010-04-04 20:46:41.581454607 -0400 24061+++ linux-2.6.32.12/drivers/gpu/drm/drm_fops.c 2010-04-29 17:49:58.154995647 -0400
23822@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device * 24062@@ -66,7 +66,7 @@ static int drm_setup(struct drm_device *
23823 } 24063 }
23824 24064
@@ -23840,7 +24080,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp
23840 spin_unlock(&dev->count_lock); 24080 spin_unlock(&dev->count_lock);
23841 retcode = drm_setup(dev); 24081 retcode = drm_setup(dev);
23842 goto out; 24082 goto out;
23843@@ -433,7 +433,7 @@ int drm_release(struct inode *inode, str 24083@@ -435,7 +435,7 @@ int drm_release(struct inode *inode, str
23844 24084
23845 lock_kernel(); 24085 lock_kernel();
23846 24086
@@ -23849,7 +24089,7 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp
23849 24089
23850 if (dev->driver->preclose) 24090 if (dev->driver->preclose)
23851 dev->driver->preclose(dev, file_priv); 24091 dev->driver->preclose(dev, file_priv);
23852@@ -445,7 +445,7 @@ int drm_release(struct inode *inode, str 24092@@ -447,7 +447,7 @@ int drm_release(struct inode *inode, str
23853 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", 24093 DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n",
23854 task_pid_nr(current), 24094 task_pid_nr(current),
23855 (long)old_encode_dev(file_priv->minor->device), 24095 (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
23858 24098
23859 /* if the master has gone away we can't do anything with the lock */ 24099 /* if the master has gone away we can't do anything with the lock */
23860 if (file_priv->minor->master) 24100 if (file_priv->minor->master)
23861@@ -522,9 +522,9 @@ int drm_release(struct inode *inode, str 24101@@ -524,9 +524,9 @@ int drm_release(struct inode *inode, str
23862 * End inline drm_release 24102 * End inline drm_release
23863 */ 24103 */
23864 24104
@@ -23870,9 +24110,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_fops.c linux-2.6.32.11/drivers/gp
23870 if (atomic_read(&dev->ioctl_count)) { 24110 if (atomic_read(&dev->ioctl_count)) {
23871 DRM_ERROR("Device busy: %d\n", 24111 DRM_ERROR("Device busy: %d\n",
23872 atomic_read(&dev->ioctl_count)); 24112 atomic_read(&dev->ioctl_count));
23873diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 24113diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c
23874--- linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400 24114--- linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c 2010-03-15 11:52:04.000000000 -0400
23875+++ linux-2.6.32.11/drivers/gpu/drm/drm_ioctl.c 2010-04-04 20:46:41.581454607 -0400 24115+++ linux-2.6.32.12/drivers/gpu/drm/drm_ioctl.c 2010-04-04 20:46:41.581454607 -0400
23876@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev, 24116@@ -283,7 +283,7 @@ int drm_getstats(struct drm_device *dev,
23877 stats->data[i].value = 24117 stats->data[i].value =
23878 (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0); 24118 (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
23882 stats->data[i].type = dev->types[i]; 24122 stats->data[i].type = dev->types[i];
23883 } 24123 }
23884 24124
23885diff -urNp linux-2.6.32.11/drivers/gpu/drm/drm_lock.c linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 24125diff -urNp linux-2.6.32.12/drivers/gpu/drm/drm_lock.c linux-2.6.32.12/drivers/gpu/drm/drm_lock.c
23886--- linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400 24126--- linux-2.6.32.12/drivers/gpu/drm/drm_lock.c 2010-03-15 11:52:04.000000000 -0400
23887+++ linux-2.6.32.11/drivers/gpu/drm/drm_lock.c 2010-04-04 20:46:41.581454607 -0400 24127+++ linux-2.6.32.12/drivers/gpu/drm/drm_lock.c 2010-04-04 20:46:41.581454607 -0400
23888@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi 24128@@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi
23889 if (drm_lock_take(&master->lock, lock->context)) { 24129 if (drm_lock_take(&master->lock, lock->context)) {
23890 master->lock.file_priv = file_priv; 24130 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
23903 24143
23904 /* kernel_context_switch isn't used by any of the x86 drm 24144 /* kernel_context_switch isn't used by any of the x86 drm
23905 * modules but is required by the Sparc driver. 24145 * modules but is required by the Sparc driver.
23906diff -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 24146diff -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
23907--- linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400 24147--- linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c 2010-03-15 11:52:04.000000000 -0400
23908+++ linux-2.6.32.11/drivers/gpu/drm/i810/i810_dma.c 2010-04-04 20:46:41.581454607 -0400 24148+++ linux-2.6.32.12/drivers/gpu/drm/i810/i810_dma.c 2010-04-04 20:46:41.581454607 -0400
23909@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de 24149@@ -952,8 +952,8 @@ static int i810_dma_vertex(struct drm_de
23910 dma->buflist[vertex->idx], 24150 dma->buflist[vertex->idx],
23911 vertex->discard, vertex->used); 24151 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
23928 sarea_priv->last_enqueue = dev_priv->counter - 1; 24168 sarea_priv->last_enqueue = dev_priv->counter - 1;
23929 sarea_priv->last_dispatch = (int)hw_status[5]; 24169 sarea_priv->last_dispatch = (int)hw_status[5];
23930 24170
23931diff -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 24171diff -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
23932--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400 24172--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c 2010-03-15 11:52:04.000000000 -0400
23933+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c 2010-04-04 20:46:41.581454607 -0400 24173+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7017.c 2010-04-04 20:46:41.581454607 -0400
23934@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_ 24174@@ -443,7 +443,7 @@ static void ch7017_destroy(struct intel_
23935 } 24175 }
23936 } 24176 }
@@ -23940,9 +24180,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7017.c linux-2.6.32.11/dri
23940 .init = ch7017_init, 24180 .init = ch7017_init,
23941 .detect = ch7017_detect, 24181 .detect = ch7017_detect,
23942 .mode_valid = ch7017_mode_valid, 24182 .mode_valid = ch7017_mode_valid,
23943diff -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 24183diff -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
23944--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400 24184--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-03-15 11:52:04.000000000 -0400
23945+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-04-04 20:46:41.581454607 -0400 24185+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ch7xxx.c 2010-04-04 20:46:41.581454607 -0400
23946@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_ 24186@@ -356,7 +356,7 @@ static void ch7xxx_destroy(struct intel_
23947 } 24187 }
23948 } 24188 }
@@ -23952,9 +24192,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ch7xxx.c linux-2.6.32.11/dri
23952 .init = ch7xxx_init, 24192 .init = ch7xxx_init,
23953 .detect = ch7xxx_detect, 24193 .detect = ch7xxx_detect,
23954 .mode_valid = ch7xxx_mode_valid, 24194 .mode_valid = ch7xxx_mode_valid,
23955diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 24195diff -urNp linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h
23956--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400 24196--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h 2010-03-15 11:52:04.000000000 -0400
23957+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo.h 2010-04-04 20:46:41.581454607 -0400 24197+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo.h 2010-04-04 20:46:41.581454607 -0400
23958@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops { 24198@@ -135,23 +135,23 @@ struct intel_dvo_dev_ops {
23959 * 24199 *
23960 * \return singly-linked list of modes or NULL if no modes found. 24200 * \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
23987+extern const struct intel_dvo_dev_ops ch7017_ops; 24227+extern const struct intel_dvo_dev_ops ch7017_ops;
23988 24228
23989 #endif /* _INTEL_DVO_H */ 24229 #endif /* _INTEL_DVO_H */
23990diff -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 24230diff -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
23991--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400 24231--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c 2010-03-15 11:52:04.000000000 -0400
23992+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c 2010-04-04 20:46:41.581454607 -0400 24232+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_ivch.c 2010-04-04 20:46:41.581454607 -0400
23993@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv 24233@@ -430,7 +430,7 @@ static void ivch_destroy(struct intel_dv
23994 } 24234 }
23995 } 24235 }
@@ -23999,9 +24239,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_ivch.c linux-2.6.32.11/drive
23999 .init = ivch_init, 24239 .init = ivch_init,
24000 .dpms = ivch_dpms, 24240 .dpms = ivch_dpms,
24001 .save = ivch_save, 24241 .save = ivch_save,
24002diff -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 24242diff -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
24003--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400 24243--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c 2010-03-15 11:52:04.000000000 -0400
24004+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c 2010-04-04 20:46:41.581454607 -0400 24244+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_sil164.c 2010-04-04 20:46:41.581454607 -0400
24005@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_ 24245@@ -290,7 +290,7 @@ static void sil164_destroy(struct intel_
24006 } 24246 }
24007 } 24247 }
@@ -24011,9 +24251,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_sil164.c linux-2.6.32.11/dri
24011 .init = sil164_init, 24251 .init = sil164_init,
24012 .detect = sil164_detect, 24252 .detect = sil164_detect,
24013 .mode_valid = sil164_mode_valid, 24253 .mode_valid = sil164_mode_valid,
24014diff -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 24254diff -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
24015--- linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400 24255--- linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c 2010-03-15 11:52:04.000000000 -0400
24016+++ linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c 2010-04-04 20:46:41.581454607 -0400 24256+++ linux-2.6.32.12/drivers/gpu/drm/i915/dvo_tfp410.c 2010-04-04 20:46:41.581454607 -0400
24017@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_ 24257@@ -323,7 +323,7 @@ static void tfp410_destroy(struct intel_
24018 } 24258 }
24019 } 24259 }
@@ -24023,9 +24263,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/dvo_tfp410.c linux-2.6.32.11/dri
24023 .init = tfp410_init, 24263 .init = tfp410_init,
24024 .detect = tfp410_detect, 24264 .detect = tfp410_detect,
24025 .mode_valid = tfp410_mode_valid, 24265 .mode_valid = tfp410_mode_valid,
24026diff -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 24266diff -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
24027--- linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400 24267--- linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c 2010-03-15 11:52:04.000000000 -0400
24028+++ linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c 2010-04-04 20:46:41.581454607 -0400 24268+++ linux-2.6.32.12/drivers/gpu/drm/i915/i915_drv.c 2010-04-04 20:46:41.581454607 -0400
24029@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev) 24269@@ -284,7 +284,7 @@ i915_pci_resume(struct pci_dev *pdev)
24030 return i915_resume(dev); 24270 return i915_resume(dev);
24031 } 24271 }
@@ -24035,9 +24275,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/i915/i915_drv.c linux-2.6.32.11/drive
24035 .fault = i915_gem_fault, 24275 .fault = i915_gem_fault,
24036 .open = drm_gem_vm_open, 24276 .open = drm_gem_vm_open,
24037 .close = drm_gem_vm_close, 24277 .close = drm_gem_vm_close,
24038diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 24278diff -urNp linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c
24039--- linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400 24279--- linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c 2010-03-15 11:52:04.000000000 -0400
24040+++ linux-2.6.32.11/drivers/gpu/drm/radeon/mkregtable.c 2010-04-04 20:46:41.581454607 -0400 24280+++ linux-2.6.32.12/drivers/gpu/drm/radeon/mkregtable.c 2010-04-04 20:46:41.581454607 -0400
24041@@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 24281@@ -637,14 +637,14 @@ static int parser_auth(struct table *t,
24042 regex_t mask_rex; 24282 regex_t mask_rex;
24043 regmatch_t match[4]; 24283 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
24055 24295
24056 if (regcomp 24296 if (regcomp
24057 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) { 24297 (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
24058diff -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 24298diff -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
24059--- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400 24299--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c 2010-03-15 11:52:04.000000000 -0400
24060+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c 2010-04-04 20:46:41.581454607 -0400 24300+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_atombios.c 2010-04-04 20:46:41.581454607 -0400
24061@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o 24301@@ -504,13 +504,13 @@ static uint16_t atombios_get_connector_o
24062 } 24302 }
24063 } 24303 }
@@ -24082,9 +24322,21 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_atombios.c linux-2.6.32
24082 24322
24083 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset); 24323 atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset);
24084 24324
24085diff -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 24325diff -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
24086--- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400 24326--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c 2010-03-15 11:52:04.000000000 -0400
24087+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_state.c 2010-04-04 20:46:41.581454607 -0400 24327+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_display.c 2010-04-29 17:46:37.101039010 -0400
24328@@ -482,7 +482,7 @@ void radeon_compute_pll(struct radeon_pl
24329
24330 if (flags & RADEON_PLL_PREFER_CLOSEST_LOWER) {
24331 error = freq - current_freq;
24332- error = error < 0 ? 0xffffffff : error;
24333+ error = (int32_t)error < 0 ? 0xffffffff : error;
24334 } else
24335 error = abs(current_freq - freq);
24336 vco_diff = abs(vco - best_vco);
24337diff -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
24338--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c 2010-03-15 11:52:04.000000000 -0400
24339+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_state.c 2010-04-04 20:46:41.581454607 -0400
24088@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm 24340@@ -3014,7 +3014,7 @@ static int radeon_cp_getparam(struct drm
24089 { 24341 {
24090 drm_radeon_private_t *dev_priv = dev->dev_private; 24342 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
24094 24346
24095 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID); 24347 DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
24096 24348
24097diff -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 24349diff -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
24098--- linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400 24350--- linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c 2010-03-15 11:52:04.000000000 -0400
24099+++ linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c 2010-04-04 20:46:41.581454607 -0400 24351+++ linux-2.6.32.12/drivers/gpu/drm/radeon/radeon_ttm.c 2010-04-04 20:46:41.581454607 -0400
24100@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic 24352@@ -535,27 +535,10 @@ void radeon_ttm_fini(struct radeon_devic
24101 DRM_INFO("radeon: ttm finalized\n"); 24353 DRM_INFO("radeon: ttm finalized\n");
24102 } 24354 }
@@ -24148,9 +24400,18 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/radeon/radeon_ttm.c linux-2.6.32.11/d
24148 } 24400 }
24149 24401
24150 24402
24151diff -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 24403diff -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
24152--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400 24404--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c 2010-03-15 11:52:04.000000000 -0400
24153+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c 2010-04-04 20:46:41.581454607 -0400 24405+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo.c 2010-04-29 17:46:36.939238869 -0400
24406@@ -39,7 +39,7 @@
24407 #include <linux/module.h>
24408
24409 #define TTM_ASSERT_LOCKED(param)
24410-#define TTM_DEBUG(fmt, arg...)
24411+#define TTM_DEBUG(fmt, arg...) do {} while (0)
24412 #define TTM_BO_HASH_ORDER 13
24413
24414 static int ttm_bo_setup_vm(struct ttm_buffer_object *bo);
24154@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a 24415@@ -67,7 +67,7 @@ static struct attribute *ttm_bo_global_a
24155 NULL 24416 NULL
24156 }; 24417 };
@@ -24160,9 +24421,9 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo.c linux-2.6.32.11/drivers/
24160 .show = &ttm_bo_global_show 24421 .show = &ttm_bo_global_show
24161 }; 24422 };
24162 24423
24163diff -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 24424diff -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
24164--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400 24425--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-03-15 11:52:04.000000000 -0400
24165+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-04-04 20:46:41.585591308 -0400 24426+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_bo_vm.c 2010-04-04 20:46:41.585591308 -0400
24166@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are 24427@@ -73,7 +73,7 @@ static int ttm_bo_vm_fault(struct vm_are
24167 { 24428 {
24168 struct ttm_buffer_object *bo = (struct ttm_buffer_object *) 24429 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
24183 /* 24444 /*
24184 * Work around locking order reversal in fault / nopfn 24445 * Work around locking order reversal in fault / nopfn
24185 * between mmap_sem and bo_reserve: Perform a trylock operation 24446 * between mmap_sem and bo_reserve: Perform a trylock operation
24186diff -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 24447diff -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
24187--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400 24448--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c 2010-03-15 11:52:04.000000000 -0400
24188+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_global.c 2010-04-04 20:46:41.585591308 -0400 24449+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_global.c 2010-04-04 20:46:41.585591308 -0400
24189@@ -36,7 +36,7 @@ 24450@@ -36,7 +36,7 @@
24190 struct ttm_global_item { 24451 struct ttm_global_item {
24191 struct mutex mutex; 24452 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
24243 ref->release(ref); 24504 ref->release(ref);
24244 item->object = NULL; 24505 item->object = NULL;
24245 } 24506 }
24246diff -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 24507diff -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
24247--- linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400 24508--- linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c 2010-03-15 11:52:04.000000000 -0400
24248+++ linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c 2010-04-04 20:46:41.585591308 -0400 24509+++ linux-2.6.32.12/drivers/gpu/drm/ttm/ttm_memory.c 2010-04-04 20:46:41.585591308 -0400
24249@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at 24510@@ -152,7 +152,7 @@ static struct attribute *ttm_mem_zone_at
24250 NULL 24511 NULL
24251 }; 24512 };
@@ -24255,21 +24516,21 @@ diff -urNp linux-2.6.32.11/drivers/gpu/drm/ttm/ttm_memory.c linux-2.6.32.11/driv
24255 .show = &ttm_mem_zone_show, 24516 .show = &ttm_mem_zone_show,
24256 .store = &ttm_mem_zone_store 24517 .store = &ttm_mem_zone_store
24257 }; 24518 };
24258diff -urNp linux-2.6.32.11/drivers/gpu/vga/vgaarb.c linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 24519diff -urNp linux-2.6.32.12/drivers/hid/usbhid/hiddev.c linux-2.6.32.12/drivers/hid/usbhid/hiddev.c
24259--- linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-03-15 11:52:04.000000000 -0400 24520--- linux-2.6.32.12/drivers/hid/usbhid/hiddev.c 2010-03-15 11:52:04.000000000 -0400
24260+++ linux-2.6.32.11/drivers/gpu/vga/vgaarb.c 2010-04-04 20:46:41.585591308 -0400 24521+++ linux-2.6.32.12/drivers/hid/usbhid/hiddev.c 2010-04-29 17:46:37.113104605 -0400
24261@@ -961,7 +961,7 @@ static ssize_t vga_arb_write(struct file 24522@@ -617,7 +617,7 @@ static long hiddev_ioctl(struct file *fi
24262 remaining -= 7; 24523 return put_user(HID_VERSION, (int __user *)arg);
24263 pr_devel("client 0x%p called 'target'\n", priv); 24524
24264 /* if target is default */ 24525 case HIDIOCAPPLICATION:
24265- if (!strncmp(buf, "default", 7)) 24526- if (arg < 0 || arg >= hid->maxapplication)
24266+ if (!strncmp(curr_pos, "default", 7)) 24527+ if (arg >= hid->maxapplication)
24267 pdev = pci_dev_get(vga_default_device()); 24528 return -EINVAL;
24268 else { 24529
24269 if (!vga_pci_str_to_vars(curr_pos, remaining, 24530 for (i = 0; i < hid->maxcollection; i++)
24270diff -urNp linux-2.6.32.11/drivers/hwmon/k8temp.c linux-2.6.32.11/drivers/hwmon/k8temp.c 24531diff -urNp linux-2.6.32.12/drivers/hwmon/k8temp.c linux-2.6.32.12/drivers/hwmon/k8temp.c
24271--- linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400 24532--- linux-2.6.32.12/drivers/hwmon/k8temp.c 2010-03-15 11:52:04.000000000 -0400
24272+++ linux-2.6.32.11/drivers/hwmon/k8temp.c 2010-04-04 20:46:41.585591308 -0400 24533+++ linux-2.6.32.12/drivers/hwmon/k8temp.c 2010-04-04 20:46:41.585591308 -0400
24273@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n 24534@@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n
24274 24535
24275 static struct pci_device_id k8temp_ids[] = { 24536 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/
24279 }; 24540 };
24280 24541
24281 MODULE_DEVICE_TABLE(pci, k8temp_ids); 24542 MODULE_DEVICE_TABLE(pci, k8temp_ids);
24282diff -urNp linux-2.6.32.11/drivers/hwmon/sis5595.c linux-2.6.32.11/drivers/hwmon/sis5595.c 24543diff -urNp linux-2.6.32.12/drivers/hwmon/sis5595.c linux-2.6.32.12/drivers/hwmon/sis5595.c
24283--- linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400 24544--- linux-2.6.32.12/drivers/hwmon/sis5595.c 2010-03-15 11:52:04.000000000 -0400
24284+++ linux-2.6.32.11/drivers/hwmon/sis5595.c 2010-04-04 20:46:41.585591308 -0400 24545+++ linux-2.6.32.12/drivers/hwmon/sis5595.c 2010-04-04 20:46:41.585591308 -0400
24285@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda 24546@@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda
24286 24547
24287 static struct pci_device_id sis5595_pci_ids[] = { 24548 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
24291 }; 24552 };
24292 24553
24293 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); 24554 MODULE_DEVICE_TABLE(pci, sis5595_pci_ids);
24294diff -urNp linux-2.6.32.11/drivers/hwmon/via686a.c linux-2.6.32.11/drivers/hwmon/via686a.c 24555diff -urNp linux-2.6.32.12/drivers/hwmon/via686a.c linux-2.6.32.12/drivers/hwmon/via686a.c
24295--- linux-2.6.32.11/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400 24556--- linux-2.6.32.12/drivers/hwmon/via686a.c 2010-03-15 11:52:04.000000000 -0400
24296+++ linux-2.6.32.11/drivers/hwmon/via686a.c 2010-04-04 20:46:41.585591308 -0400 24557+++ linux-2.6.32.12/drivers/hwmon/via686a.c 2010-04-04 20:46:41.585591308 -0400
24297@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda 24558@@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda
24298 24559
24299 static struct pci_device_id via686a_pci_ids[] = { 24560 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
24303 }; 24564 };
24304 24565
24305 MODULE_DEVICE_TABLE(pci, via686a_pci_ids); 24566 MODULE_DEVICE_TABLE(pci, via686a_pci_ids);
24306diff -urNp linux-2.6.32.11/drivers/hwmon/vt8231.c linux-2.6.32.11/drivers/hwmon/vt8231.c 24567diff -urNp linux-2.6.32.12/drivers/hwmon/vt8231.c linux-2.6.32.12/drivers/hwmon/vt8231.c
24307--- linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400 24568--- linux-2.6.32.12/drivers/hwmon/vt8231.c 2010-03-15 11:52:04.000000000 -0400
24308+++ linux-2.6.32.11/drivers/hwmon/vt8231.c 2010-04-04 20:46:41.585591308 -0400 24569+++ linux-2.6.32.12/drivers/hwmon/vt8231.c 2010-04-04 20:46:41.585591308 -0400
24309@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri 24570@@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri
24310 24571
24311 static struct pci_device_id vt8231_pci_ids[] = { 24572 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/
24315 }; 24576 };
24316 24577
24317 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); 24578 MODULE_DEVICE_TABLE(pci, vt8231_pci_ids);
24318diff -urNp linux-2.6.32.11/drivers/hwmon/w83791d.c linux-2.6.32.11/drivers/hwmon/w83791d.c 24579diff -urNp linux-2.6.32.12/drivers/hwmon/w83791d.c linux-2.6.32.12/drivers/hwmon/w83791d.c
24319--- linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400 24580--- linux-2.6.32.12/drivers/hwmon/w83791d.c 2010-03-15 11:52:04.000000000 -0400
24320+++ linux-2.6.32.11/drivers/hwmon/w83791d.c 2010-04-04 20:46:41.585591308 -0400 24581+++ linux-2.6.32.12/drivers/hwmon/w83791d.c 2010-04-04 20:46:41.585591308 -0400
24321@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli 24582@@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli
24322 struct i2c_board_info *info); 24583 struct i2c_board_info *info);
24323 static int w83791d_remove(struct i2c_client *client); 24584 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
24329 static struct w83791d_data *w83791d_update_device(struct device *dev); 24590 static struct w83791d_data *w83791d_update_device(struct device *dev);
24330 24591
24331 #ifdef DEBUG 24592 #ifdef DEBUG
24332diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 24593diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c
24333--- linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:41:49.952923765 -0400 24594--- linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c 2010-04-29 17:49:37.945518391 -0400
24334+++ linux-2.6.32.11/drivers/i2c/busses/i2c-i801.c 2010-04-04 20:46:41.585591308 -0400 24595+++ linux-2.6.32.12/drivers/i2c/busses/i2c-i801.c 2010-04-29 18:00:43.521920899 -0400
24335@@ -580,7 +580,7 @@ static struct pci_device_id i801_ids[] = 24596@@ -582,7 +582,7 @@ static struct pci_device_id i801_ids[] =
24336 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) },
24337 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, 24597 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) },
24338 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, 24598 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) },
24599 { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_CPT_SMBUS) },
24339- { 0, } 24600- { 0, }
24340+ { 0, 0, 0, 0, 0, 0, 0 } 24601+ { 0, 0, 0, 0, 0, 0, 0 }
24341 }; 24602 };
24342 24603
24343 MODULE_DEVICE_TABLE (pci, i801_ids); 24604 MODULE_DEVICE_TABLE (pci, i801_ids);
24344diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 24605diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c
24345--- linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400 24606--- linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c 2010-03-15 11:52:04.000000000 -0400
24346+++ linux-2.6.32.11/drivers/i2c/busses/i2c-piix4.c 2010-04-04 20:46:41.585591308 -0400 24607+++ linux-2.6.32.12/drivers/i2c/busses/i2c-piix4.c 2010-04-04 20:46:41.585591308 -0400
24347@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat 24608@@ -124,7 +124,7 @@ static struct dmi_system_id __devinitdat
24348 .ident = "IBM", 24609 .ident = "IBM",
24349 .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, 24610 .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
24362 }; 24623 };
24363 24624
24364 MODULE_DEVICE_TABLE (pci, piix4_ids); 24625 MODULE_DEVICE_TABLE (pci, piix4_ids);
24365diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 24626diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c
24366--- linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400 24627--- linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c 2010-03-15 11:52:04.000000000 -0400
24367+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis630.c 2010-04-04 20:46:41.585591308 -0400 24628+++ linux-2.6.32.12/drivers/i2c/busses/i2c-sis630.c 2010-04-04 20:46:41.585591308 -0400
24368@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter 24629@@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter
24369 static struct pci_device_id sis630_ids[] __devinitdata = { 24630 static struct pci_device_id sis630_ids[] __devinitdata = {
24370 { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, 24631 { 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
24374 }; 24635 };
24375 24636
24376 MODULE_DEVICE_TABLE (pci, sis630_ids); 24637 MODULE_DEVICE_TABLE (pci, sis630_ids);
24377diff -urNp linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 24638diff -urNp linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c
24378--- linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400 24639--- linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c 2010-03-15 11:52:04.000000000 -0400
24379+++ linux-2.6.32.11/drivers/i2c/busses/i2c-sis96x.c 2010-04-04 20:46:41.585591308 -0400 24640+++ linux-2.6.32.12/drivers/i2c/busses/i2c-sis96x.c 2010-04-04 20:46:41.585591308 -0400
24380@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter 24641@@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter
24381 24642
24382 static struct pci_device_id sis96x_ids[] = { 24643 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
24386 }; 24647 };
24387 24648
24388 MODULE_DEVICE_TABLE (pci, sis96x_ids); 24649 MODULE_DEVICE_TABLE (pci, sis96x_ids);
24389diff -urNp linux-2.6.32.11/drivers/ide/ide-cd.c linux-2.6.32.11/drivers/ide/ide-cd.c 24650diff -urNp linux-2.6.32.12/drivers/ide/ide-cd.c linux-2.6.32.12/drivers/ide/ide-cd.c
24390--- linux-2.6.32.11/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400 24651--- linux-2.6.32.12/drivers/ide/ide-cd.c 2010-03-15 11:52:04.000000000 -0400
24391+++ linux-2.6.32.11/drivers/ide/ide-cd.c 2010-04-04 20:46:41.585591308 -0400 24652+++ linux-2.6.32.12/drivers/ide/ide-cd.c 2010-04-04 20:46:41.585591308 -0400
24392@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_ 24653@@ -766,7 +766,7 @@ static void cdrom_do_block_pc(ide_drive_
24393 alignment = queue_dma_alignment(q) | q->dma_pad_mask; 24654 alignment = queue_dma_alignment(q) | q->dma_pad_mask;
24394 if ((unsigned long)buf & alignment 24655 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-
24398 drive->dma = 0; 24659 drive->dma = 0;
24399 } 24660 }
24400 } 24661 }
24401diff -urNp linux-2.6.32.11/drivers/ieee1394/dv1394.c linux-2.6.32.11/drivers/ieee1394/dv1394.c 24662diff -urNp linux-2.6.32.12/drivers/ieee1394/dv1394.c linux-2.6.32.12/drivers/ieee1394/dv1394.c
24402--- linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400 24663--- linux-2.6.32.12/drivers/ieee1394/dv1394.c 2010-03-15 11:52:04.000000000 -0400
24403+++ linux-2.6.32.11/drivers/ieee1394/dv1394.c 2010-04-04 20:46:41.585591308 -0400 24664+++ linux-2.6.32.12/drivers/ieee1394/dv1394.c 2010-04-04 20:46:41.585591308 -0400
24404@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c 24665@@ -739,7 +739,7 @@ static void frame_prepare(struct video_c
24405 based upon DIF section and sequence 24666 based upon DIF section and sequence
24406 */ 24667 */
@@ -24419,9 +24680,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/dv1394.c linux-2.6.32.11/drivers/iee
24419 }; 24680 };
24420 24681
24421 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); 24682 MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table);
24422diff -urNp linux-2.6.32.11/drivers/ieee1394/eth1394.c linux-2.6.32.11/drivers/ieee1394/eth1394.c 24683diff -urNp linux-2.6.32.12/drivers/ieee1394/eth1394.c linux-2.6.32.12/drivers/ieee1394/eth1394.c
24423--- linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400 24684--- linux-2.6.32.12/drivers/ieee1394/eth1394.c 2010-03-15 11:52:04.000000000 -0400
24424+++ linux-2.6.32.11/drivers/ieee1394/eth1394.c 2010-04-04 20:46:41.585591308 -0400 24685+++ linux-2.6.32.12/drivers/ieee1394/eth1394.c 2010-04-04 20:46:41.585591308 -0400
24425@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e 24686@@ -446,7 +446,7 @@ static const struct ieee1394_device_id e
24426 .specifier_id = ETHER1394_GASP_SPECIFIER_ID, 24687 .specifier_id = ETHER1394_GASP_SPECIFIER_ID,
24427 .version = ETHER1394_GASP_VERSION, 24688 .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
24431 }; 24692 };
24432 24693
24433 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); 24694 MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table);
24434diff -urNp linux-2.6.32.11/drivers/ieee1394/hosts.c linux-2.6.32.11/drivers/ieee1394/hosts.c 24695diff -urNp linux-2.6.32.12/drivers/ieee1394/hosts.c linux-2.6.32.12/drivers/ieee1394/hosts.c
24435--- linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400 24696--- linux-2.6.32.12/drivers/ieee1394/hosts.c 2010-03-15 11:52:04.000000000 -0400
24436+++ linux-2.6.32.11/drivers/ieee1394/hosts.c 2010-04-04 20:46:41.589782410 -0400 24697+++ linux-2.6.32.12/drivers/ieee1394/hosts.c 2010-04-04 20:46:41.589782410 -0400
24437@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso 24698@@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso
24438 } 24699 }
24439 24700
@@ -24442,9 +24703,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/hosts.c linux-2.6.32.11/drivers/ieee
24442 .transmit_packet = dummy_transmit_packet, 24703 .transmit_packet = dummy_transmit_packet,
24443 .devctl = dummy_devctl, 24704 .devctl = dummy_devctl,
24444 .isoctl = dummy_isoctl 24705 .isoctl = dummy_isoctl
24445diff -urNp linux-2.6.32.11/drivers/ieee1394/ohci1394.c linux-2.6.32.11/drivers/ieee1394/ohci1394.c 24706diff -urNp linux-2.6.32.12/drivers/ieee1394/ohci1394.c linux-2.6.32.12/drivers/ieee1394/ohci1394.c
24446--- linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400 24707--- linux-2.6.32.12/drivers/ieee1394/ohci1394.c 2010-03-15 11:52:04.000000000 -0400
24447+++ linux-2.6.32.11/drivers/ieee1394/ohci1394.c 2010-04-04 20:46:41.589782410 -0400 24708+++ linux-2.6.32.12/drivers/ieee1394/ohci1394.c 2010-04-04 20:46:41.589782410 -0400
24448@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ 24709@@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_
24449 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) 24710 printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args)
24450 24711
@@ -24466,9 +24727,9 @@ diff -urNp linux-2.6.32.11/drivers/ieee1394/ohci1394.c linux-2.6.32.11/drivers/i
24466 }; 24727 };
24467 24728
24468 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); 24729 MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl);
24469diff -urNp linux-2.6.32.11/drivers/ieee1394/raw1394.c linux-2.6.32.11/drivers/ieee1394/raw1394.c 24730diff -urNp linux-2.6.32.12/drivers/ieee1394/raw1394.c linux-2.6.32.12/drivers/ieee1394/raw1394.c
24470--- linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400 24731--- linux-2.6.32.12/drivers/ieee1394/raw1394.c 2010-03-15 11:52:04.000000000 -0400
24471+++ linux-2.6.32.11/drivers/ieee1394/raw1394.c 2010-04-04 20:46:41.589782410 -0400 24732+++ linux-2.6.32.12/drivers/ieee1394/raw1394.c 2010-04-04 20:46:41.589782410 -0400
24472@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r 24733@@ -3002,7 +3002,7 @@ static const struct ieee1394_device_id r
24473 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24734 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
24474 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24735 .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
24478 }; 24739 };
24479 24740
24480 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); 24741 MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table);
24481diff -urNp linux-2.6.32.11/drivers/ieee1394/sbp2.c linux-2.6.32.11/drivers/ieee1394/sbp2.c 24742diff -urNp linux-2.6.32.12/drivers/ieee1394/sbp2.c linux-2.6.32.12/drivers/ieee1394/sbp2.c
24482--- linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400 24743--- linux-2.6.32.12/drivers/ieee1394/sbp2.c 2010-03-15 11:52:04.000000000 -0400
24483+++ linux-2.6.32.11/drivers/ieee1394/sbp2.c 2010-04-04 20:46:41.589782410 -0400 24744+++ linux-2.6.32.12/drivers/ieee1394/sbp2.c 2010-04-04 20:46:41.589782410 -0400
24484@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s 24745@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s
24485 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, 24746 .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION,
24486 .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, 24747 .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
24499 { 24760 {
24500 int ret; 24761 int ret;
24501 24762
24502diff -urNp linux-2.6.32.11/drivers/ieee1394/video1394.c linux-2.6.32.11/drivers/ieee1394/video1394.c 24763diff -urNp linux-2.6.32.12/drivers/ieee1394/video1394.c linux-2.6.32.12/drivers/ieee1394/video1394.c
24503--- linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400 24764--- linux-2.6.32.12/drivers/ieee1394/video1394.c 2010-03-15 11:52:04.000000000 -0400
24504+++ linux-2.6.32.11/drivers/ieee1394/video1394.c 2010-04-04 20:46:41.589782410 -0400 24765+++ linux-2.6.32.12/drivers/ieee1394/video1394.c 2010-04-04 20:46:41.589782410 -0400
24505@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v 24766@@ -1311,7 +1311,7 @@ static const struct ieee1394_device_id v
24506 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, 24767 .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff,
24507 .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff 24768 .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/
24511 }; 24772 };
24512 24773
24513 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); 24774 MODULE_DEVICE_TABLE(ieee1394, video1394_id_table);
24514diff -urNp linux-2.6.32.11/drivers/infiniband/core/cm.c linux-2.6.32.11/drivers/infiniband/core/cm.c 24775diff -urNp linux-2.6.32.12/drivers/infiniband/core/cm.c linux-2.6.32.12/drivers/infiniband/core/cm.c
24515--- linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400 24776--- linux-2.6.32.12/drivers/infiniband/core/cm.c 2010-03-15 11:52:04.000000000 -0400
24516+++ linux-2.6.32.11/drivers/infiniband/core/cm.c 2010-04-04 20:46:41.589782410 -0400 24777+++ linux-2.6.32.12/drivers/infiniband/core/cm.c 2010-04-04 20:46:41.589782410 -0400
24517@@ -112,7 +112,7 @@ static char const counter_group_names[CM 24778@@ -112,7 +112,7 @@ static char const counter_group_names[CM
24518 24779
24519 struct cm_counter_group { 24780 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/
24657 .show = cm_show_counter 24918 .show = cm_show_counter
24658 }; 24919 };
24659 24920
24660diff -urNp linux-2.6.32.11/drivers/infiniband/core/sysfs.c linux-2.6.32.11/drivers/infiniband/core/sysfs.c 24921diff -urNp linux-2.6.32.12/drivers/infiniband/core/sysfs.c linux-2.6.32.12/drivers/infiniband/core/sysfs.c
24661--- linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400 24922--- linux-2.6.32.12/drivers/infiniband/core/sysfs.c 2010-03-15 11:52:04.000000000 -0400
24662+++ linux-2.6.32.11/drivers/infiniband/core/sysfs.c 2010-04-04 20:46:41.589782410 -0400 24923+++ linux-2.6.32.12/drivers/infiniband/core/sysfs.c 2010-04-04 20:46:41.589782410 -0400
24663@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob 24924@@ -79,7 +79,7 @@ static ssize_t port_attr_show(struct kob
24664 return port_attr->show(p, port_attr, buf); 24925 return port_attr->show(p, port_attr, buf);
24665 } 24926 }
@@ -24669,9 +24930,9 @@ diff -urNp linux-2.6.32.11/drivers/infiniband/core/sysfs.c linux-2.6.32.11/drive
24669 .show = port_attr_show 24930 .show = port_attr_show
24670 }; 24931 };
24671 24932
24672diff -urNp linux-2.6.32.11/drivers/input/keyboard/atkbd.c linux-2.6.32.11/drivers/input/keyboard/atkbd.c 24933diff -urNp linux-2.6.32.12/drivers/input/keyboard/atkbd.c linux-2.6.32.12/drivers/input/keyboard/atkbd.c
24673--- linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400 24934--- linux-2.6.32.12/drivers/input/keyboard/atkbd.c 2010-03-15 11:52:04.000000000 -0400
24674+++ linux-2.6.32.11/drivers/input/keyboard/atkbd.c 2010-04-04 20:46:41.589782410 -0400 24935+++ linux-2.6.32.12/drivers/input/keyboard/atkbd.c 2010-04-04 20:46:41.589782410 -0400
24675@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri 24936@@ -1212,7 +1212,7 @@ static struct serio_device_id atkbd_seri
24676 .id = SERIO_ANY, 24937 .id = SERIO_ANY,
24677 .extra = SERIO_ANY, 24938 .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
24681 }; 24942 };
24682 24943
24683 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); 24944 MODULE_DEVICE_TABLE(serio, atkbd_serio_ids);
24684diff -urNp linux-2.6.32.11/drivers/input/mouse/lifebook.c linux-2.6.32.11/drivers/input/mouse/lifebook.c 24945diff -urNp linux-2.6.32.12/drivers/input/mouse/lifebook.c linux-2.6.32.12/drivers/input/mouse/lifebook.c
24685--- linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400 24946--- linux-2.6.32.12/drivers/input/mouse/lifebook.c 2010-03-15 11:52:04.000000000 -0400
24686+++ linux-2.6.32.11/drivers/input/mouse/lifebook.c 2010-04-04 20:46:41.589782410 -0400 24947+++ linux-2.6.32.12/drivers/input/mouse/lifebook.c 2010-04-04 20:46:41.589782410 -0400
24687@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo 24948@@ -115,7 +115,7 @@ static const struct dmi_system_id lifebo
24688 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), 24949 DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"),
24689 }, 24950 },
@@ -24693,9 +24954,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/lifebook.c linux-2.6.32.11/driver
24693 }; 24954 };
24694 24955
24695 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) 24956 static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse)
24696diff -urNp linux-2.6.32.11/drivers/input/mouse/psmouse-base.c linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 24957diff -urNp linux-2.6.32.12/drivers/input/mouse/psmouse-base.c linux-2.6.32.12/drivers/input/mouse/psmouse-base.c
24697--- linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400 24958--- linux-2.6.32.12/drivers/input/mouse/psmouse-base.c 2010-03-15 11:52:04.000000000 -0400
24698+++ linux-2.6.32.11/drivers/input/mouse/psmouse-base.c 2010-04-04 20:46:41.593451026 -0400 24959+++ linux-2.6.32.12/drivers/input/mouse/psmouse-base.c 2010-04-04 20:46:41.593451026 -0400
24699@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se 24960@@ -1409,7 +1409,7 @@ static struct serio_device_id psmouse_se
24700 .id = SERIO_ANY, 24961 .id = SERIO_ANY,
24701 .extra = SERIO_ANY, 24962 .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
24705 }; 24966 };
24706 24967
24707 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); 24968 MODULE_DEVICE_TABLE(serio, psmouse_serio_ids);
24708diff -urNp linux-2.6.32.11/drivers/input/mouse/synaptics.c linux-2.6.32.11/drivers/input/mouse/synaptics.c 24969diff -urNp linux-2.6.32.12/drivers/input/mouse/synaptics.c linux-2.6.32.12/drivers/input/mouse/synaptics.c
24709--- linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400 24970--- linux-2.6.32.12/drivers/input/mouse/synaptics.c 2010-03-15 11:52:04.000000000 -0400
24710+++ linux-2.6.32.11/drivers/input/mouse/synaptics.c 2010-04-04 20:46:41.593451026 -0400 24971+++ linux-2.6.32.12/drivers/input/mouse/synaptics.c 2010-04-04 20:46:41.593451026 -0400
24711@@ -437,7 +437,7 @@ static void synaptics_process_packet(str 24972@@ -437,7 +437,7 @@ static void synaptics_process_packet(str
24712 break; 24973 break;
24713 case 2: 24974 case 2:
@@ -24736,9 +24997,9 @@ diff -urNp linux-2.6.32.11/drivers/input/mouse/synaptics.c linux-2.6.32.11/drive
24736 }; 24997 };
24737 #endif 24998 #endif
24738 24999
24739diff -urNp linux-2.6.32.11/drivers/input/mousedev.c linux-2.6.32.11/drivers/input/mousedev.c 25000diff -urNp linux-2.6.32.12/drivers/input/mousedev.c linux-2.6.32.12/drivers/input/mousedev.c
24740--- linux-2.6.32.11/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400 25001--- linux-2.6.32.12/drivers/input/mousedev.c 2010-03-15 11:52:04.000000000 -0400
24741+++ linux-2.6.32.11/drivers/input/mousedev.c 2010-04-04 20:46:41.593451026 -0400 25002+++ linux-2.6.32.12/drivers/input/mousedev.c 2010-04-04 20:46:41.593451026 -0400
24742@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han 25003@@ -1057,7 +1057,7 @@ static struct input_handler mousedev_han
24743 25004
24744 #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX 25005 #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
24748 }; 25009 };
24749 static int psaux_registered; 25010 static int psaux_registered;
24750 #endif 25011 #endif
24751diff -urNp linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 25012diff -urNp linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h
24752--- linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400 25013--- linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:41:49.956500002 -0400
24753+++ linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:46:41.593451026 -0400 25014+++ linux-2.6.32.12/drivers/input/serio/i8042-x86ia64io.h 2010-04-04 20:46:41.593451026 -0400
24754@@ -172,7 +172,7 @@ static const struct dmi_system_id __init 25015@@ -172,7 +172,7 @@ static const struct dmi_system_id __init
24755 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), 25016 DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"),
24756 }, 25017 },
@@ -24805,9 +25066,9 @@ diff -urNp linux-2.6.32.11/drivers/input/serio/i8042-x86ia64io.h linux-2.6.32.11
24805 }; 25066 };
24806 25067
24807 #endif /* CONFIG_X86 */ 25068 #endif /* CONFIG_X86 */
24808diff -urNp linux-2.6.32.11/drivers/input/serio/serio_raw.c linux-2.6.32.11/drivers/input/serio/serio_raw.c 25069diff -urNp linux-2.6.32.12/drivers/input/serio/serio_raw.c linux-2.6.32.12/drivers/input/serio/serio_raw.c
24809--- linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400 25070--- linux-2.6.32.12/drivers/input/serio/serio_raw.c 2010-03-15 11:52:04.000000000 -0400
24810+++ linux-2.6.32.11/drivers/input/serio/serio_raw.c 2010-04-04 20:46:41.593451026 -0400 25071+++ linux-2.6.32.12/drivers/input/serio/serio_raw.c 2010-04-04 20:46:41.593451026 -0400
24811@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_ 25072@@ -377,7 +377,7 @@ static struct serio_device_id serio_raw_
24812 .id = SERIO_ANY, 25073 .id = SERIO_ANY,
24813 .extra = SERIO_ANY, 25074 .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
24817 }; 25078 };
24818 25079
24819 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); 25080 MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids);
24820diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/common.c linux-2.6.32.11/drivers/isdn/gigaset/common.c 25081diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/common.c linux-2.6.32.12/drivers/isdn/gigaset/common.c
24821--- linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400 25082--- linux-2.6.32.12/drivers/isdn/gigaset/common.c 2010-03-15 11:52:04.000000000 -0400
24822+++ linux-2.6.32.11/drivers/isdn/gigaset/common.c 2010-04-04 20:46:41.593451026 -0400 25083+++ linux-2.6.32.12/drivers/isdn/gigaset/common.c 2010-04-04 20:46:41.593451026 -0400
24823@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct 25084@@ -712,7 +712,7 @@ struct cardstate *gigaset_initcs(struct
24824 cs->commands_pending = 0; 25085 cs->commands_pending = 0;
24825 cs->cur_at_seq = 0; 25086 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
24829 cs->dev = NULL; 25090 cs->dev = NULL;
24830 cs->tty = NULL; 25091 cs->tty = NULL;
24831 cs->tty_dev = NULL; 25092 cs->tty_dev = NULL;
24832diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 25093diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h
24833--- linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400 25094--- linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h 2010-03-15 11:52:04.000000000 -0400
24834+++ linux-2.6.32.11/drivers/isdn/gigaset/gigaset.h 2010-04-04 20:46:41.593451026 -0400 25095+++ linux-2.6.32.12/drivers/isdn/gigaset/gigaset.h 2010-04-04 20:46:41.593451026 -0400
24835@@ -446,7 +446,7 @@ struct cardstate { 25096@@ -446,7 +446,7 @@ struct cardstate {
24836 spinlock_t cmdlock; 25097 spinlock_t cmdlock;
24837 unsigned curlen, cmdbytes; 25098 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
24841 struct tty_struct *tty; 25102 struct tty_struct *tty;
24842 struct tasklet_struct if_wake_tasklet; 25103 struct tasklet_struct if_wake_tasklet;
24843 unsigned control_state; 25104 unsigned control_state;
24844diff -urNp linux-2.6.32.11/drivers/isdn/gigaset/interface.c linux-2.6.32.11/drivers/isdn/gigaset/interface.c 25105diff -urNp linux-2.6.32.12/drivers/isdn/gigaset/interface.c linux-2.6.32.12/drivers/isdn/gigaset/interface.c
24845--- linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400 25106--- linux-2.6.32.12/drivers/isdn/gigaset/interface.c 2010-04-04 20:41:49.956500002 -0400
24846+++ linux-2.6.32.11/drivers/isdn/gigaset/interface.c 2010-04-04 20:46:41.593451026 -0400 25107+++ linux-2.6.32.12/drivers/isdn/gigaset/interface.c 2010-04-04 20:46:41.593451026 -0400
24847@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt 25108@@ -165,9 +165,7 @@ static int if_open(struct tty_struct *tt
24848 return -ERESTARTSYS; // FIXME -EINTR? 25109 return -ERESTARTSYS; // FIXME -EINTR?
24849 tty->driver_data = cs; 25110 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
24931 dev_warn(cs->dev, "%s: device not opened\n", __func__); 25192 dev_warn(cs->dev, "%s: device not opened\n", __func__);
24932 goto out; 25193 goto out;
24933 } 25194 }
24934diff -urNp linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 25195diff -urNp linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c
24935--- linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400 25196--- linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c 2010-03-15 11:52:04.000000000 -0400
24936+++ linux-2.6.32.11/drivers/isdn/hardware/avm/b1.c 2010-04-04 20:46:41.593451026 -0400 25197+++ linux-2.6.32.12/drivers/isdn/hardware/avm/b1.c 2010-04-04 20:46:41.593451026 -0400
24937@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo 25198@@ -173,7 +173,7 @@ int b1_load_t4file(avmcard *card, capilo
24938 } 25199 }
24939 if (left) { 25200 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
24952 return -EFAULT; 25213 return -EFAULT;
24953 } else { 25214 } else {
24954 memcpy(buf, dp, left); 25215 memcpy(buf, dp, left);
24955diff -urNp linux-2.6.32.11/drivers/isdn/icn/icn.c linux-2.6.32.11/drivers/isdn/icn/icn.c 25216diff -urNp linux-2.6.32.12/drivers/isdn/icn/icn.c linux-2.6.32.12/drivers/isdn/icn/icn.c
24956--- linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400 25217--- linux-2.6.32.12/drivers/isdn/icn/icn.c 2010-03-15 11:52:04.000000000 -0400
24957+++ linux-2.6.32.11/drivers/isdn/icn/icn.c 2010-04-04 20:46:41.593451026 -0400 25218+++ linux-2.6.32.12/drivers/isdn/icn/icn.c 2010-04-04 20:46:41.593451026 -0400
24958@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len 25219@@ -1044,7 +1044,7 @@ icn_writecmd(const u_char * buf, int len
24959 if (count > len) 25220 if (count > len)
24960 count = len; 25221 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
24964 return -EFAULT; 25225 return -EFAULT;
24965 } else 25226 } else
24966 memcpy(msg, buf, count); 25227 memcpy(msg, buf, count);
24967diff -urNp linux-2.6.32.11/drivers/lguest/core.c linux-2.6.32.11/drivers/lguest/core.c 25228diff -urNp linux-2.6.32.12/drivers/lguest/core.c linux-2.6.32.12/drivers/lguest/core.c
24968--- linux-2.6.32.11/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400 25229--- linux-2.6.32.12/drivers/lguest/core.c 2010-03-15 11:52:04.000000000 -0400
24969+++ linux-2.6.32.11/drivers/lguest/core.c 2010-04-04 20:46:41.593451026 -0400 25230+++ linux-2.6.32.12/drivers/lguest/core.c 2010-04-04 20:46:41.593451026 -0400
24970@@ -91,9 +91,17 @@ static __init int map_switcher(void) 25231@@ -91,9 +91,17 @@ static __init int map_switcher(void)
24971 * it's worked so far. The end address needs +1 because __get_vm_area 25232 * it's worked so far. The end address needs +1 because __get_vm_area
24972 * allocates an extra guard page, so we need space for that. 25233 * 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/
24985 if (!switcher_vma) { 25246 if (!switcher_vma) {
24986 err = -ENOMEM; 25247 err = -ENOMEM;
24987 printk("lguest: could not map switcher pages high\n"); 25248 printk("lguest: could not map switcher pages high\n");
24988diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 25249diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c
24989--- linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400 25250--- linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c 2010-03-15 11:52:04.000000000 -0400
24990+++ linux-2.6.32.11/drivers/macintosh/via-pmu-backlight.c 2010-04-04 20:46:41.593451026 -0400 25251+++ linux-2.6.32.12/drivers/macintosh/via-pmu-backlight.c 2010-04-04 20:46:41.593451026 -0400
24991@@ -15,7 +15,7 @@ 25252@@ -15,7 +15,7 @@
24992 25253
24993 #define MAX_PMU_LEVEL 0xFF 25254 #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
25006 .get_brightness = pmu_backlight_get_brightness, 25267 .get_brightness = pmu_backlight_get_brightness,
25007 .update_status = pmu_backlight_update_status, 25268 .update_status = pmu_backlight_update_status,
25008 25269
25009diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu.c linux-2.6.32.11/drivers/macintosh/via-pmu.c 25270diff -urNp linux-2.6.32.12/drivers/macintosh/via-pmu.c linux-2.6.32.12/drivers/macintosh/via-pmu.c
25010--- linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400 25271--- linux-2.6.32.12/drivers/macintosh/via-pmu.c 2010-03-15 11:52:04.000000000 -0400
25011+++ linux-2.6.32.11/drivers/macintosh/via-pmu.c 2010-04-04 20:46:41.593451026 -0400 25272+++ linux-2.6.32.12/drivers/macintosh/via-pmu.c 2010-04-04 20:46:41.593451026 -0400
25012@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state 25273@@ -2232,7 +2232,7 @@ static int pmu_sleep_valid(suspend_state
25013 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0); 25274 && (pmac_call_feature(PMAC_FTR_SLEEP_STATE, NULL, 0, -1) >= 0);
25014 } 25275 }
@@ -25018,9 +25279,9 @@ diff -urNp linux-2.6.32.11/drivers/macintosh/via-pmu.c linux-2.6.32.11/drivers/m
25018 .enter = powerbook_sleep, 25279 .enter = powerbook_sleep,
25019 .valid = pmu_sleep_valid, 25280 .valid = pmu_sleep_valid,
25020 }; 25281 };
25021diff -urNp linux-2.6.32.11/drivers/md/bitmap.c linux-2.6.32.11/drivers/md/bitmap.c 25282diff -urNp linux-2.6.32.12/drivers/md/bitmap.c linux-2.6.32.12/drivers/md/bitmap.c
25022--- linux-2.6.32.11/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400 25283--- linux-2.6.32.12/drivers/md/bitmap.c 2010-03-15 11:52:04.000000000 -0400
25023+++ linux-2.6.32.11/drivers/md/bitmap.c 2010-04-04 20:46:41.593451026 -0400 25284+++ linux-2.6.32.12/drivers/md/bitmap.c 2010-04-04 20:46:41.593451026 -0400
25024@@ -58,7 +58,7 @@ 25285@@ -58,7 +58,7 @@
25025 # if DEBUG > 0 25286 # if DEBUG > 0
25026 # define PRINTK(x...) printk(KERN_DEBUG x) 25287 # 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
25030 # endif 25291 # endif
25031 #endif 25292 #endif
25032 25293
25033diff -urNp linux-2.6.32.11/drivers/md/dm-sysfs.c linux-2.6.32.11/drivers/md/dm-sysfs.c 25294diff -urNp linux-2.6.32.12/drivers/md/dm-sysfs.c linux-2.6.32.12/drivers/md/dm-sysfs.c
25034--- linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400 25295--- linux-2.6.32.12/drivers/md/dm-sysfs.c 2010-03-15 11:52:04.000000000 -0400
25035+++ linux-2.6.32.11/drivers/md/dm-sysfs.c 2010-04-04 20:46:41.593451026 -0400 25296+++ linux-2.6.32.12/drivers/md/dm-sysfs.c 2010-04-04 20:46:41.593451026 -0400
25036@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = { 25297@@ -75,7 +75,7 @@ static struct attribute *dm_attrs[] = {
25037 NULL, 25298 NULL,
25038 }; 25299 };
@@ -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
25042 .show = dm_attr_show, 25303 .show = dm_attr_show,
25043 }; 25304 };
25044 25305
25045diff -urNp linux-2.6.32.11/drivers/md/dm-table.c linux-2.6.32.11/drivers/md/dm-table.c 25306diff -urNp linux-2.6.32.12/drivers/md/dm-table.c linux-2.6.32.12/drivers/md/dm-table.c
25046--- linux-2.6.32.11/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400 25307--- linux-2.6.32.12/drivers/md/dm-table.c 2010-03-15 11:52:04.000000000 -0400
25047+++ linux-2.6.32.11/drivers/md/dm-table.c 2010-04-04 20:46:41.593451026 -0400 25308+++ linux-2.6.32.12/drivers/md/dm-table.c 2010-04-04 20:46:41.593451026 -0400
25048@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct 25309@@ -359,7 +359,7 @@ static int device_area_is_invalid(struct
25049 if (!dev_size) 25310 if (!dev_size)
25050 return 0; 25311 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
25054 DMWARN("%s: %s too small for target: " 25315 DMWARN("%s: %s too small for target: "
25055 "start=%llu, len=%llu, dev_size=%llu", 25316 "start=%llu, len=%llu, dev_size=%llu",
25056 dm_device_name(ti->table->md), bdevname(bdev, b), 25317 dm_device_name(ti->table->md), bdevname(bdev, b),
25057diff -urNp linux-2.6.32.11/drivers/md/md.c linux-2.6.32.11/drivers/md/md.c 25318diff -urNp linux-2.6.32.12/drivers/md/md.c linux-2.6.32.12/drivers/md/md.c
25058--- linux-2.6.32.11/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400 25319--- linux-2.6.32.12/drivers/md/md.c 2010-03-15 11:52:04.000000000 -0400
25059+++ linux-2.6.32.11/drivers/md/md.c 2010-04-04 20:46:41.597784214 -0400 25320+++ linux-2.6.32.12/drivers/md/md.c 2010-04-04 20:46:41.597784214 -0400
25060@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko 25321@@ -2508,7 +2508,7 @@ static void rdev_free(struct kobject *ko
25061 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj); 25322 mdk_rdev_t *rdev = container_of(ko, mdk_rdev_t, kobj);
25062 kfree(rdev); 25323 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
25093 /* sync IO will cause sync_io to increase before the disk_stats 25354 /* sync IO will cause sync_io to increase before the disk_stats
25094 * as sync_io is counted when a request starts, and 25355 * as sync_io is counted when a request starts, and
25095 * disk_stats is counted when it completes. 25356 * disk_stats is counted when it completes.
25096diff -urNp linux-2.6.32.11/drivers/md/md.h linux-2.6.32.11/drivers/md/md.h 25357diff -urNp linux-2.6.32.12/drivers/md/md.h linux-2.6.32.12/drivers/md/md.h
25097--- linux-2.6.32.11/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400 25358--- linux-2.6.32.12/drivers/md/md.h 2010-03-15 11:52:04.000000000 -0400
25098+++ linux-2.6.32.11/drivers/md/md.h 2010-04-04 20:46:41.597784214 -0400 25359+++ linux-2.6.32.12/drivers/md/md.h 2010-04-04 20:46:41.597784214 -0400
25099@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_ 25360@@ -304,7 +304,7 @@ static inline void rdev_dec_pending(mdk_
25100 25361
25101 static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) 25362 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
25105 } 25366 }
25106 25367
25107 struct mdk_personality 25368 struct mdk_personality
25108diff -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 25369diff -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
25109--- linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400 25370--- linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c 2010-03-15 11:52:04.000000000 -0400
25110+++ linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c 2010-04-04 20:46:41.597784214 -0400 25371+++ linux-2.6.32.12/drivers/media/dvb/dvb-core/dvbdev.c 2010-04-04 20:46:41.597784214 -0400
25111@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt 25372@@ -191,6 +191,7 @@ int dvb_register_device(struct dvb_adapt
25112 const struct dvb_device *template, void *priv, int type) 25373 const struct dvb_device *template, void *priv, int type)
25113 { 25374 {
@@ -25116,9 +25377,9 @@ diff -urNp linux-2.6.32.11/drivers/media/dvb/dvb-core/dvbdev.c linux-2.6.32.11/d
25116 struct file_operations *dvbdevfops; 25377 struct file_operations *dvbdevfops;
25117 struct device *clsdev; 25378 struct device *clsdev;
25118 int minor; 25379 int minor;
25119diff -urNp linux-2.6.32.11/drivers/media/radio/radio-cadet.c linux-2.6.32.11/drivers/media/radio/radio-cadet.c 25380diff -urNp linux-2.6.32.12/drivers/media/radio/radio-cadet.c linux-2.6.32.12/drivers/media/radio/radio-cadet.c
25120--- linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400 25381--- linux-2.6.32.12/drivers/media/radio/radio-cadet.c 2010-03-15 11:52:04.000000000 -0400
25121+++ linux-2.6.32.11/drivers/media/radio/radio-cadet.c 2010-04-04 20:46:41.597784214 -0400 25382+++ linux-2.6.32.12/drivers/media/radio/radio-cadet.c 2010-04-04 20:46:41.597784214 -0400
25122@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f 25383@@ -347,7 +347,7 @@ static ssize_t cadet_read(struct file *f
25123 while (i < count && dev->rdsin != dev->rdsout) 25384 while (i < count && dev->rdsin != dev->rdsout)
25124 readbuf[i++] = dev->rdsbuf[dev->rdsout++]; 25385 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
25128 return -EFAULT; 25389 return -EFAULT;
25129 return i; 25390 return i;
25130 } 25391 }
25131diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 25392diff -urNp linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c
25132--- linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400 25393--- linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c 2010-03-15 11:52:04.000000000 -0400
25133+++ linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c 2010-04-04 20:46:41.597784214 -0400 25394+++ linux-2.6.32.12/drivers/media/video/usbvideo/konicawc.c 2010-04-04 20:46:41.597784214 -0400
25134@@ -225,7 +225,7 @@ static void konicawc_register_input(stru 25395@@ -225,7 +225,7 @@ static void konicawc_register_input(stru
25135 int error; 25396 int error;
25136 25397
@@ -25140,9 +25401,9 @@ diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/konicawc.c linux-2.6.32.
25140 25401
25141 cam->input = input_dev = input_allocate_device(); 25402 cam->input = input_dev = input_allocate_device();
25142 if (!input_dev) { 25403 if (!input_dev) {
25143diff -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 25404diff -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
25144--- linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400 25405--- linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c 2010-03-15 11:52:04.000000000 -0400
25145+++ linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c 2010-04-04 20:46:41.597784214 -0400 25406+++ linux-2.6.32.12/drivers/media/video/usbvideo/quickcam_messenger.c 2010-04-04 20:46:41.597784214 -0400
25146@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc 25407@@ -89,7 +89,7 @@ static void qcm_register_input(struct qc
25147 int error; 25408 int error;
25148 25409
@@ -25152,9 +25413,72 @@ diff -urNp linux-2.6.32.11/drivers/media/video/usbvideo/quickcam_messenger.c lin
25152 25413
25153 cam->input = input_dev = input_allocate_device(); 25414 cam->input = input_dev = input_allocate_device();
25154 if (!input_dev) { 25415 if (!input_dev) {
25155diff -urNp linux-2.6.32.11/drivers/message/i2o/i2o_proc.c linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 25416diff -urNp linux-2.6.32.12/drivers/message/fusion/mptdebug.h linux-2.6.32.12/drivers/message/fusion/mptdebug.h
25156--- linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400 25417--- linux-2.6.32.12/drivers/message/fusion/mptdebug.h 2010-03-15 11:52:04.000000000 -0400
25157+++ linux-2.6.32.11/drivers/message/i2o/i2o_proc.c 2010-04-04 20:46:41.597784214 -0400 25418+++ linux-2.6.32.12/drivers/message/fusion/mptdebug.h 2010-04-29 17:46:37.113104605 -0400
25419@@ -71,7 +71,7 @@
25420 CMD; \
25421 }
25422 #else
25423-#define MPT_CHECK_LOGGING(IOC, CMD, BITS)
25424+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0)
25425 #endif
25426
25427
25428diff -urNp linux-2.6.32.12/drivers/message/fusion/mptsas.c linux-2.6.32.12/drivers/message/fusion/mptsas.c
25429--- linux-2.6.32.12/drivers/message/fusion/mptsas.c 2010-03-15 11:52:04.000000000 -0400
25430+++ linux-2.6.32.12/drivers/message/fusion/mptsas.c 2010-04-29 17:46:37.113104605 -0400
25431@@ -436,6 +436,23 @@ mptsas_is_end_device(struct mptsas_devin
25432 return 0;
25433 }
25434
25435+static inline void
25436+mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
25437+{
25438+ if (phy_info->port_details) {
25439+ phy_info->port_details->rphy = rphy;
25440+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
25441+ ioc->name, rphy));
25442+ }
25443+
25444+ if (rphy) {
25445+ dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
25446+ &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
25447+ dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
25448+ ioc->name, rphy, rphy->dev.release));
25449+ }
25450+}
25451+
25452 /* no mutex */
25453 static void
25454 mptsas_port_delete(MPT_ADAPTER *ioc, struct mptsas_portinfo_details * port_details)
25455@@ -474,23 +491,6 @@ mptsas_get_rphy(struct mptsas_phyinfo *p
25456 return NULL;
25457 }
25458
25459-static inline void
25460-mptsas_set_rphy(MPT_ADAPTER *ioc, struct mptsas_phyinfo *phy_info, struct sas_rphy *rphy)
25461-{
25462- if (phy_info->port_details) {
25463- phy_info->port_details->rphy = rphy;
25464- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "sas_rphy_add: rphy=%p\n",
25465- ioc->name, rphy));
25466- }
25467-
25468- if (rphy) {
25469- dsaswideprintk(ioc, dev_printk(KERN_DEBUG,
25470- &rphy->dev, MYIOC_s_FMT "add:", ioc->name));
25471- dsaswideprintk(ioc, printk(MYIOC_s_DEBUG_FMT "rphy=%p release=%p\n",
25472- ioc->name, rphy, rphy->dev.release));
25473- }
25474-}
25475-
25476 static inline struct sas_port *
25477 mptsas_get_port(struct mptsas_phyinfo *phy_info)
25478 {
25479diff -urNp linux-2.6.32.12/drivers/message/i2o/i2o_proc.c linux-2.6.32.12/drivers/message/i2o/i2o_proc.c
25480--- linux-2.6.32.12/drivers/message/i2o/i2o_proc.c 2010-03-15 11:52:04.000000000 -0400
25481+++ linux-2.6.32.12/drivers/message/i2o/i2o_proc.c 2010-04-04 20:46:41.597784214 -0400
25158@@ -259,13 +259,6 @@ static char *scsi_devices[] = { 25482@@ -259,13 +259,6 @@ static char *scsi_devices[] = {
25159 "Array Controller Device" 25483 "Array Controller Device"
25160 }; 25484 };
@@ -25241,9 +25565,9 @@ diff -urNp linux-2.6.32.11/drivers/message/i2o/i2o_proc.c linux-2.6.32.11/driver
25241 25565
25242 return 0; 25566 return 0;
25243 } 25567 }
25244diff -urNp linux-2.6.32.11/drivers/misc/kgdbts.c linux-2.6.32.11/drivers/misc/kgdbts.c 25568diff -urNp linux-2.6.32.12/drivers/misc/kgdbts.c linux-2.6.32.12/drivers/misc/kgdbts.c
25245--- linux-2.6.32.11/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400 25569--- linux-2.6.32.12/drivers/misc/kgdbts.c 2010-03-15 11:52:04.000000000 -0400
25246+++ linux-2.6.32.11/drivers/misc/kgdbts.c 2010-04-04 20:46:41.597784214 -0400 25570+++ linux-2.6.32.12/drivers/misc/kgdbts.c 2010-04-04 20:46:41.597784214 -0400
25247@@ -118,7 +118,7 @@ 25571@@ -118,7 +118,7 @@
25248 } while (0) 25572 } while (0)
25249 #define MAX_CONFIG_LEN 40 25573 #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
25262 .name = "kgdbts", 25586 .name = "kgdbts",
25263 .read_char = kgdbts_get_char, 25587 .read_char = kgdbts_get_char,
25264 .write_char = kgdbts_put_char, 25588 .write_char = kgdbts_put_char,
25265diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 25589diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c
25266--- linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400 25590--- linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c 2010-03-15 11:52:04.000000000 -0400
25267+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruhandles.c 2010-04-04 20:46:41.597784214 -0400 25591+++ linux-2.6.32.12/drivers/misc/sgi-gru/gruhandles.c 2010-04-04 20:46:41.597784214 -0400
25268@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic 25592@@ -39,8 +39,8 @@ struct mcs_op_statistic mcs_op_statistic
25269 25593
25270 static void update_mcs_stats(enum mcs_op op, unsigned long clks) 25594 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
25276 if (mcs_op_statistics[op].max < clks) 25600 if (mcs_op_statistics[op].max < clks)
25277 mcs_op_statistics[op].max = clks; 25601 mcs_op_statistics[op].max = clks;
25278 } 25602 }
25279diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 25603diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c
25280--- linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400 25604--- linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c 2010-03-15 11:52:04.000000000 -0400
25281+++ linux-2.6.32.11/drivers/misc/sgi-gru/gruprocfs.c 2010-04-04 20:46:41.597784214 -0400 25605+++ linux-2.6.32.12/drivers/misc/sgi-gru/gruprocfs.c 2010-04-04 20:46:41.597784214 -0400
25282@@ -32,9 +32,9 @@ 25606@@ -32,9 +32,9 @@
25283 25607
25284 #define printstat(s, f) printstat_val(s, &gru_stats.f, #f) 25608 #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
25302 max = mcs_op_statistics[op].max; 25626 max = mcs_op_statistics[op].max;
25303 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count, 25627 seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
25304 count ? total / count : 0, max); 25628 count ? total / count : 0, max);
25305diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 25629diff -urNp linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h
25306--- linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400 25630--- linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h 2010-03-15 11:52:04.000000000 -0400
25307+++ linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h 2010-04-04 20:46:41.597784214 -0400 25631+++ linux-2.6.32.12/drivers/misc/sgi-gru/grutables.h 2010-04-04 20:46:41.597784214 -0400
25308@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids; 25632@@ -167,84 +167,84 @@ extern unsigned int gru_max_gids;
25309 * GRU statistics. 25633 * GRU statistics.
25310 */ 25634 */
@@ -25488,9 +25812,9 @@ diff -urNp linux-2.6.32.11/drivers/misc/sgi-gru/grutables.h linux-2.6.32.11/driv
25488 } while (0) 25812 } while (0)
25489 25813
25490 #ifdef CONFIG_SGI_GRU_DEBUG 25814 #ifdef CONFIG_SGI_GRU_DEBUG
25491diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2000.c linux-2.6.32.11/drivers/mtd/devices/doc2000.c 25815diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2000.c linux-2.6.32.12/drivers/mtd/devices/doc2000.c
25492--- linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400 25816--- linux-2.6.32.12/drivers/mtd/devices/doc2000.c 2010-03-15 11:52:04.000000000 -0400
25493+++ linux-2.6.32.11/drivers/mtd/devices/doc2000.c 2010-04-04 20:46:41.597784214 -0400 25817+++ linux-2.6.32.12/drivers/mtd/devices/doc2000.c 2010-04-04 20:46:41.597784214 -0400
25494@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt 25818@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
25495 25819
25496 /* The ECC will not be calculated correctly if less than 512 is written */ 25820 /* 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
25500 printk(KERN_WARNING 25824 printk(KERN_WARNING
25501 "ECC needs a full sector write (adr: %lx size %lx)\n", 25825 "ECC needs a full sector write (adr: %lx size %lx)\n",
25502 (long) to, (long) len); 25826 (long) to, (long) len);
25503diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2001.c linux-2.6.32.11/drivers/mtd/devices/doc2001.c 25827diff -urNp linux-2.6.32.12/drivers/mtd/devices/doc2001.c linux-2.6.32.12/drivers/mtd/devices/doc2001.c
25504--- linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400 25828--- linux-2.6.32.12/drivers/mtd/devices/doc2001.c 2010-03-15 11:52:04.000000000 -0400
25505+++ linux-2.6.32.11/drivers/mtd/devices/doc2001.c 2010-04-04 20:46:41.597784214 -0400 25829+++ linux-2.6.32.12/drivers/mtd/devices/doc2001.c 2010-04-04 20:46:41.597784214 -0400
25506@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt 25830@@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
25507 struct Nand *mychip = &this->chips[from >> (this->chipshift)]; 25831 struct Nand *mychip = &this->chips[from >> (this->chipshift)];
25508 25832
@@ -25512,9 +25836,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/devices/doc2001.c linux-2.6.32.11/drivers
25512 return -EINVAL; 25836 return -EINVAL;
25513 25837
25514 /* Don't allow a single read to cross a 512-byte block boundary */ 25838 /* Don't allow a single read to cross a 512-byte block boundary */
25515diff -urNp linux-2.6.32.11/drivers/mtd/ubi/build.c linux-2.6.32.11/drivers/mtd/ubi/build.c 25839diff -urNp linux-2.6.32.12/drivers/mtd/ubi/build.c linux-2.6.32.12/drivers/mtd/ubi/build.c
25516--- linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400 25840--- linux-2.6.32.12/drivers/mtd/ubi/build.c 2010-03-15 11:52:04.000000000 -0400
25517+++ linux-2.6.32.11/drivers/mtd/ubi/build.c 2010-04-04 20:46:41.597784214 -0400 25841+++ linux-2.6.32.12/drivers/mtd/ubi/build.c 2010-04-04 20:46:41.597784214 -0400
25518@@ -1255,7 +1255,7 @@ module_exit(ubi_exit); 25842@@ -1255,7 +1255,7 @@ module_exit(ubi_exit);
25519 static int __init bytes_str_to_int(const char *str) 25843 static int __init bytes_str_to_int(const char *str)
25520 { 25844 {
@@ -25554,9 +25878,9 @@ diff -urNp linux-2.6.32.11/drivers/mtd/ubi/build.c linux-2.6.32.11/drivers/mtd/u
25554 } 25878 }
25555 25879
25556 /** 25880 /**
25557diff -urNp linux-2.6.32.11/drivers/net/e1000e/82571.c linux-2.6.32.11/drivers/net/e1000e/82571.c 25881diff -urNp linux-2.6.32.12/drivers/net/e1000e/82571.c linux-2.6.32.12/drivers/net/e1000e/82571.c
25558--- linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400 25882--- linux-2.6.32.12/drivers/net/e1000e/82571.c 2010-03-15 11:52:04.000000000 -0400
25559+++ linux-2.6.32.11/drivers/net/e1000e/82571.c 2010-04-04 20:46:41.597784214 -0400 25883+++ linux-2.6.32.12/drivers/net/e1000e/82571.c 2010-04-04 20:46:41.597784214 -0400
25560@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s 25884@@ -212,6 +212,7 @@ static s32 e1000_init_mac_params_82571(s
25561 { 25885 {
25562 struct e1000_hw *hw = &adapter->hw; 25886 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
25610 .acquire_nvm = e1000_acquire_nvm_82571, 25934 .acquire_nvm = e1000_acquire_nvm_82571,
25611 .read_nvm = e1000e_read_nvm_eerd, 25935 .read_nvm = e1000e_read_nvm_eerd,
25612 .release_nvm = e1000_release_nvm_82571, 25936 .release_nvm = e1000_release_nvm_82571,
25613diff -urNp linux-2.6.32.11/drivers/net/e1000e/e1000.h linux-2.6.32.11/drivers/net/e1000e/e1000.h 25937diff -urNp linux-2.6.32.12/drivers/net/e1000e/e1000.h linux-2.6.32.12/drivers/net/e1000e/e1000.h
25614--- linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400 25938--- linux-2.6.32.12/drivers/net/e1000e/e1000.h 2010-03-15 11:52:04.000000000 -0400
25615+++ linux-2.6.32.11/drivers/net/e1000e/e1000.h 2010-04-04 20:46:41.597784214 -0400 25939+++ linux-2.6.32.12/drivers/net/e1000e/e1000.h 2010-04-04 20:46:41.597784214 -0400
25616@@ -375,9 +375,9 @@ struct e1000_info { 25940@@ -375,9 +375,9 @@ struct e1000_info {
25617 u32 pba; 25941 u32 pba;
25618 u32 max_hw_frame_size; 25942 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
25626 }; 25950 };
25627 25951
25628 /* hardware capability, feature, and workaround flags */ 25952 /* hardware capability, feature, and workaround flags */
25629diff -urNp linux-2.6.32.11/drivers/net/e1000e/es2lan.c linux-2.6.32.11/drivers/net/e1000e/es2lan.c 25953diff -urNp linux-2.6.32.12/drivers/net/e1000e/es2lan.c linux-2.6.32.12/drivers/net/e1000e/es2lan.c
25630--- linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400 25954--- linux-2.6.32.12/drivers/net/e1000e/es2lan.c 2010-03-15 11:52:04.000000000 -0400
25631+++ linux-2.6.32.11/drivers/net/e1000e/es2lan.c 2010-04-04 20:46:41.597784214 -0400 25955+++ linux-2.6.32.12/drivers/net/e1000e/es2lan.c 2010-04-04 20:46:41.597784214 -0400
25632@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es 25956@@ -207,6 +207,7 @@ static s32 e1000_init_mac_params_80003es
25633 { 25957 {
25634 struct e1000_hw *hw = &adapter->hw; 25958 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
25664 .acquire_nvm = e1000_acquire_nvm_80003es2lan, 25988 .acquire_nvm = e1000_acquire_nvm_80003es2lan,
25665 .read_nvm = e1000e_read_nvm_eerd, 25989 .read_nvm = e1000e_read_nvm_eerd,
25666 .release_nvm = e1000_release_nvm_80003es2lan, 25990 .release_nvm = e1000_release_nvm_80003es2lan,
25667diff -urNp linux-2.6.32.11/drivers/net/e1000e/hw.h linux-2.6.32.11/drivers/net/e1000e/hw.h 25991diff -urNp linux-2.6.32.12/drivers/net/e1000e/hw.h linux-2.6.32.12/drivers/net/e1000e/hw.h
25668--- linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400 25992--- linux-2.6.32.12/drivers/net/e1000e/hw.h 2010-04-04 20:41:49.956500002 -0400
25669+++ linux-2.6.32.11/drivers/net/e1000e/hw.h 2010-04-04 20:46:41.601781347 -0400 25993+++ linux-2.6.32.12/drivers/net/e1000e/hw.h 2010-04-04 20:46:41.601781347 -0400
25670@@ -756,34 +756,34 @@ struct e1000_mac_operations { 25994@@ -756,34 +756,34 @@ struct e1000_mac_operations {
25671 25995
25672 /* Function pointers for the PHY. */ 25996 /* 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
25726 }; 26050 };
25727 26051
25728 struct e1000_mac_info { 26052 struct e1000_mac_info {
25729diff -urNp linux-2.6.32.11/drivers/net/e1000e/ich8lan.c linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 26053diff -urNp linux-2.6.32.12/drivers/net/e1000e/ich8lan.c linux-2.6.32.12/drivers/net/e1000e/ich8lan.c
25730--- linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400 26054--- linux-2.6.32.12/drivers/net/e1000e/ich8lan.c 2010-04-04 20:41:49.960543003 -0400
25731+++ linux-2.6.32.11/drivers/net/e1000e/ich8lan.c 2010-04-04 20:46:41.601781347 -0400 26055+++ linux-2.6.32.12/drivers/net/e1000e/ich8lan.c 2010-04-04 20:46:41.601781347 -0400
25732@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan 26056@@ -3452,7 +3452,7 @@ static void e1000_clear_hw_cntrs_ich8lan
25733 } 26057 }
25734 } 26058 }
@@ -25756,9 +26080,9 @@ diff -urNp linux-2.6.32.11/drivers/net/e1000e/ich8lan.c linux-2.6.32.11/drivers/
25756 .acquire_nvm = e1000_acquire_nvm_ich8lan, 26080 .acquire_nvm = e1000_acquire_nvm_ich8lan,
25757 .read_nvm = e1000_read_nvm_ich8lan, 26081 .read_nvm = e1000_read_nvm_ich8lan,
25758 .release_nvm = e1000_release_nvm_ich8lan, 26082 .release_nvm = e1000_release_nvm_ich8lan,
25759diff -urNp linux-2.6.32.11/drivers/net/ibmveth.c linux-2.6.32.11/drivers/net/ibmveth.c 26083diff -urNp linux-2.6.32.12/drivers/net/ibmveth.c linux-2.6.32.12/drivers/net/ibmveth.c
25760--- linux-2.6.32.11/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400 26084--- linux-2.6.32.12/drivers/net/ibmveth.c 2010-03-15 11:52:04.000000000 -0400
25761+++ linux-2.6.32.11/drivers/net/ibmveth.c 2010-04-04 20:46:41.601781347 -0400 26085+++ linux-2.6.32.12/drivers/net/ibmveth.c 2010-04-04 20:46:41.601781347 -0400
25762@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr 26086@@ -1577,7 +1577,7 @@ static struct attribute * veth_pool_attr
25763 NULL, 26087 NULL,
25764 }; 26088 };
@@ -25768,10 +26092,10 @@ diff -urNp linux-2.6.32.11/drivers/net/ibmveth.c linux-2.6.32.11/drivers/net/ibm
25768 .show = veth_pool_show, 26092 .show = veth_pool_show,
25769 .store = veth_pool_store, 26093 .store = veth_pool_store,
25770 }; 26094 };
25771diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers/net/igb/e1000_82575.c 26095diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_82575.c linux-2.6.32.12/drivers/net/igb/e1000_82575.c
25772--- linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-03-15 11:52:04.000000000 -0400 26096--- linux-2.6.32.12/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:38.085476187 -0400
25773+++ linux-2.6.32.11/drivers/net/igb/e1000_82575.c 2010-04-04 20:46:41.601781347 -0400 26097+++ linux-2.6.32.12/drivers/net/igb/e1000_82575.c 2010-04-29 17:49:58.193505226 -0400
25774@@ -1400,7 +1400,7 @@ void igb_vmdq_set_replication_pf(struct 26098@@ -1401,7 +1401,7 @@ void igb_vmdq_set_replication_pf(struct
25775 wr32(E1000_VT_CTL, vt_ctl); 26099 wr32(E1000_VT_CTL, vt_ctl);
25776 } 26100 }
25777 26101
@@ -25780,7 +26104,7 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers
25780 .reset_hw = igb_reset_hw_82575, 26104 .reset_hw = igb_reset_hw_82575,
25781 .init_hw = igb_init_hw_82575, 26105 .init_hw = igb_init_hw_82575,
25782 .check_for_link = igb_check_for_link_82575, 26106 .check_for_link = igb_check_for_link_82575,
25783@@ -1409,13 +1409,13 @@ static struct e1000_mac_operations e1000 26107@@ -1410,13 +1410,13 @@ static struct e1000_mac_operations e1000
25784 .get_speed_and_duplex = igb_get_speed_and_duplex_copper, 26108 .get_speed_and_duplex = igb_get_speed_and_duplex_copper,
25785 }; 26109 };
25786 26110
@@ -25796,10 +26120,10 @@ diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_82575.c linux-2.6.32.11/drivers
25796 .acquire = igb_acquire_nvm_82575, 26120 .acquire = igb_acquire_nvm_82575,
25797 .read = igb_read_nvm_eerd, 26121 .read = igb_read_nvm_eerd,
25798 .release = igb_release_nvm_82575, 26122 .release = igb_release_nvm_82575,
25799diff -urNp linux-2.6.32.11/drivers/net/igb/e1000_hw.h linux-2.6.32.11/drivers/net/igb/e1000_hw.h 26123diff -urNp linux-2.6.32.12/drivers/net/igb/e1000_hw.h linux-2.6.32.12/drivers/net/igb/e1000_hw.h
25800--- linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-03-15 11:52:04.000000000 -0400 26124--- linux-2.6.32.12/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:38.085476187 -0400
25801+++ linux-2.6.32.11/drivers/net/igb/e1000_hw.h 2010-04-04 20:46:41.601781347 -0400 26125+++ linux-2.6.32.12/drivers/net/igb/e1000_hw.h 2010-04-29 17:49:58.197572571 -0400
25802@@ -302,17 +302,17 @@ struct e1000_phy_operations { 26126@@ -303,17 +303,17 @@ struct e1000_phy_operations {
25803 }; 26127 };
25804 26128
25805 struct e1000_nvm_operations { 26129 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
25824 }; 26148 };
25825 26149
25826 extern const struct e1000_info e1000_82575_info; 26150 extern const struct e1000_info e1000_82575_info;
25827diff -urNp linux-2.6.32.11/drivers/net/irda/vlsi_ir.c linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 26151diff -urNp linux-2.6.32.12/drivers/net/irda/vlsi_ir.c linux-2.6.32.12/drivers/net/irda/vlsi_ir.c
25828--- linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400 26152--- linux-2.6.32.12/drivers/net/irda/vlsi_ir.c 2010-03-15 11:52:04.000000000 -0400
25829+++ linux-2.6.32.11/drivers/net/irda/vlsi_ir.c 2010-04-04 20:46:41.601781347 -0400 26153+++ linux-2.6.32.12/drivers/net/irda/vlsi_ir.c 2010-04-04 20:46:41.601781347 -0400
25830@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit( 26154@@ -907,13 +907,12 @@ static netdev_tx_t vlsi_hard_start_xmit(
25831 /* no race - tx-ring already empty */ 26155 /* no race - tx-ring already empty */
25832 vlsi_set_baud(idev, iobase); 26156 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
25843 spin_unlock_irqrestore(&idev->lock, flags); 26167 spin_unlock_irqrestore(&idev->lock, flags);
25844 dev_kfree_skb_any(skb); 26168 dev_kfree_skb_any(skb);
25845 return NETDEV_TX_OK; 26169 return NETDEV_TX_OK;
25846diff -urNp linux-2.6.32.11/drivers/net/iseries_veth.c linux-2.6.32.11/drivers/net/iseries_veth.c 26170diff -urNp linux-2.6.32.12/drivers/net/iseries_veth.c linux-2.6.32.12/drivers/net/iseries_veth.c
25847--- linux-2.6.32.11/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400 26171--- linux-2.6.32.12/drivers/net/iseries_veth.c 2010-03-15 11:52:04.000000000 -0400
25848+++ linux-2.6.32.11/drivers/net/iseries_veth.c 2010-04-04 20:46:41.601781347 -0400 26172+++ linux-2.6.32.12/drivers/net/iseries_veth.c 2010-04-04 20:46:41.601781347 -0400
25849@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul 26173@@ -384,7 +384,7 @@ static struct attribute *veth_cnx_defaul
25850 NULL 26174 NULL
25851 }; 26175 };
@@ -25864,9 +26188,9 @@ diff -urNp linux-2.6.32.11/drivers/net/iseries_veth.c linux-2.6.32.11/drivers/ne
25864 .show = veth_port_attribute_show 26188 .show = veth_port_attribute_show
25865 }; 26189 };
25866 26190
25867diff -urNp linux-2.6.32.11/drivers/net/pcnet32.c linux-2.6.32.11/drivers/net/pcnet32.c 26191diff -urNp linux-2.6.32.12/drivers/net/pcnet32.c linux-2.6.32.12/drivers/net/pcnet32.c
25868--- linux-2.6.32.11/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400 26192--- linux-2.6.32.12/drivers/net/pcnet32.c 2010-03-15 11:52:04.000000000 -0400
25869+++ linux-2.6.32.11/drivers/net/pcnet32.c 2010-04-04 20:46:41.601781347 -0400 26193+++ linux-2.6.32.12/drivers/net/pcnet32.c 2010-04-04 20:46:41.601781347 -0400
25870@@ -79,7 +79,7 @@ static int cards_found; 26194@@ -79,7 +79,7 @@ static int cards_found;
25871 /* 26195 /*
25872 * VLB I/O addresses 26196 * 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
25876 { 0x300, 0x320, 0x340, 0x360, 0 }; 26200 { 0x300, 0x320, 0x340, 0x360, 0 };
25877 26201
25878 static int pcnet32_debug = 0; 26202 static int pcnet32_debug = 0;
25879diff -urNp linux-2.6.32.11/drivers/net/tg3.h linux-2.6.32.11/drivers/net/tg3.h 26203diff -urNp linux-2.6.32.12/drivers/net/tg3.h linux-2.6.32.12/drivers/net/tg3.h
25880--- linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400 26204--- linux-2.6.32.12/drivers/net/tg3.h 2010-04-04 20:41:49.968494922 -0400
25881+++ linux-2.6.32.11/drivers/net/tg3.h 2010-04-04 20:46:41.601781347 -0400 26205+++ linux-2.6.32.12/drivers/net/tg3.h 2010-04-04 20:46:41.601781347 -0400
25882@@ -95,6 +95,7 @@ 26206@@ -95,6 +95,7 @@
25883 #define CHIPREV_ID_5750_A0 0x4000 26207 #define CHIPREV_ID_5750_A0 0x4000
25884 #define CHIPREV_ID_5750_A1 0x4001 26208 #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
25887 #define CHIPREV_ID_5750_C2 0x4202 26211 #define CHIPREV_ID_5750_C2 0x4202
25888 #define CHIPREV_ID_5752_A0_HW 0x5000 26212 #define CHIPREV_ID_5752_A0_HW 0x5000
25889 #define CHIPREV_ID_5752_A0 0x6000 26213 #define CHIPREV_ID_5752_A0 0x6000
25890diff -urNp linux-2.6.32.11/drivers/net/tulip/de4x5.c linux-2.6.32.11/drivers/net/tulip/de4x5.c 26214diff -urNp linux-2.6.32.12/drivers/net/tulip/de4x5.c linux-2.6.32.12/drivers/net/tulip/de4x5.c
25891--- linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400 26215--- linux-2.6.32.12/drivers/net/tulip/de4x5.c 2010-03-15 11:52:04.000000000 -0400
25892+++ linux-2.6.32.11/drivers/net/tulip/de4x5.c 2010-04-04 20:46:41.601781347 -0400 26216+++ linux-2.6.32.12/drivers/net/tulip/de4x5.c 2010-04-04 20:46:41.601781347 -0400
25893@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru 26217@@ -5472,7 +5472,7 @@ de4x5_ioctl(struct net_device *dev, stru
25894 for (i=0; i<ETH_ALEN; i++) { 26218 for (i=0; i<ETH_ALEN; i++) {
25895 tmp.addr[i] = dev->dev_addr[i]; 26219 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
25908 return -EFAULT; 26232 return -EFAULT;
25909 break; 26233 break;
25910 } 26234 }
25911diff -urNp linux-2.6.32.11/drivers/net/usb/hso.c linux-2.6.32.11/drivers/net/usb/hso.c 26235diff -urNp linux-2.6.32.12/drivers/net/usb/hso.c linux-2.6.32.12/drivers/net/usb/hso.c
25912--- linux-2.6.32.11/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400 26236--- linux-2.6.32.12/drivers/net/usb/hso.c 2010-03-15 11:52:04.000000000 -0400
25913+++ linux-2.6.32.11/drivers/net/usb/hso.c 2010-04-04 20:46:41.605567348 -0400 26237+++ linux-2.6.32.12/drivers/net/usb/hso.c 2010-04-04 20:46:41.605567348 -0400
25914@@ -258,7 +258,7 @@ struct hso_serial { 26238@@ -258,7 +258,7 @@ struct hso_serial {
25915 26239
25916 /* from usb_serial_port */ 26240 /* 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
25989 result = 26313 result =
25990 hso_start_serial_device(serial_table[i], GFP_NOIO); 26314 hso_start_serial_device(serial_table[i], GFP_NOIO);
25991 hso_kick_transmit(dev2ser(serial_table[i])); 26315 hso_kick_transmit(dev2ser(serial_table[i]));
25992diff -urNp linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 26316diff -urNp linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c
25993--- linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26317--- linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c 2010-03-15 11:52:04.000000000 -0400
25994+++ linux-2.6.32.11/drivers/net/wireless/b43/debugfs.c 2010-04-04 20:46:41.605567348 -0400 26318+++ linux-2.6.32.12/drivers/net/wireless/b43/debugfs.c 2010-04-04 20:46:41.605567348 -0400
25995@@ -43,7 +43,7 @@ static struct dentry *rootdir; 26319@@ -43,7 +43,7 @@ static struct dentry *rootdir;
25996 struct b43_debugfs_fops { 26320 struct b43_debugfs_fops {
25997 ssize_t (*read)(struct b43_wldev *dev, char *buf, size_t bufsize); 26321 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
26001 /* Offset of struct b43_dfs_file in struct b43_dfsentry */ 26325 /* Offset of struct b43_dfs_file in struct b43_dfsentry */
26002 size_t file_struct_offset; 26326 size_t file_struct_offset;
26003 }; 26327 };
26004diff -urNp linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 26328diff -urNp linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c
26005--- linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26329--- linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26006+++ linux-2.6.32.11/drivers/net/wireless/b43legacy/debugfs.c 2010-04-04 20:46:41.605567348 -0400 26330+++ linux-2.6.32.12/drivers/net/wireless/b43legacy/debugfs.c 2010-04-04 20:46:41.605567348 -0400
26007@@ -44,7 +44,7 @@ static struct dentry *rootdir; 26331@@ -44,7 +44,7 @@ static struct dentry *rootdir;
26008 struct b43legacy_debugfs_fops { 26332 struct b43legacy_debugfs_fops {
26009 ssize_t (*read)(struct b43legacy_wldev *dev, char *buf, size_t bufsize); 26333 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
26013 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */ 26337 /* Offset of struct b43legacy_dfs_file in struct b43legacy_dfsentry */
26014 size_t file_struct_offset; 26338 size_t file_struct_offset;
26015 /* Take wl->irq_lock before calling read/write? */ 26339 /* Take wl->irq_lock before calling read/write? */
26016diff -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 26340diff -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
26017--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400 26341--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-03-15 11:52:04.000000000 -0400
26018+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-04 20:46:41.605567348 -0400 26342+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-1000.c 2010-04-04 20:46:41.605567348 -0400
26019@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib = 26343@@ -137,7 +137,7 @@ static struct iwl_lib_ops iwl1000_lib =
26020 }, 26344 },
26021 }; 26345 };
@@ -26025,9 +26349,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-1000.c linux-2.6.32.
26025 .ucode = &iwl5000_ucode, 26349 .ucode = &iwl5000_ucode,
26026 .lib = &iwl1000_lib, 26350 .lib = &iwl1000_lib,
26027 .hcmd = &iwl5000_hcmd, 26351 .hcmd = &iwl5000_hcmd,
26028diff -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 26352diff -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
26029--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400 26353--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:41:49.972919715 -0400
26030+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:46:41.605567348 -0400 26354+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-3945.c 2010-04-04 20:46:41.605567348 -0400
26031@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945 26355@@ -2874,7 +2874,7 @@ static struct iwl_hcmd_utils_ops iwl3945
26032 .build_addsta_hcmd = iwl3945_build_addsta_hcmd, 26356 .build_addsta_hcmd = iwl3945_build_addsta_hcmd,
26033 }; 26357 };
@@ -26037,10 +26361,10 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-3945.c linux-2.6.32.
26037 .ucode = &iwl3945_ucode, 26361 .ucode = &iwl3945_ucode,
26038 .lib = &iwl3945_lib, 26362 .lib = &iwl3945_lib,
26039 .hcmd = &iwl3945_hcmd, 26363 .hcmd = &iwl3945_hcmd,
26040diff -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 26364diff -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
26041--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-03-15 11:52:04.000000000 -0400 26365--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:38.221487644 -0400
26042+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-04 20:46:41.605567348 -0400 26366+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-4965.c 2010-04-29 17:49:58.277496729 -0400
26043@@ -2335,7 +2335,7 @@ static struct iwl_lib_ops iwl4965_lib = 26367@@ -2340,7 +2340,7 @@ static struct iwl_lib_ops iwl4965_lib =
26044 }, 26368 },
26045 }; 26369 };
26046 26370
@@ -26049,10 +26373,10 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-4965.c linux-2.6.32.
26049 .ucode = &iwl4965_ucode, 26373 .ucode = &iwl4965_ucode,
26050 .lib = &iwl4965_lib, 26374 .lib = &iwl4965_lib,
26051 .hcmd = &iwl4965_hcmd, 26375 .hcmd = &iwl4965_hcmd,
26052diff -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 26376diff -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
26053--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-03-15 11:52:04.000000000 -0400 26377--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:38.221487644 -0400
26054+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-04 20:46:41.605567348 -0400 26378+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-5000.c 2010-04-29 17:49:58.285504530 -0400
26055@@ -1626,14 +1626,14 @@ static struct iwl_lib_ops iwl5150_lib = 26379@@ -1628,14 +1628,14 @@ static struct iwl_lib_ops iwl5150_lib =
26056 }, 26380 },
26057 }; 26381 };
26058 26382
@@ -26069,9 +26393,9 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-5000.c linux-2.6.32.
26069 .ucode = &iwl5000_ucode, 26393 .ucode = &iwl5000_ucode,
26070 .lib = &iwl5150_lib, 26394 .lib = &iwl5150_lib,
26071 .hcmd = &iwl5000_hcmd, 26395 .hcmd = &iwl5000_hcmd,
26072diff -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 26396diff -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
26073--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400 26397--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-03-15 11:52:04.000000000 -0400
26074+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-04 20:46:41.605567348 -0400 26398+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-6000.c 2010-04-04 20:46:41.605567348 -0400
26075@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000 26399@@ -146,7 +146,7 @@ static struct iwl_hcmd_utils_ops iwl6000
26076 .calc_rssi = iwl5000_calc_rssi, 26400 .calc_rssi = iwl5000_calc_rssi,
26077 }; 26401 };
@@ -26081,9 +26405,23 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-6000.c linux-2.6.32.
26081 .ucode = &iwl5000_ucode, 26405 .ucode = &iwl5000_ucode,
26082 .lib = &iwl6000_lib, 26406 .lib = &iwl6000_lib,
26083 .hcmd = &iwl5000_hcmd, 26407 .hcmd = &iwl5000_hcmd,
26084diff -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 26408diff -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
26085--- linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400 26409--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-03-15 11:52:04.000000000 -0400
26086+++ linux-2.6.32.11/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-04-04 20:46:41.605567348 -0400 26410+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-debug.h 2010-04-29 17:46:37.170092362 -0400
26411@@ -118,8 +118,8 @@ void iwl_dbgfs_unregister(struct iwl_pri
26412 #endif
26413
26414 #else
26415-#define IWL_DEBUG(__priv, level, fmt, args...)
26416-#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...)
26417+#define IWL_DEBUG(__priv, level, fmt, args...) do {} while (0)
26418+#define IWL_DEBUG_LIMIT(__priv, level, fmt, args...) do {} while (0)
26419 static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
26420 void *p, u32 len)
26421 {}
26422diff -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
26423--- linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-03-15 11:52:04.000000000 -0400
26424+++ linux-2.6.32.12/drivers/net/wireless/iwlwifi/iwl-dev.h 2010-04-04 20:46:41.605567348 -0400
26087@@ -67,7 +67,7 @@ struct iwl_tx_queue; 26425@@ -67,7 +67,7 @@ struct iwl_tx_queue;
26088 26426
26089 /* shared structures from iwl-5000.c */ 26427 /* 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
26093 extern struct iwl_ucode_ops iwl5000_ucode; 26431 extern struct iwl_ucode_ops iwl5000_ucode;
26094 extern struct iwl_lib_ops iwl5000_lib; 26432 extern struct iwl_lib_ops iwl5000_lib;
26095 extern struct iwl_hcmd_ops iwl5000_hcmd; 26433 extern struct iwl_hcmd_ops iwl5000_hcmd;
26096diff -urNp linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 26434diff -urNp linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c
26097--- linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400 26435--- linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c 2010-03-15 11:52:04.000000000 -0400
26098+++ linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c 2010-04-04 20:46:41.605567348 -0400 26436+++ linux-2.6.32.12/drivers/net/wireless/libertas/debugfs.c 2010-04-04 20:46:41.605567348 -0400
26099@@ -708,7 +708,7 @@ out_unlock: 26437@@ -708,7 +708,7 @@ out_unlock:
26100 struct lbs_debugfs_files { 26438 struct lbs_debugfs_files {
26101 const char *name; 26439 const char *name;
@@ -26105,9 +26443,21 @@ diff -urNp linux-2.6.32.11/drivers/net/wireless/libertas/debugfs.c linux-2.6.32.
26105 }; 26443 };
26106 26444
26107 static const struct lbs_debugfs_files debugfs_files[] = { 26445 static const struct lbs_debugfs_files debugfs_files[] = {
26108diff -urNp linux-2.6.32.11/drivers/oprofile/buffer_sync.c linux-2.6.32.11/drivers/oprofile/buffer_sync.c 26446diff -urNp linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c
26109--- linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400 26447--- linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c 2010-03-15 11:52:04.000000000 -0400
26110+++ linux-2.6.32.11/drivers/oprofile/buffer_sync.c 2010-04-04 20:46:41.605567348 -0400 26448+++ linux-2.6.32.12/drivers/net/wireless/rndis_wlan.c 2010-04-29 17:46:37.185749089 -0400
26449@@ -1176,7 +1176,7 @@ static int set_rts_threshold(struct usbn
26450
26451 devdbg(usbdev, "set_rts_threshold %i", rts_threshold);
26452
26453- if (rts_threshold < 0 || rts_threshold > 2347)
26454+ if (rts_threshold > 2347)
26455 rts_threshold = 2347;
26456
26457 tmp = cpu_to_le32(rts_threshold);
26458diff -urNp linux-2.6.32.12/drivers/oprofile/buffer_sync.c linux-2.6.32.12/drivers/oprofile/buffer_sync.c
26459--- linux-2.6.32.12/drivers/oprofile/buffer_sync.c 2010-03-15 11:52:04.000000000 -0400
26460+++ linux-2.6.32.12/drivers/oprofile/buffer_sync.c 2010-04-04 20:46:41.605567348 -0400
26111@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en 26461@@ -340,7 +340,7 @@ static void add_data(struct op_entry *en
26112 if (cookie == NO_COOKIE) 26462 if (cookie == NO_COOKIE)
26113 offset = pc; 26463 offset = pc;
@@ -26143,9 +26493,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/buffer_sync.c linux-2.6.32.11/driver
26143 } 26493 }
26144 } 26494 }
26145 release_mm(mm); 26495 release_mm(mm);
26146diff -urNp linux-2.6.32.11/drivers/oprofile/event_buffer.c linux-2.6.32.11/drivers/oprofile/event_buffer.c 26496diff -urNp linux-2.6.32.12/drivers/oprofile/event_buffer.c linux-2.6.32.12/drivers/oprofile/event_buffer.c
26147--- linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400 26497--- linux-2.6.32.12/drivers/oprofile/event_buffer.c 2010-03-15 11:52:04.000000000 -0400
26148+++ linux-2.6.32.11/drivers/oprofile/event_buffer.c 2010-04-04 20:46:41.605567348 -0400 26498+++ linux-2.6.32.12/drivers/oprofile/event_buffer.c 2010-04-04 20:46:41.605567348 -0400
26149@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value 26499@@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
26150 } 26500 }
26151 26501
@@ -26155,9 +26505,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/event_buffer.c linux-2.6.32.11/drive
26155 return; 26505 return;
26156 } 26506 }
26157 26507
26158diff -urNp linux-2.6.32.11/drivers/oprofile/oprof.c linux-2.6.32.11/drivers/oprofile/oprof.c 26508diff -urNp linux-2.6.32.12/drivers/oprofile/oprof.c linux-2.6.32.12/drivers/oprofile/oprof.c
26159--- linux-2.6.32.11/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400 26509--- linux-2.6.32.12/drivers/oprofile/oprof.c 2010-03-15 11:52:04.000000000 -0400
26160+++ linux-2.6.32.11/drivers/oprofile/oprof.c 2010-04-04 20:46:41.605567348 -0400 26510+++ linux-2.6.32.12/drivers/oprofile/oprof.c 2010-04-04 20:46:41.605567348 -0400
26161@@ -110,7 +110,7 @@ static void switch_worker(struct work_st 26511@@ -110,7 +110,7 @@ static void switch_worker(struct work_st
26162 if (oprofile_ops.switch_events()) 26512 if (oprofile_ops.switch_events())
26163 return; 26513 return;
@@ -26167,9 +26517,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprof.c linux-2.6.32.11/drivers/opro
26167 start_switch_worker(); 26517 start_switch_worker();
26168 } 26518 }
26169 26519
26170diff -urNp linux-2.6.32.11/drivers/oprofile/oprofilefs.c linux-2.6.32.11/drivers/oprofile/oprofilefs.c 26520diff -urNp linux-2.6.32.12/drivers/oprofile/oprofilefs.c linux-2.6.32.12/drivers/oprofile/oprofilefs.c
26171--- linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400 26521--- linux-2.6.32.12/drivers/oprofile/oprofilefs.c 2010-03-15 11:52:04.000000000 -0400
26172+++ linux-2.6.32.11/drivers/oprofile/oprofilefs.c 2010-04-04 20:46:41.609229988 -0400 26522+++ linux-2.6.32.12/drivers/oprofile/oprofilefs.c 2010-04-04 20:46:41.609229988 -0400
26173@@ -187,7 +187,7 @@ static const struct file_operations atom 26523@@ -187,7 +187,7 @@ static const struct file_operations atom
26174 26524
26175 26525
@@ -26179,9 +26529,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofilefs.c linux-2.6.32.11/drivers
26179 { 26529 {
26180 struct dentry *d = __oprofilefs_create_file(sb, root, name, 26530 struct dentry *d = __oprofilefs_create_file(sb, root, name,
26181 &atomic_ro_fops, 0444); 26531 &atomic_ro_fops, 0444);
26182diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.c linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 26532diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.c linux-2.6.32.12/drivers/oprofile/oprofile_stats.c
26183--- linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400 26533--- linux-2.6.32.12/drivers/oprofile/oprofile_stats.c 2010-03-15 11:52:04.000000000 -0400
26184+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.c 2010-04-04 20:46:41.609229988 -0400 26534+++ linux-2.6.32.12/drivers/oprofile/oprofile_stats.c 2010-04-04 20:46:41.609229988 -0400
26185@@ -30,11 +30,11 @@ void oprofile_reset_stats(void) 26535@@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
26186 cpu_buf->sample_invalid_eip = 0; 26536 cpu_buf->sample_invalid_eip = 0;
26187 } 26537 }
@@ -26199,9 +26549,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.c linux-2.6.32.11/dri
26199 } 26549 }
26200 26550
26201 26551
26202diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.h linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 26552diff -urNp linux-2.6.32.12/drivers/oprofile/oprofile_stats.h linux-2.6.32.12/drivers/oprofile/oprofile_stats.h
26203--- linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400 26553--- linux-2.6.32.12/drivers/oprofile/oprofile_stats.h 2010-03-15 11:52:04.000000000 -0400
26204+++ linux-2.6.32.11/drivers/oprofile/oprofile_stats.h 2010-04-04 20:46:41.609229988 -0400 26554+++ linux-2.6.32.12/drivers/oprofile/oprofile_stats.h 2010-04-04 20:46:41.609229988 -0400
26205@@ -13,11 +13,11 @@ 26555@@ -13,11 +13,11 @@
26206 #include <asm/atomic.h> 26556 #include <asm/atomic.h>
26207 26557
@@ -26219,9 +26569,9 @@ diff -urNp linux-2.6.32.11/drivers/oprofile/oprofile_stats.h linux-2.6.32.11/dri
26219 }; 26569 };
26220 26570
26221 extern struct oprofile_stat_struct oprofile_stats; 26571 extern struct oprofile_stat_struct oprofile_stats;
26222diff -urNp linux-2.6.32.11/drivers/parisc/pdc_stable.c linux-2.6.32.11/drivers/parisc/pdc_stable.c 26572diff -urNp linux-2.6.32.12/drivers/parisc/pdc_stable.c linux-2.6.32.12/drivers/parisc/pdc_stable.c
26223--- linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400 26573--- linux-2.6.32.12/drivers/parisc/pdc_stable.c 2010-03-15 11:52:04.000000000 -0400
26224+++ linux-2.6.32.11/drivers/parisc/pdc_stable.c 2010-04-04 20:46:41.609229988 -0400 26574+++ linux-2.6.32.12/drivers/parisc/pdc_stable.c 2010-04-04 20:46:41.609229988 -0400
26225@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj 26575@@ -481,7 +481,7 @@ pdcspath_attr_store(struct kobject *kobj
26226 return ret; 26576 return ret;
26227 } 26577 }
@@ -26231,9 +26581,9 @@ diff -urNp linux-2.6.32.11/drivers/parisc/pdc_stable.c linux-2.6.32.11/drivers/p
26231 .show = pdcspath_attr_show, 26581 .show = pdcspath_attr_show,
26232 .store = pdcspath_attr_store, 26582 .store = pdcspath_attr_store,
26233 }; 26583 };
26234diff -urNp linux-2.6.32.11/drivers/parport/procfs.c linux-2.6.32.11/drivers/parport/procfs.c 26584diff -urNp linux-2.6.32.12/drivers/parport/procfs.c linux-2.6.32.12/drivers/parport/procfs.c
26235--- linux-2.6.32.11/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400 26585--- linux-2.6.32.12/drivers/parport/procfs.c 2010-03-15 11:52:04.000000000 -0400
26236+++ linux-2.6.32.11/drivers/parport/procfs.c 2010-04-04 20:46:41.609229988 -0400 26586+++ linux-2.6.32.12/drivers/parport/procfs.c 2010-04-04 20:46:41.609229988 -0400
26237@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t 26587@@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
26238 26588
26239 *ppos += len; 26589 *ppos += len;
@@ -26252,9 +26602,9 @@ diff -urNp linux-2.6.32.11/drivers/parport/procfs.c linux-2.6.32.11/drivers/parp
26252 } 26602 }
26253 #endif /* IEEE1284.3 support. */ 26603 #endif /* IEEE1284.3 support. */
26254 26604
26255diff -urNp linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 26605diff -urNp linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c
26256--- linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400 26606--- linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c 2010-03-15 11:52:04.000000000 -0400
26257+++ linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c 2010-04-04 20:46:41.609229988 -0400 26607+++ linux-2.6.32.12/drivers/pci/hotplug/acpiphp_glue.c 2010-04-04 20:46:41.609229988 -0400
26258@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif 26608@@ -111,7 +111,7 @@ static int post_dock_fixups(struct notif
26259 } 26609 }
26260 26610
@@ -26264,9 +26614,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/acpiphp_glue.c linux-2.6.32.11/dr
26264 .handler = handle_hotplug_event_func, 26614 .handler = handle_hotplug_event_func,
26265 }; 26615 };
26266 26616
26267diff -urNp linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 26617diff -urNp linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c
26268--- linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400 26618--- linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c 2010-03-15 11:52:04.000000000 -0400
26269+++ linux-2.6.32.11/drivers/pci/hotplug/cpqphp_nvram.c 2010-04-04 20:46:41.609229988 -0400 26619+++ linux-2.6.32.12/drivers/pci/hotplug/cpqphp_nvram.c 2010-04-04 20:46:41.609229988 -0400
26270@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_ 26620@@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
26271 26621
26272 void compaq_nvram_init (void __iomem *rom_start) 26622 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
26281 dbg("int15 entry = %p\n", compaq_int15_entry_point); 26631 dbg("int15 entry = %p\n", compaq_int15_entry_point);
26282 26632
26283 /* initialize our int15 lock */ 26633 /* initialize our int15 lock */
26284diff -urNp linux-2.6.32.11/drivers/pci/hotplug/fakephp.c linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 26634diff -urNp linux-2.6.32.12/drivers/pci/hotplug/fakephp.c linux-2.6.32.12/drivers/pci/hotplug/fakephp.c
26285--- linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400 26635--- linux-2.6.32.12/drivers/pci/hotplug/fakephp.c 2010-03-15 11:52:04.000000000 -0400
26286+++ linux-2.6.32.11/drivers/pci/hotplug/fakephp.c 2010-04-04 20:46:41.609229988 -0400 26636+++ linux-2.6.32.12/drivers/pci/hotplug/fakephp.c 2010-04-04 20:46:41.609229988 -0400
26287@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec 26637@@ -73,7 +73,7 @@ static void legacy_release(struct kobjec
26288 } 26638 }
26289 26639
@@ -26293,9 +26643,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/hotplug/fakephp.c linux-2.6.32.11/drivers
26293 .store = legacy_store, .show = legacy_show 26643 .store = legacy_store, .show = legacy_show
26294 }, 26644 },
26295 .release = &legacy_release, 26645 .release = &legacy_release,
26296diff -urNp linux-2.6.32.11/drivers/pci/intel-iommu.c linux-2.6.32.11/drivers/pci/intel-iommu.c 26646diff -urNp linux-2.6.32.12/drivers/pci/intel-iommu.c linux-2.6.32.12/drivers/pci/intel-iommu.c
26297--- linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400 26647--- linux-2.6.32.12/drivers/pci/intel-iommu.c 2010-03-15 11:52:04.000000000 -0400
26298+++ linux-2.6.32.11/drivers/pci/intel-iommu.c 2010-04-04 20:46:41.609229988 -0400 26648+++ linux-2.6.32.12/drivers/pci/intel-iommu.c 2010-04-04 20:46:41.609229988 -0400
26299@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de 26649@@ -2950,7 +2950,7 @@ static int intel_mapping_error(struct de
26300 return !dma_addr; 26650 return !dma_addr;
26301 } 26651 }
@@ -26305,9 +26655,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/intel-iommu.c linux-2.6.32.11/drivers/pci
26305 .alloc_coherent = intel_alloc_coherent, 26655 .alloc_coherent = intel_alloc_coherent,
26306 .free_coherent = intel_free_coherent, 26656 .free_coherent = intel_free_coherent,
26307 .map_sg = intel_map_sg, 26657 .map_sg = intel_map_sg,
26308diff -urNp linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 26658diff -urNp linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c
26309--- linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400 26659--- linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c 2010-03-15 11:52:04.000000000 -0400
26310+++ linux-2.6.32.11/drivers/pci/pcie/portdrv_pci.c 2010-04-04 20:46:41.609229988 -0400 26660+++ linux-2.6.32.12/drivers/pci/pcie/portdrv_pci.c 2010-04-04 20:46:41.609229988 -0400
26311@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru 26661@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru
26312 static const struct pci_device_id port_pci_ids[] = { { 26662 static const struct pci_device_id port_pci_ids[] = { {
26313 /* handle any PCI-Express port */ 26663 /* 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
26317 }; 26667 };
26318 MODULE_DEVICE_TABLE(pci, port_pci_ids); 26668 MODULE_DEVICE_TABLE(pci, port_pci_ids);
26319 26669
26320diff -urNp linux-2.6.32.11/drivers/pci/proc.c linux-2.6.32.11/drivers/pci/proc.c 26670diff -urNp linux-2.6.32.12/drivers/pci/probe.c linux-2.6.32.12/drivers/pci/probe.c
26321--- linux-2.6.32.11/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400 26671--- linux-2.6.32.12/drivers/pci/probe.c 2010-03-15 11:52:04.000000000 -0400
26322+++ linux-2.6.32.11/drivers/pci/proc.c 2010-04-04 20:46:41.609229988 -0400 26672+++ linux-2.6.32.12/drivers/pci/probe.c 2010-04-29 17:46:37.193749810 -0400
26673@@ -62,14 +62,14 @@ static ssize_t pci_bus_show_cpuaffinity(
26674 return ret;
26675 }
26676
26677-static ssize_t inline pci_bus_show_cpumaskaffinity(struct device *dev,
26678+static inline ssize_t pci_bus_show_cpumaskaffinity(struct device *dev,
26679 struct device_attribute *attr,
26680 char *buf)
26681 {
26682 return pci_bus_show_cpuaffinity(dev, 0, attr, buf);
26683 }
26684
26685-static ssize_t inline pci_bus_show_cpulistaffinity(struct device *dev,
26686+static inline ssize_t pci_bus_show_cpulistaffinity(struct device *dev,
26687 struct device_attribute *attr,
26688 char *buf)
26689 {
26690diff -urNp linux-2.6.32.12/drivers/pci/proc.c linux-2.6.32.12/drivers/pci/proc.c
26691--- linux-2.6.32.12/drivers/pci/proc.c 2010-03-15 11:52:04.000000000 -0400
26692+++ linux-2.6.32.12/drivers/pci/proc.c 2010-04-04 20:46:41.609229988 -0400
26323@@ -480,7 +480,16 @@ static const struct file_operations proc 26693@@ -480,7 +480,16 @@ static const struct file_operations proc
26324 static int __init pci_proc_init(void) 26694 static int __init pci_proc_init(void)
26325 { 26695 {
@@ -26337,9 +26707,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/proc.c linux-2.6.32.11/drivers/pci/proc.c
26337 proc_create("devices", 0, proc_bus_pci_dir, 26707 proc_create("devices", 0, proc_bus_pci_dir,
26338 &proc_bus_pci_dev_operations); 26708 &proc_bus_pci_dev_operations);
26339 proc_initialized = 1; 26709 proc_initialized = 1;
26340diff -urNp linux-2.6.32.11/drivers/pci/slot.c linux-2.6.32.11/drivers/pci/slot.c 26710diff -urNp linux-2.6.32.12/drivers/pci/slot.c linux-2.6.32.12/drivers/pci/slot.c
26341--- linux-2.6.32.11/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400 26711--- linux-2.6.32.12/drivers/pci/slot.c 2010-03-15 11:52:04.000000000 -0400
26342+++ linux-2.6.32.11/drivers/pci/slot.c 2010-04-04 20:46:41.609229988 -0400 26712+++ linux-2.6.32.12/drivers/pci/slot.c 2010-04-04 20:46:41.609229988 -0400
26343@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc 26713@@ -29,7 +29,7 @@ static ssize_t pci_slot_attr_store(struc
26344 return attribute->store ? attribute->store(slot, buf, len) : -EIO; 26714 return attribute->store ? attribute->store(slot, buf, len) : -EIO;
26345 } 26715 }
@@ -26349,9 +26719,9 @@ diff -urNp linux-2.6.32.11/drivers/pci/slot.c linux-2.6.32.11/drivers/pci/slot.c
26349 .show = pci_slot_attr_show, 26719 .show = pci_slot_attr_show,
26350 .store = pci_slot_attr_store, 26720 .store = pci_slot_attr_store,
26351 }; 26721 };
26352diff -urNp linux-2.6.32.11/drivers/pcmcia/ti113x.h linux-2.6.32.11/drivers/pcmcia/ti113x.h 26722diff -urNp linux-2.6.32.12/drivers/pcmcia/ti113x.h linux-2.6.32.12/drivers/pcmcia/ti113x.h
26353--- linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400 26723--- linux-2.6.32.12/drivers/pcmcia/ti113x.h 2010-03-15 11:52:04.000000000 -0400
26354+++ linux-2.6.32.11/drivers/pcmcia/ti113x.h 2010-04-04 20:46:41.609229988 -0400 26724+++ linux-2.6.32.12/drivers/pcmcia/ti113x.h 2010-04-04 20:46:41.609229988 -0400
26355@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl 26725@@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl
26356 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, 26726 DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID,
26357 ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), 26727 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
26361 }; 26731 };
26362 26732
26363 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) 26733 static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus)
26364diff -urNp linux-2.6.32.11/drivers/pcmcia/yenta_socket.c linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 26734diff -urNp linux-2.6.32.12/drivers/pcmcia/yenta_socket.c linux-2.6.32.12/drivers/pcmcia/yenta_socket.c
26365--- linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400 26735--- linux-2.6.32.12/drivers/pcmcia/yenta_socket.c 2010-03-15 11:52:04.000000000 -0400
26366+++ linux-2.6.32.11/drivers/pcmcia/yenta_socket.c 2010-04-04 20:46:41.609229988 -0400 26736+++ linux-2.6.32.12/drivers/pcmcia/yenta_socket.c 2010-04-04 20:46:41.609229988 -0400
26367@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table 26737@@ -1387,7 +1387,7 @@ static struct pci_device_id yenta_table
26368 26738
26369 /* match any cardbus bridge */ 26739 /* 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
26373 }; 26743 };
26374 MODULE_DEVICE_TABLE(pci, yenta_table); 26744 MODULE_DEVICE_TABLE(pci, yenta_table);
26375 26745
26376diff -urNp linux-2.6.32.11/drivers/platform/x86/acer-wmi.c linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 26746diff -urNp linux-2.6.32.12/drivers/platform/x86/acer-wmi.c linux-2.6.32.12/drivers/platform/x86/acer-wmi.c
26377--- linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400 26747--- linux-2.6.32.12/drivers/platform/x86/acer-wmi.c 2010-03-15 11:52:04.000000000 -0400
26378+++ linux-2.6.32.11/drivers/platform/x86/acer-wmi.c 2010-04-04 20:46:41.609229988 -0400 26748+++ linux-2.6.32.12/drivers/platform/x86/acer-wmi.c 2010-04-04 20:46:41.609229988 -0400
26379@@ -918,7 +918,7 @@ static int update_bl_status(struct backl 26749@@ -918,7 +918,7 @@ static int update_bl_status(struct backl
26380 return 0; 26750 return 0;
26381 } 26751 }
@@ -26385,9 +26755,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/acer-wmi.c linux-2.6.32.11/drive
26385 .get_brightness = read_brightness, 26755 .get_brightness = read_brightness,
26386 .update_status = update_bl_status, 26756 .update_status = update_bl_status,
26387 }; 26757 };
26388diff -urNp linux-2.6.32.11/drivers/platform/x86/asus_acpi.c linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 26758diff -urNp linux-2.6.32.12/drivers/platform/x86/asus_acpi.c linux-2.6.32.12/drivers/platform/x86/asus_acpi.c
26389--- linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400 26759--- linux-2.6.32.12/drivers/platform/x86/asus_acpi.c 2010-03-15 11:52:04.000000000 -0400
26390+++ linux-2.6.32.11/drivers/platform/x86/asus_acpi.c 2010-04-04 20:46:41.609229988 -0400 26760+++ linux-2.6.32.12/drivers/platform/x86/asus_acpi.c 2010-04-04 20:46:41.609229988 -0400
26391@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_ 26761@@ -1402,7 +1402,7 @@ static int asus_hotk_remove(struct acpi_
26392 return 0; 26762 return 0;
26393 } 26763 }
@@ -26397,9 +26767,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/asus_acpi.c linux-2.6.32.11/driv
26397 .get_brightness = read_brightness, 26767 .get_brightness = read_brightness,
26398 .update_status = set_brightness_status, 26768 .update_status = set_brightness_status,
26399 }; 26769 };
26400diff -urNp linux-2.6.32.11/drivers/platform/x86/asus-laptop.c linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 26770diff -urNp linux-2.6.32.12/drivers/platform/x86/asus-laptop.c linux-2.6.32.12/drivers/platform/x86/asus-laptop.c
26401--- linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400 26771--- linux-2.6.32.12/drivers/platform/x86/asus-laptop.c 2010-03-15 11:52:04.000000000 -0400
26402+++ linux-2.6.32.11/drivers/platform/x86/asus-laptop.c 2010-04-04 20:46:41.609229988 -0400 26772+++ linux-2.6.32.12/drivers/platform/x86/asus-laptop.c 2010-04-04 20:46:41.609229988 -0400
26403@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac 26773@@ -250,7 +250,7 @@ static struct backlight_device *asus_bac
26404 */ 26774 */
26405 static int read_brightness(struct backlight_device *bd); 26775 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
26409 .get_brightness = read_brightness, 26779 .get_brightness = read_brightness,
26410 .update_status = update_bl_status, 26780 .update_status = update_bl_status,
26411 }; 26781 };
26412diff -urNp linux-2.6.32.11/drivers/platform/x86/compal-laptop.c linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 26782diff -urNp linux-2.6.32.12/drivers/platform/x86/compal-laptop.c linux-2.6.32.12/drivers/platform/x86/compal-laptop.c
26413--- linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400 26783--- linux-2.6.32.12/drivers/platform/x86/compal-laptop.c 2010-03-15 11:52:04.000000000 -0400
26414+++ linux-2.6.32.11/drivers/platform/x86/compal-laptop.c 2010-04-04 20:46:41.612789562 -0400 26784+++ linux-2.6.32.12/drivers/platform/x86/compal-laptop.c 2010-04-04 20:46:41.612789562 -0400
26415@@ -163,7 +163,7 @@ static int bl_update_status(struct backl 26785@@ -163,7 +163,7 @@ static int bl_update_status(struct backl
26416 return set_lcd_level(b->props.brightness); 26786 return set_lcd_level(b->props.brightness);
26417 } 26787 }
@@ -26421,9 +26791,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/compal-laptop.c linux-2.6.32.11/
26421 .get_brightness = bl_get_brightness, 26791 .get_brightness = bl_get_brightness,
26422 .update_status = bl_update_status, 26792 .update_status = bl_update_status,
26423 }; 26793 };
26424diff -urNp linux-2.6.32.11/drivers/platform/x86/dell-laptop.c linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 26794diff -urNp linux-2.6.32.12/drivers/platform/x86/dell-laptop.c linux-2.6.32.12/drivers/platform/x86/dell-laptop.c
26425--- linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400 26795--- linux-2.6.32.12/drivers/platform/x86/dell-laptop.c 2010-03-15 11:52:04.000000000 -0400
26426+++ linux-2.6.32.11/drivers/platform/x86/dell-laptop.c 2010-04-04 20:46:41.612789562 -0400 26796+++ linux-2.6.32.12/drivers/platform/x86/dell-laptop.c 2010-04-04 20:46:41.612789562 -0400
26427@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac 26797@@ -305,7 +305,7 @@ static int dell_get_intensity(struct bac
26428 return buffer.output[1]; 26798 return buffer.output[1];
26429 } 26799 }
@@ -26433,10 +26803,10 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/dell-laptop.c linux-2.6.32.11/dr
26433 .get_brightness = dell_get_intensity, 26803 .get_brightness = dell_get_intensity,
26434 .update_status = dell_send_intensity, 26804 .update_status = dell_send_intensity,
26435 }; 26805 };
26436diff -urNp linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 26806diff -urNp linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c
26437--- linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-03-15 11:52:04.000000000 -0400 26807--- linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:38.317493070 -0400
26438+++ linux-2.6.32.11/drivers/platform/x86/eeepc-laptop.c 2010-04-04 20:46:41.612789562 -0400 26808+++ linux-2.6.32.12/drivers/platform/x86/eeepc-laptop.c 2010-04-29 17:49:58.337509449 -0400
26439@@ -242,7 +242,7 @@ static struct device *eeepc_hwmon_device 26809@@ -245,7 +245,7 @@ static struct device *eeepc_hwmon_device
26440 */ 26810 */
26441 static int read_brightness(struct backlight_device *bd); 26811 static int read_brightness(struct backlight_device *bd);
26442 static int update_bl_status(struct backlight_device *bd); 26812 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
26445 .get_brightness = read_brightness, 26815 .get_brightness = read_brightness,
26446 .update_status = update_bl_status, 26816 .update_status = update_bl_status,
26447 }; 26817 };
26448diff -urNp linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 26818diff -urNp linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c
26449--- linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400 26819--- linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c 2010-03-15 11:52:04.000000000 -0400
26450+++ linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c 2010-04-04 20:46:41.612789562 -0400 26820+++ linux-2.6.32.12/drivers/platform/x86/fujitsu-laptop.c 2010-04-04 20:46:41.612789562 -0400
26451@@ -436,7 +436,7 @@ static int bl_update_status(struct backl 26821@@ -436,7 +436,7 @@ static int bl_update_status(struct backl
26452 return ret; 26822 return ret;
26453 } 26823 }
@@ -26457,9 +26827,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/fujitsu-laptop.c linux-2.6.32.11
26457 .get_brightness = bl_get_brightness, 26827 .get_brightness = bl_get_brightness,
26458 .update_status = bl_update_status, 26828 .update_status = bl_update_status,
26459 }; 26829 };
26460diff -urNp linux-2.6.32.11/drivers/platform/x86/msi-laptop.c linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 26830diff -urNp linux-2.6.32.12/drivers/platform/x86/msi-laptop.c linux-2.6.32.12/drivers/platform/x86/msi-laptop.c
26461--- linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400 26831--- linux-2.6.32.12/drivers/platform/x86/msi-laptop.c 2010-03-15 11:52:04.000000000 -0400
26462+++ linux-2.6.32.11/drivers/platform/x86/msi-laptop.c 2010-04-04 20:46:41.612789562 -0400 26832+++ linux-2.6.32.12/drivers/platform/x86/msi-laptop.c 2010-04-04 20:46:41.612789562 -0400
26463@@ -161,7 +161,7 @@ static int bl_update_status(struct backl 26833@@ -161,7 +161,7 @@ static int bl_update_status(struct backl
26464 return set_lcd_level(b->props.brightness); 26834 return set_lcd_level(b->props.brightness);
26465 } 26835 }
@@ -26469,9 +26839,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/msi-laptop.c linux-2.6.32.11/dri
26469 .get_brightness = bl_get_brightness, 26839 .get_brightness = bl_get_brightness,
26470 .update_status = bl_update_status, 26840 .update_status = bl_update_status,
26471 }; 26841 };
26472diff -urNp linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 26842diff -urNp linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c
26473--- linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400 26843--- linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c 2010-03-15 11:52:04.000000000 -0400
26474+++ linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c 2010-04-04 20:46:41.612789562 -0400 26844+++ linux-2.6.32.12/drivers/platform/x86/panasonic-laptop.c 2010-04-04 20:46:41.612789562 -0400
26475@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh 26845@@ -352,7 +352,7 @@ static int bl_set_status(struct backligh
26476 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright); 26846 return acpi_pcc_write_sset(pcc, SINF_DC_CUR_BRIGHT, bright);
26477 } 26847 }
@@ -26481,9 +26851,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/panasonic-laptop.c linux-2.6.32.
26481 .get_brightness = bl_get, 26851 .get_brightness = bl_get,
26482 .update_status = bl_set_status, 26852 .update_status = bl_set_status,
26483 }; 26853 };
26484diff -urNp linux-2.6.32.11/drivers/platform/x86/sony-laptop.c linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 26854diff -urNp linux-2.6.32.12/drivers/platform/x86/sony-laptop.c linux-2.6.32.12/drivers/platform/x86/sony-laptop.c
26485--- linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400 26855--- linux-2.6.32.12/drivers/platform/x86/sony-laptop.c 2010-03-15 11:52:04.000000000 -0400
26486+++ linux-2.6.32.11/drivers/platform/x86/sony-laptop.c 2010-04-04 20:46:41.612789562 -0400 26856+++ linux-2.6.32.12/drivers/platform/x86/sony-laptop.c 2010-04-04 20:46:41.612789562 -0400
26487@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness 26857@@ -850,7 +850,7 @@ static int sony_backlight_get_brightness
26488 } 26858 }
26489 26859
@@ -26493,11 +26863,11 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/sony-laptop.c linux-2.6.32.11/dr
26493 .update_status = sony_backlight_update_status, 26863 .update_status = sony_backlight_update_status,
26494 .get_brightness = sony_backlight_get_brightness, 26864 .get_brightness = sony_backlight_get_brightness,
26495 }; 26865 };
26496diff -urNp linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 26866diff -urNp linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c
26497--- linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-03-15 11:52:04.000000000 -0400 26867--- linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 17:49:38.333363657 -0400
26498+++ linux-2.6.32.11/drivers/platform/x86/thinkpad_acpi.c 2010-04-04 20:46:41.612789562 -0400 26868+++ linux-2.6.32.12/drivers/platform/x86/thinkpad_acpi.c 2010-04-29 18:04:08.901389713 -0400
26499@@ -6083,7 +6083,7 @@ static int brightness_get(struct backlig 26869@@ -6122,7 +6122,7 @@ static void tpacpi_brightness_notify_cha
26500 return status & TP_EC_BACKLIGHT_LVLMSK; 26870 BACKLIGHT_UPDATE_HOTKEY);
26501 } 26871 }
26502 26872
26503-static struct backlight_ops ibm_backlight_data = { 26873-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/
26505 .get_brightness = brightness_get, 26875 .get_brightness = brightness_get,
26506 .update_status = brightness_update_status, 26876 .update_status = brightness_update_status,
26507 }; 26877 };
26508diff -urNp linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 26878diff -urNp linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c
26509--- linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400 26879--- linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c 2010-03-15 11:52:04.000000000 -0400
26510+++ linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c 2010-04-04 20:46:41.612789562 -0400 26880+++ linux-2.6.32.12/drivers/platform/x86/toshiba_acpi.c 2010-04-04 20:46:41.612789562 -0400
26511@@ -671,7 +671,7 @@ static acpi_status remove_device(void) 26881@@ -671,7 +671,7 @@ static acpi_status remove_device(void)
26512 return AE_OK; 26882 return AE_OK;
26513 } 26883 }
@@ -26517,9 +26887,9 @@ diff -urNp linux-2.6.32.11/drivers/platform/x86/toshiba_acpi.c linux-2.6.32.11/d
26517 .get_brightness = get_lcd, 26887 .get_brightness = get_lcd,
26518 .update_status = set_lcd_status, 26888 .update_status = set_lcd_status,
26519 }; 26889 };
26520diff -urNp linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 26890diff -urNp linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c
26521--- linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400 26891--- linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c 2010-03-15 11:52:04.000000000 -0400
26522+++ linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c 2010-04-04 20:46:41.612789562 -0400 26892+++ linux-2.6.32.12/drivers/pnp/pnpbios/bioscalls.c 2010-04-04 20:46:41.612789562 -0400
26523@@ -60,7 +60,7 @@ do { \ 26893@@ -60,7 +60,7 @@ do { \
26524 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \ 26894 set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
26525 } while(0) 26895 } while(0)
@@ -26576,9 +26946,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/pnpbios/bioscalls.c linux-2.6.32.11/drive
26576+ 26946+
26577+ pax_close_kernel(); 26947+ pax_close_kernel();
26578 } 26948 }
26579diff -urNp linux-2.6.32.11/drivers/pnp/quirks.c linux-2.6.32.11/drivers/pnp/quirks.c 26949diff -urNp linux-2.6.32.12/drivers/pnp/quirks.c linux-2.6.32.12/drivers/pnp/quirks.c
26580--- linux-2.6.32.11/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400 26950--- linux-2.6.32.12/drivers/pnp/quirks.c 2010-03-15 11:52:04.000000000 -0400
26581+++ linux-2.6.32.11/drivers/pnp/quirks.c 2010-04-04 20:46:41.612789562 -0400 26951+++ linux-2.6.32.12/drivers/pnp/quirks.c 2010-04-04 20:46:41.612789562 -0400
26582@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { 26952@@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = {
26583 /* PnP resources that might overlap PCI BARs */ 26953 /* PnP resources that might overlap PCI BARs */
26584 {"PNP0c01", quirk_system_pci_resources}, 26954 {"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
26588 }; 26958 };
26589 26959
26590 void pnp_fixup_device(struct pnp_dev *dev) 26960 void pnp_fixup_device(struct pnp_dev *dev)
26591diff -urNp linux-2.6.32.11/drivers/pnp/resource.c linux-2.6.32.11/drivers/pnp/resource.c 26961diff -urNp linux-2.6.32.12/drivers/pnp/resource.c linux-2.6.32.12/drivers/pnp/resource.c
26592--- linux-2.6.32.11/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400 26962--- linux-2.6.32.12/drivers/pnp/resource.c 2010-03-15 11:52:04.000000000 -0400
26593+++ linux-2.6.32.11/drivers/pnp/resource.c 2010-04-04 20:46:41.612789562 -0400 26963+++ linux-2.6.32.12/drivers/pnp/resource.c 2010-04-04 20:46:41.612789562 -0400
26594@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s 26964@@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
26595 return 1; 26965 return 1;
26596 26966
@@ -26609,9 +26979,9 @@ diff -urNp linux-2.6.32.11/drivers/pnp/resource.c linux-2.6.32.11/drivers/pnp/re
26609 return 0; 26979 return 0;
26610 26980
26611 /* check if the resource is reserved */ 26981 /* check if the resource is reserved */
26612diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.c linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 26982diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.c linux-2.6.32.12/drivers/s390/cio/qdio_perf.c
26613--- linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400 26983--- linux-2.6.32.12/drivers/s390/cio/qdio_perf.c 2010-03-15 11:52:04.000000000 -0400
26614+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.c 2010-04-04 20:46:41.612789562 -0400 26984+++ linux-2.6.32.12/drivers/s390/cio/qdio_perf.c 2010-04-04 20:46:41.612789562 -0400
26615@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_ 26985@@ -31,51 +31,51 @@ static struct proc_dir_entry *qdio_perf_
26616 static int qdio_perf_proc_show(struct seq_file *m, void *v) 26986 static int qdio_perf_proc_show(struct seq_file *m, void *v)
26617 { 26987 {
@@ -26687,9 +27057,9 @@ diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.c linux-2.6.32.11/drivers/
26687 seq_printf(m, "\n"); 27057 seq_printf(m, "\n");
26688 return 0; 27058 return 0;
26689 } 27059 }
26690diff -urNp linux-2.6.32.11/drivers/s390/cio/qdio_perf.h linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 27060diff -urNp linux-2.6.32.12/drivers/s390/cio/qdio_perf.h linux-2.6.32.12/drivers/s390/cio/qdio_perf.h
26691--- linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400 27061--- linux-2.6.32.12/drivers/s390/cio/qdio_perf.h 2010-03-15 11:52:04.000000000 -0400
26692+++ linux-2.6.32.11/drivers/s390/cio/qdio_perf.h 2010-04-04 20:46:41.612789562 -0400 27062+++ linux-2.6.32.12/drivers/s390/cio/qdio_perf.h 2010-04-04 20:46:41.612789562 -0400
26693@@ -13,46 +13,46 @@ 27063@@ -13,46 +13,46 @@
26694 27064
26695 struct qdio_perf_stats { 27065 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/
26762 } 27132 }
26763 27133
26764 int qdio_setup_perf_stats(void); 27134 int qdio_setup_perf_stats(void);
26765diff -urNp linux-2.6.32.11/drivers/scsi/ipr.c linux-2.6.32.11/drivers/scsi/ipr.c 27135diff -urNp linux-2.6.32.12/drivers/scsi/ipr.c linux-2.6.32.12/drivers/scsi/ipr.c
26766--- linux-2.6.32.11/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400 27136--- linux-2.6.32.12/drivers/scsi/ipr.c 2010-03-15 11:52:04.000000000 -0400
26767+++ linux-2.6.32.11/drivers/scsi/ipr.c 2010-04-04 20:46:41.616874360 -0400 27137+++ linux-2.6.32.12/drivers/scsi/ipr.c 2010-04-04 20:46:41.616874360 -0400
26768@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q 27138@@ -5286,7 +5286,7 @@ static bool ipr_qc_fill_rtf(struct ata_q
26769 return true; 27139 return true;
26770 } 27140 }
@@ -26774,9 +27144,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/ipr.c linux-2.6.32.11/drivers/scsi/ipr.c
26774 .phy_reset = ipr_ata_phy_reset, 27144 .phy_reset = ipr_ata_phy_reset,
26775 .hardreset = ipr_sata_reset, 27145 .hardreset = ipr_sata_reset,
26776 .post_internal_cmd = ipr_ata_post_internal, 27146 .post_internal_cmd = ipr_ata_post_internal,
26777diff -urNp linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 27147diff -urNp linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c
26778--- linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400 27148--- linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c 2010-03-15 11:52:04.000000000 -0400
26779+++ linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c 2010-04-04 20:46:41.616874360 -0400 27149+++ linux-2.6.32.12/drivers/scsi/libfc/fc_exch.c 2010-04-04 20:46:41.616874360 -0400
26780@@ -86,12 +86,12 @@ struct fc_exch_mgr { 27150@@ -86,12 +86,12 @@ struct fc_exch_mgr {
26781 * all together if not used XXX 27151 * all together if not used XXX
26782 */ 27152 */
@@ -26898,9 +27268,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/libfc/fc_exch.c linux-2.6.32.11/drivers/
26898 27268
26899 fc_frame_free(fp); 27269 fc_frame_free(fp);
26900 } 27270 }
26901diff -urNp linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 27271diff -urNp linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c
26902--- linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400 27272--- linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c 2010-03-15 11:52:04.000000000 -0400
26903+++ linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c 2010-04-04 20:46:41.616874360 -0400 27273+++ linux-2.6.32.12/drivers/scsi/libsas/sas_ata.c 2010-04-04 20:46:41.616874360 -0400
26904@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l 27274@@ -343,7 +343,7 @@ static int sas_ata_scr_read(struct ata_l
26905 } 27275 }
26906 } 27276 }
@@ -26910,9 +27280,21 @@ diff -urNp linux-2.6.32.11/drivers/scsi/libsas/sas_ata.c linux-2.6.32.11/drivers
26910 .phy_reset = sas_ata_phy_reset, 27280 .phy_reset = sas_ata_phy_reset,
26911 .post_internal_cmd = sas_ata_post_internal, 27281 .post_internal_cmd = sas_ata_post_internal,
26912 .qc_prep = ata_noop_qc_prep, 27282 .qc_prep = ata_noop_qc_prep,
26913diff -urNp linux-2.6.32.11/drivers/scsi/scsi_logging.h linux-2.6.32.11/drivers/scsi/scsi_logging.h 27283diff -urNp linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h
26914--- linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400 27284--- linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-03-15 11:52:04.000000000 -0400
26915+++ linux-2.6.32.11/drivers/scsi/scsi_logging.h 2010-04-04 20:46:41.616874360 -0400 27285+++ linux-2.6.32.12/drivers/scsi/mpt2sas/mpt2sas_debug.h 2010-04-29 17:46:37.209772088 -0400
27286@@ -79,7 +79,7 @@
27287 CMD; \
27288 }
27289 #else
27290-#define MPT_CHECK_LOGGING(IOC, CMD, BITS)
27291+#define MPT_CHECK_LOGGING(IOC, CMD, BITS) do {} while (0)
27292 #endif /* CONFIG_SCSI_MPT2SAS_LOGGING */
27293
27294
27295diff -urNp linux-2.6.32.12/drivers/scsi/scsi_logging.h linux-2.6.32.12/drivers/scsi/scsi_logging.h
27296--- linux-2.6.32.12/drivers/scsi/scsi_logging.h 2010-03-15 11:52:04.000000000 -0400
27297+++ linux-2.6.32.12/drivers/scsi/scsi_logging.h 2010-04-04 20:46:41.616874360 -0400
26916@@ -51,7 +51,7 @@ do { \ 27298@@ -51,7 +51,7 @@ do { \
26917 } while (0); \ 27299 } while (0); \
26918 } while (0) 27300 } 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
26922 #endif /* CONFIG_SCSI_LOGGING */ 27304 #endif /* CONFIG_SCSI_LOGGING */
26923 27305
26924 /* 27306 /*
26925diff -urNp linux-2.6.32.11/drivers/scsi/sg.c linux-2.6.32.11/drivers/scsi/sg.c 27307diff -urNp linux-2.6.32.12/drivers/scsi/sg.c linux-2.6.32.12/drivers/scsi/sg.c
26926--- linux-2.6.32.11/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400 27308--- linux-2.6.32.12/drivers/scsi/sg.c 2010-03-15 11:52:04.000000000 -0400
26927+++ linux-2.6.32.11/drivers/scsi/sg.c 2010-04-04 20:46:41.616874360 -0400 27309+++ linux-2.6.32.12/drivers/scsi/sg.c 2010-04-04 20:46:41.616874360 -0400
26928@@ -2292,7 +2292,7 @@ struct sg_proc_leaf { 27310@@ -2292,7 +2292,7 @@ struct sg_proc_leaf {
26929 const struct file_operations * fops; 27311 const struct file_operations * fops;
26930 }; 27312 };
@@ -26943,9 +27325,9 @@ diff -urNp linux-2.6.32.11/drivers/scsi/sg.c linux-2.6.32.11/drivers/scsi/sg.c
26943 27325
26944 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL); 27326 sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
26945 if (!sg_proc_sgp) 27327 if (!sg_proc_sgp)
26946diff -urNp linux-2.6.32.11/drivers/serial/8250_pci.c linux-2.6.32.11/drivers/serial/8250_pci.c 27328diff -urNp linux-2.6.32.12/drivers/serial/8250_pci.c linux-2.6.32.12/drivers/serial/8250_pci.c
26947--- linux-2.6.32.11/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400 27329--- linux-2.6.32.12/drivers/serial/8250_pci.c 2010-03-15 11:52:04.000000000 -0400
26948+++ linux-2.6.32.11/drivers/serial/8250_pci.c 2010-04-04 20:46:41.616874360 -0400 27330+++ linux-2.6.32.12/drivers/serial/8250_pci.c 2010-04-04 20:46:41.616874360 -0400
26949@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t 27331@@ -3664,7 +3664,7 @@ static struct pci_device_id serial_pci_t
26950 PCI_ANY_ID, PCI_ANY_ID, 27332 PCI_ANY_ID, PCI_ANY_ID,
26951 PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 27333 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
26955 }; 27337 };
26956 27338
26957 static struct pci_driver serial_pci_driver = { 27339 static struct pci_driver serial_pci_driver = {
26958diff -urNp linux-2.6.32.11/drivers/serial/kgdboc.c linux-2.6.32.11/drivers/serial/kgdboc.c 27340diff -urNp linux-2.6.32.12/drivers/serial/kgdboc.c linux-2.6.32.12/drivers/serial/kgdboc.c
26959--- linux-2.6.32.11/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400 27341--- linux-2.6.32.12/drivers/serial/kgdboc.c 2010-03-15 11:52:04.000000000 -0400
26960+++ linux-2.6.32.11/drivers/serial/kgdboc.c 2010-04-04 20:46:41.616874360 -0400 27342+++ linux-2.6.32.12/drivers/serial/kgdboc.c 2010-04-04 20:46:41.616874360 -0400
26961@@ -18,7 +18,7 @@ 27343@@ -18,7 +18,7 @@
26962 27344
26963 #define MAX_CONFIG_LEN 40 27345 #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
26976 .name = "kgdboc", 27358 .name = "kgdboc",
26977 .read_char = kgdboc_get_char, 27359 .read_char = kgdboc_get_char,
26978 .write_char = kgdboc_put_char, 27360 .write_char = kgdboc_put_char,
26979diff -urNp linux-2.6.32.11/drivers/staging/android/binder.c linux-2.6.32.11/drivers/staging/android/binder.c 27361diff -urNp linux-2.6.32.12/drivers/staging/android/binder.c linux-2.6.32.12/drivers/staging/android/binder.c
26980--- linux-2.6.32.11/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400 27362--- linux-2.6.32.12/drivers/staging/android/binder.c 2010-03-15 11:52:04.000000000 -0400
26981+++ linux-2.6.32.11/drivers/staging/android/binder.c 2010-04-04 20:46:41.616874360 -0400 27363+++ linux-2.6.32.12/drivers/staging/android/binder.c 2010-04-04 20:46:41.616874360 -0400
26982@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a 27364@@ -2756,7 +2756,7 @@ static void binder_vma_close(struct vm_a
26983 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); 27365 binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES);
26984 } 27366 }
@@ -26988,9 +27370,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/android/binder.c linux-2.6.32.11/driv
26988 .open = binder_vma_open, 27370 .open = binder_vma_open,
26989 .close = binder_vma_close, 27371 .close = binder_vma_close,
26990 }; 27372 };
26991diff -urNp linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 27373diff -urNp linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c
26992--- linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400 27374--- linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c 2010-03-15 11:52:04.000000000 -0400
26993+++ linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c 2010-04-04 20:46:41.616874360 -0400 27375+++ linux-2.6.32.12/drivers/staging/b3dfg/b3dfg.c 2010-04-04 20:46:41.616874360 -0400
26994@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are 27376@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are
26995 return VM_FAULT_NOPAGE; 27377 return VM_FAULT_NOPAGE;
26996 } 27378 }
@@ -27009,9 +27391,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/b3dfg/b3dfg.c linux-2.6.32.11/drivers
27009 .owner = THIS_MODULE, 27391 .owner = THIS_MODULE,
27010 .open = b3dfg_open, 27392 .open = b3dfg_open,
27011 .release = b3dfg_release, 27393 .release = b3dfg_release,
27012diff -urNp linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 27394diff -urNp linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c
27013--- linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400 27395--- linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c 2010-03-15 11:52:04.000000000 -0400
27014+++ linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c 2010-04-04 20:46:41.616874360 -0400 27396+++ linux-2.6.32.12/drivers/staging/comedi/comedi_fops.c 2010-04-04 20:46:41.616874360 -0400
27015@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct 27397@@ -1389,7 +1389,7 @@ void comedi_unmap(struct vm_area_struct
27016 mutex_unlock(&dev->mutex); 27398 mutex_unlock(&dev->mutex);
27017 } 27399 }
@@ -27021,9 +27403,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/comedi/comedi_fops.c linux-2.6.32.11/
27021 .close = comedi_unmap, 27403 .close = comedi_unmap,
27022 }; 27404 };
27023 27405
27024diff -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 27406diff -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
27025--- linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400 27407--- linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c 2010-03-15 11:52:04.000000000 -0400
27026+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/adsp_driver.c 2010-04-04 20:46:41.616874360 -0400 27408+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/adsp_driver.c 2010-04-04 20:46:41.616874360 -0400
27027@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi 27409@@ -576,7 +576,7 @@ static struct adsp_device *inode_to_devi
27028 static dev_t adsp_devno; 27410 static dev_t adsp_devno;
27029 static struct class *adsp_class; 27411 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
27033 .owner = THIS_MODULE, 27415 .owner = THIS_MODULE,
27034 .open = adsp_open, 27416 .open = adsp_open,
27035 .unlocked_ioctl = adsp_ioctl, 27417 .unlocked_ioctl = adsp_ioctl,
27036diff -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 27418diff -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
27037--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400 27419--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c 2010-03-15 11:52:04.000000000 -0400
27038+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c 2010-04-04 20:46:41.621505029 -0400 27420+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_aac.c 2010-04-04 20:46:41.621505029 -0400
27039@@ -1022,7 +1022,7 @@ done: 27421@@ -1022,7 +1022,7 @@ done:
27040 return rc; 27422 return rc;
27041 } 27423 }
@@ -27045,9 +27427,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_aac.c linux-2.6.32.
27045 .owner = THIS_MODULE, 27427 .owner = THIS_MODULE,
27046 .open = audio_open, 27428 .open = audio_open,
27047 .release = audio_release, 27429 .release = audio_release,
27048diff -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 27430diff -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
27049--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400 27431--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-03-15 11:52:04.000000000 -0400
27050+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-04-04 20:46:41.621505029 -0400 27432+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_amrnb.c 2010-04-04 20:46:41.621505029 -0400
27051@@ -833,7 +833,7 @@ done: 27433@@ -833,7 +833,7 @@ done:
27052 return rc; 27434 return rc;
27053 } 27435 }
@@ -27057,9 +27439,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_amrnb.c linux-2.6.3
27057 .owner = THIS_MODULE, 27439 .owner = THIS_MODULE,
27058 .open = audamrnb_open, 27440 .open = audamrnb_open,
27059 .release = audamrnb_release, 27441 .release = audamrnb_release,
27060diff -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 27442diff -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
27061--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400 27443--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c 2010-03-15 11:52:04.000000000 -0400
27062+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c 2010-04-04 20:46:41.621505029 -0400 27444+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_evrc.c 2010-04-04 20:46:41.621505029 -0400
27063@@ -805,7 +805,7 @@ dma_fail: 27445@@ -805,7 +805,7 @@ dma_fail:
27064 return rc; 27446 return rc;
27065 } 27447 }
@@ -27069,9 +27451,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_evrc.c linux-2.6.32
27069 .owner = THIS_MODULE, 27451 .owner = THIS_MODULE,
27070 .open = audevrc_open, 27452 .open = audevrc_open,
27071 .release = audevrc_release, 27453 .release = audevrc_release,
27072diff -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 27454diff -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
27073--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400 27455--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c 2010-03-15 11:52:04.000000000 -0400
27074+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c 2010-04-04 20:46:41.621505029 -0400 27456+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_in.c 2010-04-04 20:46:41.621505029 -0400
27075@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino 27457@@ -913,7 +913,7 @@ static int audpre_open(struct inode *ino
27076 return 0; 27458 return 0;
27077 } 27459 }
@@ -27090,9 +27472,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_in.c linux-2.6.32.1
27090 .owner = THIS_MODULE, 27472 .owner = THIS_MODULE,
27091 .open = audpre_open, 27473 .open = audpre_open,
27092 .unlocked_ioctl = audpre_ioctl, 27474 .unlocked_ioctl = audpre_ioctl,
27093diff -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 27475diff -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
27094--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400 27476--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c 2010-03-15 11:52:04.000000000 -0400
27095+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c 2010-04-04 20:46:41.621505029 -0400 27477+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_mp3.c 2010-04-04 20:46:41.621505029 -0400
27096@@ -941,7 +941,7 @@ done: 27478@@ -941,7 +941,7 @@ done:
27097 return rc; 27479 return rc;
27098 } 27480 }
@@ -27102,9 +27484,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_mp3.c linux-2.6.32.
27102 .owner = THIS_MODULE, 27484 .owner = THIS_MODULE,
27103 .open = audio_open, 27485 .open = audio_open,
27104 .release = audio_release, 27486 .release = audio_release,
27105diff -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 27487diff -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
27106--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400 27488--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c 2010-03-15 11:52:04.000000000 -0400
27107+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c 2010-04-04 20:46:41.621505029 -0400 27489+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_out.c 2010-04-04 20:46:41.621505029 -0400
27108@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod 27490@@ -810,7 +810,7 @@ static int audpp_open(struct inode *inod
27109 return 0; 27491 return 0;
27110 } 27492 }
@@ -27123,9 +27505,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_out.c linux-2.6.32.
27123 .owner = THIS_MODULE, 27505 .owner = THIS_MODULE,
27124 .open = audpp_open, 27506 .open = audpp_open,
27125 .unlocked_ioctl = audpp_ioctl, 27507 .unlocked_ioctl = audpp_ioctl,
27126diff -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 27508diff -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
27127--- linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400 27509--- linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-03-15 11:52:04.000000000 -0400
27128+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-04-04 20:46:41.621505029 -0400 27510+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/audio_qcelp.c 2010-04-04 20:46:41.621505029 -0400
27129@@ -816,7 +816,7 @@ err: 27511@@ -816,7 +816,7 @@ err:
27130 return rc; 27512 return rc;
27131 } 27513 }
@@ -27135,9 +27517,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/audio_qcelp.c linux-2.6.3
27135 .owner = THIS_MODULE, 27517 .owner = THIS_MODULE,
27136 .open = audqcelp_open, 27518 .open = audqcelp_open,
27137 .release = audqcelp_release, 27519 .release = audqcelp_release,
27138diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 27520diff -urNp linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c
27139--- linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400 27521--- linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c 2010-03-15 11:52:04.000000000 -0400
27140+++ linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c 2010-04-04 20:46:41.621505029 -0400 27522+++ linux-2.6.32.12/drivers/staging/dream/qdsp5/snd.c 2010-04-04 20:46:41.621505029 -0400
27141@@ -242,7 +242,7 @@ err: 27523@@ -242,7 +242,7 @@ err:
27142 return rc; 27524 return rc;
27143 } 27525 }
@@ -27147,9 +27529,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/qdsp5/snd.c linux-2.6.32.11/dri
27147 .owner = THIS_MODULE, 27529 .owner = THIS_MODULE,
27148 .open = snd_open, 27530 .open = snd_open,
27149 .release = snd_release, 27531 .release = snd_release,
27150diff -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 27532diff -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
27151--- linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400 27533--- linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c 2010-03-15 11:52:04.000000000 -0400
27152+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c 2010-04-04 20:46:41.621505029 -0400 27534+++ linux-2.6.32.12/drivers/staging/dream/smd/smd_qmi.c 2010-04-04 20:46:41.621505029 -0400
27153@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip, 27535@@ -793,7 +793,7 @@ static int qmi_release(struct inode *ip,
27154 return 0; 27536 return 0;
27155 } 27537 }
@@ -27159,9 +27541,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_qmi.c linux-2.6.32.11/d
27159 .owner = THIS_MODULE, 27541 .owner = THIS_MODULE,
27160 .read = qmi_read, 27542 .read = qmi_read,
27161 .write = qmi_write, 27543 .write = qmi_write,
27162diff -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 27544diff -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
27163--- linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400 27545--- linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-03-15 11:52:04.000000000 -0400
27164+++ linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-04-04 20:46:41.621505029 -0400 27546+++ linux-2.6.32.12/drivers/staging/dream/smd/smd_rpcrouter_device.c 2010-04-04 20:46:41.621505029 -0400
27165@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file 27547@@ -214,7 +214,7 @@ static long rpcrouter_ioctl(struct file
27166 return rc; 27548 return rc;
27167 } 27549 }
@@ -27180,9 +27562,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dream/smd/smd_rpcrouter_device.c linu
27180 .owner = THIS_MODULE, 27562 .owner = THIS_MODULE,
27181 .open = rpcrouter_open, 27563 .open = rpcrouter_open,
27182 .release = rpcrouter_release, 27564 .release = rpcrouter_release,
27183diff -urNp linux-2.6.32.11/drivers/staging/dst/dcore.c linux-2.6.32.11/drivers/staging/dst/dcore.c 27565diff -urNp linux-2.6.32.12/drivers/staging/dst/dcore.c linux-2.6.32.12/drivers/staging/dst/dcore.c
27184--- linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400 27566--- linux-2.6.32.12/drivers/staging/dst/dcore.c 2010-03-15 11:52:04.000000000 -0400
27185+++ linux-2.6.32.11/drivers/staging/dst/dcore.c 2010-04-04 20:46:41.621505029 -0400 27567+++ linux-2.6.32.12/drivers/staging/dst/dcore.c 2010-04-04 20:46:41.621505029 -0400
27186@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi 27568@@ -149,7 +149,7 @@ static int dst_bdev_release(struct gendi
27187 return 0; 27569 return 0;
27188 } 27570 }
@@ -27201,9 +27583,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/dst/dcore.c linux-2.6.32.11/drivers/s
27201 snprintf(n->name, sizeof(n->name), "%s", ctl->name); 27583 snprintf(n->name, sizeof(n->name), "%s", ctl->name);
27202 27584
27203 err = dst_node_sysfs_init(n); 27585 err = dst_node_sysfs_init(n);
27204diff -urNp linux-2.6.32.11/drivers/staging/dst/trans.c linux-2.6.32.11/drivers/staging/dst/trans.c 27586diff -urNp linux-2.6.32.12/drivers/staging/dst/trans.c linux-2.6.32.12/drivers/staging/dst/trans.c
27205--- linux-2.6.32.11/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400 27587--- linux-2.6.32.12/drivers/staging/dst/trans.c 2010-03-15 11:52:04.000000000 -0400
27206+++ linux-2.6.32.11/drivers/staging/dst/trans.c 2010-04-04 20:46:41.621505029 -0400 27588+++ linux-2.6.32.12/drivers/staging/dst/trans.c 2010-04-04 20:46:41.621505029 -0400
27207@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n, 27589@@ -169,7 +169,7 @@ int dst_process_bio(struct dst_node *n,
27208 t->error = 0; 27590 t->error = 0;
27209 t->retries = 0; 27591 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
27213 27595
27214 t->enc = bio_data_dir(bio); 27596 t->enc = bio_data_dir(bio);
27215 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen); 27597 dst_bio_to_cmd(bio, &t->cmd, DST_IO, t->gen);
27216diff -urNp linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 27598diff -urNp linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c
27217--- linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400 27599--- linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c 2010-03-15 11:52:04.000000000 -0400
27218+++ linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c 2010-04-04 20:46:41.621505029 -0400 27600+++ linux-2.6.32.12/drivers/staging/go7007/go7007-v4l2.c 2010-04-04 20:46:41.621505029 -0400
27219@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are 27601@@ -1700,7 +1700,7 @@ static int go7007_vm_fault(struct vm_are
27220 return 0; 27602 return 0;
27221 } 27603 }
@@ -27225,9 +27607,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/go7007/go7007-v4l2.c linux-2.6.32.11/
27225 .open = go7007_vm_open, 27607 .open = go7007_vm_open,
27226 .close = go7007_vm_close, 27608 .close = go7007_vm_close,
27227 .fault = go7007_vm_fault, 27609 .fault = go7007_vm_fault,
27228diff -urNp linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 27610diff -urNp linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c
27229--- linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400 27611--- linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c 2010-03-15 11:52:04.000000000 -0400
27230+++ linux-2.6.32.11/drivers/staging/hv/blkvsc_drv.c 2010-04-04 20:46:41.621505029 -0400 27612+++ linux-2.6.32.12/drivers/staging/hv/blkvsc_drv.c 2010-04-04 20:46:41.621505029 -0400
27231@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV 27613@@ -153,7 +153,7 @@ static int blkvsc_ringbuffer_size = BLKV
27232 /* The one and only one */ 27614 /* The one and only one */
27233 static struct blkvsc_driver_context g_blkvsc_drv; 27615 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
27237 .owner = THIS_MODULE, 27619 .owner = THIS_MODULE,
27238 .open = blkvsc_open, 27620 .open = blkvsc_open,
27239 .release = blkvsc_release, 27621 .release = blkvsc_release,
27240diff -urNp linux-2.6.32.11/drivers/staging/panel/panel.c linux-2.6.32.11/drivers/staging/panel/panel.c 27622diff -urNp linux-2.6.32.12/drivers/staging/panel/panel.c linux-2.6.32.12/drivers/staging/panel/panel.c
27241--- linux-2.6.32.11/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400 27623--- linux-2.6.32.12/drivers/staging/panel/panel.c 2010-03-15 11:52:04.000000000 -0400
27242+++ linux-2.6.32.11/drivers/staging/panel/panel.c 2010-04-04 20:46:41.621505029 -0400 27624+++ linux-2.6.32.12/drivers/staging/panel/panel.c 2010-04-04 20:46:41.621505029 -0400
27243@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino 27625@@ -1305,7 +1305,7 @@ static int lcd_release(struct inode *ino
27244 return 0; 27626 return 0;
27245 } 27627 }
@@ -27258,9 +27640,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/panel/panel.c linux-2.6.32.11/drivers
27258 .read = keypad_read, /* read */ 27640 .read = keypad_read, /* read */
27259 .open = keypad_open, /* open */ 27641 .open = keypad_open, /* open */
27260 .release = keypad_release, /* close */ 27642 .release = keypad_release, /* close */
27261diff -urNp linux-2.6.32.11/drivers/staging/phison/phison.c linux-2.6.32.11/drivers/staging/phison/phison.c 27643diff -urNp linux-2.6.32.12/drivers/staging/phison/phison.c linux-2.6.32.12/drivers/staging/phison/phison.c
27262--- linux-2.6.32.11/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400 27644--- linux-2.6.32.12/drivers/staging/phison/phison.c 2010-03-15 11:52:04.000000000 -0400
27263+++ linux-2.6.32.11/drivers/staging/phison/phison.c 2010-04-04 20:46:41.621505029 -0400 27645+++ linux-2.6.32.12/drivers/staging/phison/phison.c 2010-04-04 20:46:41.621505029 -0400
27264@@ -43,7 +43,7 @@ static struct scsi_host_template phison_ 27646@@ -43,7 +43,7 @@ static struct scsi_host_template phison_
27265 ATA_BMDMA_SHT(DRV_NAME), 27647 ATA_BMDMA_SHT(DRV_NAME),
27266 }; 27648 };
@@ -27270,9 +27652,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/phison/phison.c linux-2.6.32.11/drive
27270 .inherits = &ata_bmdma_port_ops, 27652 .inherits = &ata_bmdma_port_ops,
27271 .prereset = phison_pre_reset, 27653 .prereset = phison_pre_reset,
27272 }; 27654 };
27273diff -urNp linux-2.6.32.11/drivers/staging/poch/poch.c linux-2.6.32.11/drivers/staging/poch/poch.c 27655diff -urNp linux-2.6.32.12/drivers/staging/poch/poch.c linux-2.6.32.12/drivers/staging/poch/poch.c
27274--- linux-2.6.32.11/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400 27656--- linux-2.6.32.12/drivers/staging/poch/poch.c 2010-03-15 11:52:04.000000000 -0400
27275+++ linux-2.6.32.11/drivers/staging/poch/poch.c 2010-04-04 20:46:41.625742858 -0400 27657+++ linux-2.6.32.12/drivers/staging/poch/poch.c 2010-04-04 20:46:41.625742858 -0400
27276@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod 27658@@ -1057,7 +1057,7 @@ static int poch_ioctl(struct inode *inod
27277 return 0; 27659 return 0;
27278 } 27660 }
@@ -27282,9 +27664,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/poch/poch.c linux-2.6.32.11/drivers/s
27282 .owner = THIS_MODULE, 27664 .owner = THIS_MODULE,
27283 .open = poch_open, 27665 .open = poch_open,
27284 .release = poch_release, 27666 .release = poch_release,
27285diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/inode.c linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 27667diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/inode.c linux-2.6.32.12/drivers/staging/pohmelfs/inode.c
27286--- linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400 27668--- linux-2.6.32.12/drivers/staging/pohmelfs/inode.c 2010-03-15 11:52:04.000000000 -0400
27287+++ linux-2.6.32.11/drivers/staging/pohmelfs/inode.c 2010-04-04 20:46:41.625742858 -0400 27669+++ linux-2.6.32.12/drivers/staging/pohmelfs/inode.c 2010-04-04 20:46:41.625742858 -0400
27288@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su 27670@@ -1850,7 +1850,7 @@ static int pohmelfs_fill_super(struct su
27289 mutex_init(&psb->mcache_lock); 27671 mutex_init(&psb->mcache_lock);
27290 psb->mcache_root = RB_ROOT; 27672 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
27294 27676
27295 psb->trans_max_pages = 100; 27677 psb->trans_max_pages = 100;
27296 27678
27297diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 27679diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c
27298--- linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400 27680--- linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c 2010-03-15 11:52:04.000000000 -0400
27299+++ linux-2.6.32.11/drivers/staging/pohmelfs/mcache.c 2010-04-04 20:46:41.625742858 -0400 27681+++ linux-2.6.32.12/drivers/staging/pohmelfs/mcache.c 2010-04-04 20:46:41.625742858 -0400
27300@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_ 27682@@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
27301 m->data = data; 27683 m->data = data;
27302 m->start = start; 27684 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
27306 27688
27307 mutex_lock(&psb->mcache_lock); 27689 mutex_lock(&psb->mcache_lock);
27308 err = pohmelfs_mcache_insert(psb, m); 27690 err = pohmelfs_mcache_insert(psb, m);
27309diff -urNp linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 27691diff -urNp linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h
27310--- linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400 27692--- linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h 2010-03-15 11:52:04.000000000 -0400
27311+++ linux-2.6.32.11/drivers/staging/pohmelfs/netfs.h 2010-04-04 20:46:41.625742858 -0400 27693+++ linux-2.6.32.12/drivers/staging/pohmelfs/netfs.h 2010-04-04 20:46:41.625742858 -0400
27312@@ -570,7 +570,7 @@ struct pohmelfs_config; 27694@@ -570,7 +570,7 @@ struct pohmelfs_config;
27313 struct pohmelfs_sb { 27695 struct pohmelfs_sb {
27314 struct rb_root mcache_root; 27696 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
27318 unsigned long mcache_timeout; 27700 unsigned long mcache_timeout;
27319 27701
27320 unsigned int idx; 27702 unsigned int idx;
27321diff -urNp linux-2.6.32.11/drivers/staging/sep/sep_driver.c linux-2.6.32.11/drivers/staging/sep/sep_driver.c 27703diff -urNp linux-2.6.32.12/drivers/staging/sep/sep_driver.c linux-2.6.32.12/drivers/staging/sep/sep_driver.c
27322--- linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400 27704--- linux-2.6.32.12/drivers/staging/sep/sep_driver.c 2010-03-15 11:52:04.000000000 -0400
27323+++ linux-2.6.32.11/drivers/staging/sep/sep_driver.c 2010-04-04 20:46:41.625742858 -0400 27705+++ linux-2.6.32.12/drivers/staging/sep/sep_driver.c 2010-04-04 20:46:41.625742858 -0400
27324@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver 27706@@ -2603,7 +2603,7 @@ static struct pci_driver sep_pci_driver
27325 static dev_t sep_devno; 27707 static dev_t sep_devno;
27326 27708
@@ -27330,9 +27712,9 @@ diff -urNp linux-2.6.32.11/drivers/staging/sep/sep_driver.c linux-2.6.32.11/driv
27330 .owner = THIS_MODULE, 27712 .owner = THIS_MODULE,
27331 .ioctl = sep_ioctl, 27713 .ioctl = sep_ioctl,
27332 .poll = sep_poll, 27714 .poll = sep_poll,
27333diff -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 27715diff -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
27334--- linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400 27716--- linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c 2010-03-15 11:52:04.000000000 -0400
27335+++ linux-2.6.32.11/drivers/staging/vme/devices/vme_user.c 2010-04-04 20:46:41.625742858 -0400 27717+++ linux-2.6.32.12/drivers/staging/vme/devices/vme_user.c 2010-04-04 20:46:41.625742858 -0400
27336@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode * 27718@@ -136,7 +136,7 @@ static int vme_user_ioctl(struct inode *
27337 static int __init vme_user_probe(struct device *, int, int); 27719 static int __init vme_user_probe(struct device *, int, int);
27338 static int __exit vme_user_remove(struct device *, int, int); 27720 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
27342 .open = vme_user_open, 27724 .open = vme_user_open,
27343 .release = vme_user_release, 27725 .release = vme_user_release,
27344 .read = vme_user_read, 27726 .read = vme_user_read,
27345diff -urNp linux-2.6.32.11/drivers/uio/uio.c linux-2.6.32.11/drivers/uio/uio.c 27727diff -urNp linux-2.6.32.12/drivers/uio/uio.c linux-2.6.32.12/drivers/uio/uio.c
27346--- linux-2.6.32.11/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400 27728--- linux-2.6.32.12/drivers/uio/uio.c 2010-03-15 11:52:04.000000000 -0400
27347+++ linux-2.6.32.11/drivers/uio/uio.c 2010-04-04 20:46:41.625742858 -0400 27729+++ linux-2.6.32.12/drivers/uio/uio.c 2010-04-04 20:46:41.625742858 -0400
27348@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj 27730@@ -129,7 +129,7 @@ static ssize_t map_type_show(struct kobj
27349 return entry->show(mem, buf); 27731 return entry->show(mem, buf);
27350 } 27732 }
@@ -27363,9 +27745,9 @@ diff -urNp linux-2.6.32.11/drivers/uio/uio.c linux-2.6.32.11/drivers/uio/uio.c
27363 .show = portio_type_show, 27745 .show = portio_type_show,
27364 }; 27746 };
27365 27747
27366diff -urNp linux-2.6.32.11/drivers/usb/atm/usbatm.c linux-2.6.32.11/drivers/usb/atm/usbatm.c 27748diff -urNp linux-2.6.32.12/drivers/usb/atm/usbatm.c linux-2.6.32.12/drivers/usb/atm/usbatm.c
27367--- linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400 27749--- linux-2.6.32.12/drivers/usb/atm/usbatm.c 2010-03-15 11:52:04.000000000 -0400
27368+++ linux-2.6.32.11/drivers/usb/atm/usbatm.c 2010-04-04 20:46:41.625742858 -0400 27750+++ linux-2.6.32.12/drivers/usb/atm/usbatm.c 2010-04-04 20:46:41.625742858 -0400
27369@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru 27751@@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru
27370 if (printk_ratelimit()) 27752 if (printk_ratelimit())
27371 atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", 27753 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/
27445 27827
27446 if (!left--) { 27828 if (!left--) {
27447 if (instance->disconnected) 27829 if (instance->disconnected)
27448diff -urNp linux-2.6.32.11/drivers/usb/class/cdc-acm.c linux-2.6.32.11/drivers/usb/class/cdc-acm.c 27830diff -urNp linux-2.6.32.12/drivers/usb/class/cdc-acm.c linux-2.6.32.12/drivers/usb/class/cdc-acm.c
27449--- linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-03-15 11:52:04.000000000 -0400 27831--- linux-2.6.32.12/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:38.389083173 -0400
27450+++ linux-2.6.32.11/drivers/usb/class/cdc-acm.c 2010-04-04 20:46:41.625742858 -0400 27832+++ linux-2.6.32.12/drivers/usb/class/cdc-acm.c 2010-04-29 17:49:58.429105010 -0400
27451@@ -1534,7 +1534,7 @@ static struct usb_device_id acm_ids[] = 27833@@ -1535,7 +1535,7 @@ static struct usb_device_id acm_ids[] =
27452 USB_CDC_ACM_PROTO_AT_CDMA) }, 27834 USB_CDC_ACM_PROTO_AT_CDMA) },
27453 27835
27454 /* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */ 27836 /* 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
27457 }; 27839 };
27458 27840
27459 MODULE_DEVICE_TABLE(usb, acm_ids); 27841 MODULE_DEVICE_TABLE(usb, acm_ids);
27460diff -urNp linux-2.6.32.11/drivers/usb/class/usblp.c linux-2.6.32.11/drivers/usb/class/usblp.c 27842diff -urNp linux-2.6.32.12/drivers/usb/class/usblp.c linux-2.6.32.12/drivers/usb/class/usblp.c
27461--- linux-2.6.32.11/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400 27843--- linux-2.6.32.12/drivers/usb/class/usblp.c 2010-03-15 11:52:04.000000000 -0400
27462+++ linux-2.6.32.11/drivers/usb/class/usblp.c 2010-04-04 20:46:41.625742858 -0400 27844+++ linux-2.6.32.12/drivers/usb/class/usblp.c 2010-04-04 20:46:41.625742858 -0400
27463@@ -228,7 +228,7 @@ static const struct quirk_printer_struct 27845@@ -228,7 +228,7 @@ static const struct quirk_printer_struct
27464 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ 27846 { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */
27465 { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ 27847 { 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
27478 }; 27860 };
27479 27861
27480 MODULE_DEVICE_TABLE (usb, usblp_ids); 27862 MODULE_DEVICE_TABLE (usb, usblp_ids);
27481diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.c linux-2.6.32.11/drivers/usb/core/hcd.c 27863diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.c linux-2.6.32.12/drivers/usb/core/hcd.c
27482--- linux-2.6.32.11/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400 27864--- linux-2.6.32.12/drivers/usb/core/hcd.c 2010-03-15 11:52:04.000000000 -0400
27483+++ linux-2.6.32.11/drivers/usb/core/hcd.c 2010-04-04 20:46:41.625742858 -0400 27865+++ linux-2.6.32.12/drivers/usb/core/hcd.c 2010-04-04 20:46:41.625742858 -0400
27484@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd 27866@@ -2216,7 +2216,7 @@ EXPORT_SYMBOL_GPL(usb_hcd_platform_shutd
27485 27867
27486 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 27868 #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
27499 { 27881 {
27500 27882
27501 if (mon_ops) 27883 if (mon_ops)
27502diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.h linux-2.6.32.11/drivers/usb/core/hcd.h 27884diff -urNp linux-2.6.32.12/drivers/usb/core/hcd.h linux-2.6.32.12/drivers/usb/core/hcd.h
27503--- linux-2.6.32.11/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400 27885--- linux-2.6.32.12/drivers/usb/core/hcd.h 2010-03-15 11:52:04.000000000 -0400
27504+++ linux-2.6.32.11/drivers/usb/core/hcd.h 2010-04-04 20:46:41.625742858 -0400 27886+++ linux-2.6.32.12/drivers/usb/core/hcd.h 2010-04-04 20:46:41.625742858 -0400
27505@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) { 27887@@ -486,13 +486,13 @@ static inline void usbfs_cleanup(void) {
27506 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE) 27888 #if defined(CONFIG_USB_MON) || defined(CONFIG_USB_MON_MODULE)
27507 27889
@@ -27529,9 +27911,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/core/hcd.h linux-2.6.32.11/drivers/usb/co
27529 void usb_mon_deregister(void); 27911 void usb_mon_deregister(void);
27530 27912
27531 #else 27913 #else
27532diff -urNp linux-2.6.32.11/drivers/usb/core/hub.c linux-2.6.32.11/drivers/usb/core/hub.c 27914diff -urNp linux-2.6.32.12/drivers/usb/core/hub.c linux-2.6.32.12/drivers/usb/core/hub.c
27533--- linux-2.6.32.11/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400 27915--- linux-2.6.32.12/drivers/usb/core/hub.c 2010-03-15 11:52:04.000000000 -0400
27534+++ linux-2.6.32.11/drivers/usb/core/hub.c 2010-04-04 20:46:41.625742858 -0400 27916+++ linux-2.6.32.12/drivers/usb/core/hub.c 2010-04-04 20:46:41.625742858 -0400
27535@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table 27917@@ -3397,7 +3397,7 @@ static struct usb_device_id hub_id_table
27536 .bDeviceClass = USB_CLASS_HUB}, 27918 .bDeviceClass = USB_CLASS_HUB},
27537 { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, 27919 { .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
27541 }; 27923 };
27542 27924
27543 MODULE_DEVICE_TABLE (usb, hub_id_table); 27925 MODULE_DEVICE_TABLE (usb, hub_id_table);
27544diff -urNp linux-2.6.32.11/drivers/usb/core/message.c linux-2.6.32.11/drivers/usb/core/message.c 27926diff -urNp linux-2.6.32.12/drivers/usb/core/message.c linux-2.6.32.12/drivers/usb/core/message.c
27545--- linux-2.6.32.11/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400 27927--- linux-2.6.32.12/drivers/usb/core/message.c 2010-03-15 11:52:04.000000000 -0400
27546+++ linux-2.6.32.11/drivers/usb/core/message.c 2010-04-04 20:46:41.629706570 -0400 27928+++ linux-2.6.32.12/drivers/usb/core/message.c 2010-04-04 20:46:41.629706570 -0400
27547@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device 27929@@ -914,8 +914,8 @@ char *usb_cache_string(struct usb_device
27548 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO); 27930 buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
27549 if (buf) { 27931 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
27555 if (!smallbuf) 27937 if (!smallbuf)
27556 return buf; 27938 return buf;
27557 memcpy(smallbuf, buf, len); 27939 memcpy(smallbuf, buf, len);
27558diff -urNp linux-2.6.32.11/drivers/usb/host/ehci-pci.c linux-2.6.32.11/drivers/usb/host/ehci-pci.c 27940diff -urNp linux-2.6.32.12/drivers/usb/host/ehci-pci.c linux-2.6.32.12/drivers/usb/host/ehci-pci.c
27559--- linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400 27941--- linux-2.6.32.12/drivers/usb/host/ehci-pci.c 2010-03-15 11:52:04.000000000 -0400
27560+++ linux-2.6.32.11/drivers/usb/host/ehci-pci.c 2010-04-04 20:46:41.629706570 -0400 27942+++ linux-2.6.32.12/drivers/usb/host/ehci-pci.c 2010-04-04 20:46:41.629706570 -0400
27561@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id 27943@@ -422,7 +422,7 @@ static const struct pci_device_id pci_id
27562 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), 27944 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0),
27563 .driver_data = (unsigned long) &ehci_pci_hc_driver, 27945 .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
27567 }; 27949 };
27568 MODULE_DEVICE_TABLE(pci, pci_ids); 27950 MODULE_DEVICE_TABLE(pci, pci_ids);
27569 27951
27570diff -urNp linux-2.6.32.11/drivers/usb/host/uhci-hcd.c linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 27952diff -urNp linux-2.6.32.12/drivers/usb/host/uhci-hcd.c linux-2.6.32.12/drivers/usb/host/uhci-hcd.c
27571--- linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400 27953--- linux-2.6.32.12/drivers/usb/host/uhci-hcd.c 2010-03-15 11:52:04.000000000 -0400
27572+++ linux-2.6.32.11/drivers/usb/host/uhci-hcd.c 2010-04-04 20:46:41.629706570 -0400 27954+++ linux-2.6.32.12/drivers/usb/host/uhci-hcd.c 2010-04-04 20:46:41.629706570 -0400
27573@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p 27955@@ -941,7 +941,7 @@ static const struct pci_device_id uhci_p
27574 /* handle any USB UHCI controller */ 27956 /* handle any USB UHCI controller */
27575 PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), 27957 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
27579 }; 27961 };
27580 27962
27581 MODULE_DEVICE_TABLE(pci, uhci_pci_ids); 27963 MODULE_DEVICE_TABLE(pci, uhci_pci_ids);
27582diff -urNp linux-2.6.32.11/drivers/usb/misc/appledisplay.c linux-2.6.32.11/drivers/usb/misc/appledisplay.c 27964diff -urNp linux-2.6.32.12/drivers/usb/misc/appledisplay.c linux-2.6.32.12/drivers/usb/misc/appledisplay.c
27583--- linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400 27965--- linux-2.6.32.12/drivers/usb/misc/appledisplay.c 2010-03-15 11:52:04.000000000 -0400
27584+++ linux-2.6.32.11/drivers/usb/misc/appledisplay.c 2010-04-04 20:46:41.629706570 -0400 27966+++ linux-2.6.32.12/drivers/usb/misc/appledisplay.c 2010-04-04 20:46:41.629706570 -0400
27585@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes 27967@@ -178,7 +178,7 @@ static int appledisplay_bl_get_brightnes
27586 return pdata->msgdata[1]; 27968 return pdata->msgdata[1];
27587 } 27969 }
@@ -27591,9 +27973,9 @@ diff -urNp linux-2.6.32.11/drivers/usb/misc/appledisplay.c linux-2.6.32.11/drive
27591 .get_brightness = appledisplay_bl_get_brightness, 27973 .get_brightness = appledisplay_bl_get_brightness,
27592 .update_status = appledisplay_bl_update_status, 27974 .update_status = appledisplay_bl_update_status,
27593 }; 27975 };
27594diff -urNp linux-2.6.32.11/drivers/usb/mon/mon_main.c linux-2.6.32.11/drivers/usb/mon/mon_main.c 27976diff -urNp linux-2.6.32.12/drivers/usb/mon/mon_main.c linux-2.6.32.12/drivers/usb/mon/mon_main.c
27595--- linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400 27977--- linux-2.6.32.12/drivers/usb/mon/mon_main.c 2010-03-15 11:52:04.000000000 -0400
27596+++ linux-2.6.32.11/drivers/usb/mon/mon_main.c 2010-04-04 20:46:41.629706570 -0400 27978+++ linux-2.6.32.12/drivers/usb/mon/mon_main.c 2010-04-04 20:46:41.629706570 -0400
27597@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = { 27979@@ -238,7 +238,7 @@ static struct notifier_block mon_nb = {
27598 /* 27980 /*
27599 * Ops 27981 * 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
27603 .urb_submit = mon_submit, 27985 .urb_submit = mon_submit,
27604 .urb_submit_error = mon_submit_error, 27986 .urb_submit_error = mon_submit_error,
27605 .urb_complete = mon_complete, 27987 .urb_complete = mon_complete,
27606diff -urNp linux-2.6.32.11/drivers/usb/storage/debug.h linux-2.6.32.11/drivers/usb/storage/debug.h 27988diff -urNp linux-2.6.32.12/drivers/usb/storage/debug.h linux-2.6.32.12/drivers/usb/storage/debug.h
27607--- linux-2.6.32.11/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400 27989--- linux-2.6.32.12/drivers/usb/storage/debug.h 2010-03-15 11:52:04.000000000 -0400
27608+++ linux-2.6.32.11/drivers/usb/storage/debug.h 2010-04-04 20:46:41.629706570 -0400 27990+++ linux-2.6.32.12/drivers/usb/storage/debug.h 2010-04-04 20:46:41.629706570 -0400
27609@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char 27991@@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char
27610 #define US_DEBUGPX(x...) printk( x ) 27992 #define US_DEBUGPX(x...) printk( x )
27611 #define US_DEBUG(x) x 27993 #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
27619 #endif 28001 #endif
27620 28002
27621 #endif 28003 #endif
27622diff -urNp linux-2.6.32.11/drivers/usb/storage/usb.c linux-2.6.32.11/drivers/usb/storage/usb.c 28004diff -urNp linux-2.6.32.12/drivers/usb/storage/usb.c linux-2.6.32.12/drivers/usb/storage/usb.c
27623--- linux-2.6.32.11/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400 28005--- linux-2.6.32.12/drivers/usb/storage/usb.c 2010-03-15 11:52:04.000000000 -0400
27624+++ linux-2.6.32.11/drivers/usb/storage/usb.c 2010-04-04 20:46:41.629706570 -0400 28006+++ linux-2.6.32.12/drivers/usb/storage/usb.c 2010-04-04 20:46:41.629706570 -0400
27625@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l 28007@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l
27626 28008
27627 static struct us_unusual_dev us_unusual_dev_list[] = { 28009 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
27631 }; 28013 };
27632 28014
27633 #undef UNUSUAL_DEV 28015 #undef UNUSUAL_DEV
27634diff -urNp linux-2.6.32.11/drivers/usb/storage/usual-tables.c linux-2.6.32.11/drivers/usb/storage/usual-tables.c 28016diff -urNp linux-2.6.32.12/drivers/usb/storage/usual-tables.c linux-2.6.32.12/drivers/usb/storage/usual-tables.c
27635--- linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400 28017--- linux-2.6.32.12/drivers/usb/storage/usual-tables.c 2010-03-15 11:52:04.000000000 -0400
27636+++ linux-2.6.32.11/drivers/usb/storage/usual-tables.c 2010-04-04 20:46:41.629706570 -0400 28018+++ linux-2.6.32.12/drivers/usb/storage/usual-tables.c 2010-04-04 20:46:41.629706570 -0400
27637@@ -48,7 +48,7 @@ 28019@@ -48,7 +48,7 @@
27638 28020
27639 struct usb_device_id usb_storage_usb_ids[] = { 28021 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
27643 }; 28025 };
27644 EXPORT_SYMBOL_GPL(usb_storage_usb_ids); 28026 EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
27645 28027
27646diff -urNp linux-2.6.32.11/drivers/uwb/wlp/messages.c linux-2.6.32.11/drivers/uwb/wlp/messages.c 28028diff -urNp linux-2.6.32.12/drivers/uwb/wlp/messages.c linux-2.6.32.12/drivers/uwb/wlp/messages.c
27647--- linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400 28029--- linux-2.6.32.12/drivers/uwb/wlp/messages.c 2010-03-15 11:52:04.000000000 -0400
27648+++ linux-2.6.32.11/drivers/uwb/wlp/messages.c 2010-04-04 20:46:41.629706570 -0400 28030+++ linux-2.6.32.12/drivers/uwb/wlp/messages.c 2010-04-04 20:46:41.629706570 -0400
27649@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct 28031@@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct
27650 size_t len = skb->len; 28032 size_t len = skb->len;
27651 size_t used; 28033 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
27655 enum wlp_assc_error assc_err; 28037 enum wlp_assc_error assc_err;
27656 char enonce_buf[WLP_WSS_NONCE_STRSIZE]; 28038 char enonce_buf[WLP_WSS_NONCE_STRSIZE];
27657 char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; 28039 char rnonce_buf[WLP_WSS_NONCE_STRSIZE];
27658diff -urNp linux-2.6.32.11/drivers/uwb/wlp/sysfs.c linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 28040diff -urNp linux-2.6.32.12/drivers/uwb/wlp/sysfs.c linux-2.6.32.12/drivers/uwb/wlp/sysfs.c
27659--- linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400 28041--- linux-2.6.32.12/drivers/uwb/wlp/sysfs.c 2010-03-15 11:52:04.000000000 -0400
27660+++ linux-2.6.32.11/drivers/uwb/wlp/sysfs.c 2010-04-04 20:46:41.629706570 -0400 28042+++ linux-2.6.32.12/drivers/uwb/wlp/sysfs.c 2010-04-04 20:46:41.629706570 -0400
27661@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec 28043@@ -615,8 +615,7 @@ ssize_t wlp_wss_attr_store(struct kobjec
27662 return ret; 28044 return ret;
27663 } 28045 }
@@ -27668,9 +28050,9 @@ diff -urNp linux-2.6.32.11/drivers/uwb/wlp/sysfs.c linux-2.6.32.11/drivers/uwb/w
27668 .show = wlp_wss_attr_show, 28050 .show = wlp_wss_attr_show,
27669 .store = wlp_wss_attr_store, 28051 .store = wlp_wss_attr_store,
27670 }; 28052 };
27671diff -urNp linux-2.6.32.11/drivers/video/atmel_lcdfb.c linux-2.6.32.11/drivers/video/atmel_lcdfb.c 28053diff -urNp linux-2.6.32.12/drivers/video/atmel_lcdfb.c linux-2.6.32.12/drivers/video/atmel_lcdfb.c
27672--- linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400 28054--- linux-2.6.32.12/drivers/video/atmel_lcdfb.c 2010-03-15 11:52:04.000000000 -0400
27673+++ linux-2.6.32.11/drivers/video/atmel_lcdfb.c 2010-04-04 20:46:41.629706570 -0400 28055+++ linux-2.6.32.12/drivers/video/atmel_lcdfb.c 2010-04-04 20:46:41.629706570 -0400
27674@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc 28056@@ -110,7 +110,7 @@ static int atmel_bl_get_brightness(struc
27675 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL); 28057 return lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
27676 } 28058 }
@@ -27680,9 +28062,9 @@ diff -urNp linux-2.6.32.11/drivers/video/atmel_lcdfb.c linux-2.6.32.11/drivers/v
27680 .update_status = atmel_bl_update_status, 28062 .update_status = atmel_bl_update_status,
27681 .get_brightness = atmel_bl_get_brightness, 28063 .get_brightness = atmel_bl_get_brightness,
27682 }; 28064 };
27683diff -urNp linux-2.6.32.11/drivers/video/aty/aty128fb.c linux-2.6.32.11/drivers/video/aty/aty128fb.c 28065diff -urNp linux-2.6.32.12/drivers/video/aty/aty128fb.c linux-2.6.32.12/drivers/video/aty/aty128fb.c
27684--- linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400 28066--- linux-2.6.32.12/drivers/video/aty/aty128fb.c 2010-03-15 11:52:04.000000000 -0400
27685+++ linux-2.6.32.11/drivers/video/aty/aty128fb.c 2010-04-04 20:46:41.629706570 -0400 28067+++ linux-2.6.32.12/drivers/video/aty/aty128fb.c 2010-04-04 20:46:41.629706570 -0400
27686@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru 28068@@ -1787,7 +1787,7 @@ static int aty128_bl_get_brightness(stru
27687 return bd->props.brightness; 28069 return bd->props.brightness;
27688 } 28070 }
@@ -27692,9 +28074,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/aty128fb.c linux-2.6.32.11/drivers/
27692 .get_brightness = aty128_bl_get_brightness, 28074 .get_brightness = aty128_bl_get_brightness,
27693 .update_status = aty128_bl_update_status, 28075 .update_status = aty128_bl_update_status,
27694 }; 28076 };
27695diff -urNp linux-2.6.32.11/drivers/video/aty/atyfb_base.c linux-2.6.32.11/drivers/video/aty/atyfb_base.c 28077diff -urNp linux-2.6.32.12/drivers/video/aty/atyfb_base.c linux-2.6.32.12/drivers/video/aty/atyfb_base.c
27696--- linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400 28078--- linux-2.6.32.12/drivers/video/aty/atyfb_base.c 2010-03-15 11:52:04.000000000 -0400
27697+++ linux-2.6.32.11/drivers/video/aty/atyfb_base.c 2010-04-04 20:46:41.629706570 -0400 28079+++ linux-2.6.32.12/drivers/video/aty/atyfb_base.c 2010-04-04 20:46:41.629706570 -0400
27698@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct 28080@@ -2225,7 +2225,7 @@ static int aty_bl_get_brightness(struct
27699 return bd->props.brightness; 28081 return bd->props.brightness;
27700 } 28082 }
@@ -27704,9 +28086,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/atyfb_base.c linux-2.6.32.11/driver
27704 .get_brightness = aty_bl_get_brightness, 28086 .get_brightness = aty_bl_get_brightness,
27705 .update_status = aty_bl_update_status, 28087 .update_status = aty_bl_update_status,
27706 }; 28088 };
27707diff -urNp linux-2.6.32.11/drivers/video/aty/radeon_backlight.c linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 28089diff -urNp linux-2.6.32.12/drivers/video/aty/radeon_backlight.c linux-2.6.32.12/drivers/video/aty/radeon_backlight.c
27708--- linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400 28090--- linux-2.6.32.12/drivers/video/aty/radeon_backlight.c 2010-03-15 11:52:04.000000000 -0400
27709+++ linux-2.6.32.11/drivers/video/aty/radeon_backlight.c 2010-04-04 20:46:41.629706570 -0400 28091+++ linux-2.6.32.12/drivers/video/aty/radeon_backlight.c 2010-04-04 20:46:41.629706570 -0400
27710@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru 28092@@ -127,7 +127,7 @@ static int radeon_bl_get_brightness(stru
27711 return bd->props.brightness; 28093 return bd->props.brightness;
27712 } 28094 }
@@ -27716,9 +28098,9 @@ diff -urNp linux-2.6.32.11/drivers/video/aty/radeon_backlight.c linux-2.6.32.11/
27716 .get_brightness = radeon_bl_get_brightness, 28098 .get_brightness = radeon_bl_get_brightness,
27717 .update_status = radeon_bl_update_status, 28099 .update_status = radeon_bl_update_status,
27718 }; 28100 };
27719diff -urNp linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 28101diff -urNp linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c
27720--- linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400 28102--- linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c 2010-03-15 11:52:04.000000000 -0400
27721+++ linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c 2010-04-04 20:46:41.629706570 -0400 28103+++ linux-2.6.32.12/drivers/video/backlight/adp5520_bl.c 2010-04-04 20:46:41.629706570 -0400
27722@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str 28104@@ -84,7 +84,7 @@ static int adp5520_bl_get_brightness(str
27723 return error ? data->current_brightness : reg_val; 28105 return error ? data->current_brightness : reg_val;
27724 } 28106 }
@@ -27728,9 +28110,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/adp5520_bl.c linux-2.6.32.11/
27728 .update_status = adp5520_bl_update_status, 28110 .update_status = adp5520_bl_update_status,
27729 .get_brightness = adp5520_bl_get_brightness, 28111 .get_brightness = adp5520_bl_get_brightness,
27730 }; 28112 };
27731diff -urNp linux-2.6.32.11/drivers/video/backlight/adx_bl.c linux-2.6.32.11/drivers/video/backlight/adx_bl.c 28113diff -urNp linux-2.6.32.12/drivers/video/backlight/adx_bl.c linux-2.6.32.12/drivers/video/backlight/adx_bl.c
27732--- linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400 28114--- linux-2.6.32.12/drivers/video/backlight/adx_bl.c 2010-03-15 11:52:04.000000000 -0400
27733+++ linux-2.6.32.11/drivers/video/backlight/adx_bl.c 2010-04-04 20:46:41.633638271 -0400 28115+++ linux-2.6.32.12/drivers/video/backlight/adx_bl.c 2010-04-04 20:46:41.633638271 -0400
27734@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct 28116@@ -61,7 +61,7 @@ static int adx_backlight_check_fb(struct
27735 return 1; 28117 return 1;
27736 } 28118 }
@@ -27740,9 +28122,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/adx_bl.c linux-2.6.32.11/driv
27740 .options = 0, 28122 .options = 0,
27741 .update_status = adx_backlight_update_status, 28123 .update_status = adx_backlight_update_status,
27742 .get_brightness = adx_backlight_get_brightness, 28124 .get_brightness = adx_backlight_get_brightness,
27743diff -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 28125diff -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
27744--- linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400 28126--- linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c 2010-03-15 11:52:04.000000000 -0400
27745+++ linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c 2010-04-04 20:46:41.633638271 -0400 28127+++ linux-2.6.32.12/drivers/video/backlight/atmel-pwm-bl.c 2010-04-04 20:46:41.633638271 -0400
27746@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct 28128@@ -113,7 +113,7 @@ static int atmel_pwm_bl_init_pwm(struct
27747 return pwm_channel_enable(&pwmbl->pwmc); 28129 return pwm_channel_enable(&pwmbl->pwmc);
27748 } 28130 }
@@ -27752,9 +28134,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/atmel-pwm-bl.c linux-2.6.32.1
27752 .get_brightness = atmel_pwm_bl_get_intensity, 28134 .get_brightness = atmel_pwm_bl_get_intensity,
27753 .update_status = atmel_pwm_bl_set_intensity, 28135 .update_status = atmel_pwm_bl_set_intensity,
27754 }; 28136 };
27755diff -urNp linux-2.6.32.11/drivers/video/backlight/backlight.c linux-2.6.32.11/drivers/video/backlight/backlight.c 28137diff -urNp linux-2.6.32.12/drivers/video/backlight/backlight.c linux-2.6.32.12/drivers/video/backlight/backlight.c
27756--- linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400 28138--- linux-2.6.32.12/drivers/video/backlight/backlight.c 2010-03-15 11:52:04.000000000 -0400
27757+++ linux-2.6.32.11/drivers/video/backlight/backlight.c 2010-04-04 20:46:41.633638271 -0400 28139+++ linux-2.6.32.12/drivers/video/backlight/backlight.c 2010-04-04 20:46:41.633638271 -0400
27758@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update); 28140@@ -269,7 +269,7 @@ EXPORT_SYMBOL(backlight_force_update);
27759 * ERR_PTR() or a pointer to the newly allocated device. 28141 * ERR_PTR() or a pointer to the newly allocated device.
27760 */ 28142 */
@@ -27764,9 +28146,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/backlight.c linux-2.6.32.11/d
27764 { 28146 {
27765 struct backlight_device *new_bd; 28147 struct backlight_device *new_bd;
27766 int rc; 28148 int rc;
27767diff -urNp linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 28149diff -urNp linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c
27768--- linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400 28150--- linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c 2010-03-15 11:52:04.000000000 -0400
27769+++ linux-2.6.32.11/drivers/video/backlight/corgi_lcd.c 2010-04-04 20:46:41.633638271 -0400 28151+++ linux-2.6.32.12/drivers/video/backlight/corgi_lcd.c 2010-04-04 20:46:41.633638271 -0400
27770@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit 28152@@ -451,7 +451,7 @@ void corgi_lcd_limit_intensity(int limit
27771 } 28153 }
27772 EXPORT_SYMBOL(corgi_lcd_limit_intensity); 28154 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
27776 .get_brightness = corgi_bl_get_intensity, 28158 .get_brightness = corgi_bl_get_intensity,
27777 .update_status = corgi_bl_update_status, 28159 .update_status = corgi_bl_update_status,
27778 }; 28160 };
27779diff -urNp linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 28161diff -urNp linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c
27780--- linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400 28162--- linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c 2010-03-15 11:52:04.000000000 -0400
27781+++ linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c 2010-04-04 20:46:41.633638271 -0400 28163+++ linux-2.6.32.12/drivers/video/backlight/cr_bllcd.c 2010-04-04 20:46:41.633638271 -0400
27782@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st 28164@@ -108,7 +108,7 @@ static int cr_backlight_get_intensity(st
27783 return intensity; 28165 return intensity;
27784 } 28166 }
@@ -27788,9 +28170,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/cr_bllcd.c linux-2.6.32.11/dr
27788 .get_brightness = cr_backlight_get_intensity, 28170 .get_brightness = cr_backlight_get_intensity,
27789 .update_status = cr_backlight_set_intensity, 28171 .update_status = cr_backlight_set_intensity,
27790 }; 28172 };
27791diff -urNp linux-2.6.32.11/drivers/video/backlight/da903x_bl.c linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 28173diff -urNp linux-2.6.32.12/drivers/video/backlight/da903x_bl.c linux-2.6.32.12/drivers/video/backlight/da903x_bl.c
27792--- linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400 28174--- linux-2.6.32.12/drivers/video/backlight/da903x_bl.c 2010-03-15 11:52:04.000000000 -0400
27793+++ linux-2.6.32.11/drivers/video/backlight/da903x_bl.c 2010-04-04 20:46:41.633638271 -0400 28175+++ linux-2.6.32.12/drivers/video/backlight/da903x_bl.c 2010-04-04 20:46:41.633638271 -0400
27794@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne 28176@@ -94,7 +94,7 @@ static int da903x_backlight_get_brightne
27795 return data->current_brightness; 28177 return data->current_brightness;
27796 } 28178 }
@@ -27800,9 +28182,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/da903x_bl.c linux-2.6.32.11/d
27800 .update_status = da903x_backlight_update_status, 28182 .update_status = da903x_backlight_update_status,
27801 .get_brightness = da903x_backlight_get_brightness, 28183 .get_brightness = da903x_backlight_get_brightness,
27802 }; 28184 };
27803diff -urNp linux-2.6.32.11/drivers/video/backlight/generic_bl.c linux-2.6.32.11/drivers/video/backlight/generic_bl.c 28185diff -urNp linux-2.6.32.12/drivers/video/backlight/generic_bl.c linux-2.6.32.12/drivers/video/backlight/generic_bl.c
27804--- linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400 28186--- linux-2.6.32.12/drivers/video/backlight/generic_bl.c 2010-03-15 11:52:04.000000000 -0400
27805+++ linux-2.6.32.11/drivers/video/backlight/generic_bl.c 2010-04-04 20:46:41.633638271 -0400 28187+++ linux-2.6.32.12/drivers/video/backlight/generic_bl.c 2010-04-04 20:46:41.633638271 -0400
27806@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit) 28188@@ -70,7 +70,7 @@ void corgibl_limit_intensity(int limit)
27807 } 28189 }
27808 EXPORT_SYMBOL(corgibl_limit_intensity); 28190 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/
27812 .options = BL_CORE_SUSPENDRESUME, 28194 .options = BL_CORE_SUSPENDRESUME,
27813 .get_brightness = genericbl_get_intensity, 28195 .get_brightness = genericbl_get_intensity,
27814 .update_status = genericbl_send_intensity, 28196 .update_status = genericbl_send_intensity,
27815diff -urNp linux-2.6.32.11/drivers/video/backlight/hp680_bl.c linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 28197diff -urNp linux-2.6.32.12/drivers/video/backlight/hp680_bl.c linux-2.6.32.12/drivers/video/backlight/hp680_bl.c
27816--- linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400 28198--- linux-2.6.32.12/drivers/video/backlight/hp680_bl.c 2010-03-15 11:52:04.000000000 -0400
27817+++ linux-2.6.32.11/drivers/video/backlight/hp680_bl.c 2010-04-04 20:46:41.633638271 -0400 28199+++ linux-2.6.32.12/drivers/video/backlight/hp680_bl.c 2010-04-04 20:46:41.633638271 -0400
27818@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct 28200@@ -98,7 +98,7 @@ static int hp680bl_get_intensity(struct
27819 return current_intensity; 28201 return current_intensity;
27820 } 28202 }
@@ -27824,9 +28206,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/hp680_bl.c linux-2.6.32.11/dr
27824 .get_brightness = hp680bl_get_intensity, 28206 .get_brightness = hp680bl_get_intensity,
27825 .update_status = hp680bl_set_intensity, 28207 .update_status = hp680bl_set_intensity,
27826 }; 28208 };
27827diff -urNp linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 28209diff -urNp linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c
27828--- linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400 28210--- linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c 2010-03-15 11:52:04.000000000 -0400
27829+++ linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c 2010-04-04 20:46:41.633638271 -0400 28211+++ linux-2.6.32.12/drivers/video/backlight/jornada720_bl.c 2010-04-04 20:46:41.633638271 -0400
27830@@ -93,7 +93,7 @@ out: 28212@@ -93,7 +93,7 @@ out:
27831 return ret; 28213 return ret;
27832 } 28214 }
@@ -27836,9 +28218,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/jornada720_bl.c linux-2.6.32.
27836 .get_brightness = jornada_bl_get_brightness, 28218 .get_brightness = jornada_bl_get_brightness,
27837 .update_status = jornada_bl_update_status, 28219 .update_status = jornada_bl_update_status,
27838 .options = BL_CORE_SUSPENDRESUME, 28220 .options = BL_CORE_SUSPENDRESUME,
27839diff -urNp linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 28221diff -urNp linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c
27840--- linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400 28222--- linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c 2010-03-15 11:52:04.000000000 -0400
27841+++ linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c 2010-04-04 20:46:41.633638271 -0400 28223+++ linux-2.6.32.12/drivers/video/backlight/kb3886_bl.c 2010-04-04 20:46:41.633638271 -0400
27842@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct 28224@@ -134,7 +134,7 @@ static int kb3886bl_get_intensity(struct
27843 return kb3886bl_intensity; 28225 return kb3886bl_intensity;
27844 } 28226 }
@@ -27848,9 +28230,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/kb3886_bl.c linux-2.6.32.11/d
27848 .get_brightness = kb3886bl_get_intensity, 28230 .get_brightness = kb3886bl_get_intensity,
27849 .update_status = kb3886bl_send_intensity, 28231 .update_status = kb3886bl_send_intensity,
27850 }; 28232 };
27851diff -urNp linux-2.6.32.11/drivers/video/backlight/locomolcd.c linux-2.6.32.11/drivers/video/backlight/locomolcd.c 28233diff -urNp linux-2.6.32.12/drivers/video/backlight/locomolcd.c linux-2.6.32.12/drivers/video/backlight/locomolcd.c
27852--- linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400 28234--- linux-2.6.32.12/drivers/video/backlight/locomolcd.c 2010-03-15 11:52:04.000000000 -0400
27853+++ linux-2.6.32.11/drivers/video/backlight/locomolcd.c 2010-04-04 20:46:41.633638271 -0400 28235+++ linux-2.6.32.12/drivers/video/backlight/locomolcd.c 2010-04-04 20:46:41.633638271 -0400
27854@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc 28236@@ -141,7 +141,7 @@ static int locomolcd_get_intensity(struc
27855 return current_intensity; 28237 return current_intensity;
27856 } 28238 }
@@ -27860,9 +28242,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/locomolcd.c linux-2.6.32.11/d
27860 .get_brightness = locomolcd_get_intensity, 28242 .get_brightness = locomolcd_get_intensity,
27861 .update_status = locomolcd_set_intensity, 28243 .update_status = locomolcd_set_intensity,
27862 }; 28244 };
27863diff -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 28245diff -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
27864--- linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-03-15 11:52:04.000000000 -0400 28246--- linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:38.397382140 -0400
27865+++ linux-2.6.32.11/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-04 20:46:41.633638271 -0400 28247+++ linux-2.6.32.12/drivers/video/backlight/mbp_nvidia_bl.c 2010-04-29 17:49:58.433026851 -0400
27866@@ -33,7 +33,7 @@ struct dmi_match_data { 28248@@ -33,7 +33,7 @@ struct dmi_match_data {
27867 unsigned long iostart; 28249 unsigned long iostart;
27868 unsigned long iolen; 28250 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.
27872 }; 28254 };
27873 28255
27874 /* Module parameters. */ 28256 /* Module parameters. */
27875diff -urNp linux-2.6.32.11/drivers/video/backlight/omap1_bl.c linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 28257diff -urNp linux-2.6.32.12/drivers/video/backlight/omap1_bl.c linux-2.6.32.12/drivers/video/backlight/omap1_bl.c
27876--- linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400 28258--- linux-2.6.32.12/drivers/video/backlight/omap1_bl.c 2010-03-15 11:52:04.000000000 -0400
27877+++ linux-2.6.32.11/drivers/video/backlight/omap1_bl.c 2010-04-04 20:46:41.633638271 -0400 28259+++ linux-2.6.32.12/drivers/video/backlight/omap1_bl.c 2010-04-04 20:46:41.633638271 -0400
27878@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b 28260@@ -125,7 +125,7 @@ static int omapbl_get_intensity(struct b
27879 return bl->current_intensity; 28261 return bl->current_intensity;
27880 } 28262 }
@@ -27884,9 +28266,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/omap1_bl.c linux-2.6.32.11/dr
27884 .get_brightness = omapbl_get_intensity, 28266 .get_brightness = omapbl_get_intensity,
27885 .update_status = omapbl_update_status, 28267 .update_status = omapbl_update_status,
27886 }; 28268 };
27887diff -urNp linux-2.6.32.11/drivers/video/backlight/progear_bl.c linux-2.6.32.11/drivers/video/backlight/progear_bl.c 28269diff -urNp linux-2.6.32.12/drivers/video/backlight/progear_bl.c linux-2.6.32.12/drivers/video/backlight/progear_bl.c
27888--- linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400 28270--- linux-2.6.32.12/drivers/video/backlight/progear_bl.c 2010-03-15 11:52:04.000000000 -0400
27889+++ linux-2.6.32.11/drivers/video/backlight/progear_bl.c 2010-04-04 20:46:41.633638271 -0400 28271+++ linux-2.6.32.12/drivers/video/backlight/progear_bl.c 2010-04-04 20:46:41.633638271 -0400
27890@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc 28272@@ -54,7 +54,7 @@ static int progearbl_get_intensity(struc
27891 return intensity - HW_LEVEL_MIN; 28273 return intensity - HW_LEVEL_MIN;
27892 } 28274 }
@@ -27896,9 +28278,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/progear_bl.c linux-2.6.32.11/
27896 .get_brightness = progearbl_get_intensity, 28278 .get_brightness = progearbl_get_intensity,
27897 .update_status = progearbl_set_intensity, 28279 .update_status = progearbl_set_intensity,
27898 }; 28280 };
27899diff -urNp linux-2.6.32.11/drivers/video/backlight/pwm_bl.c linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 28281diff -urNp linux-2.6.32.12/drivers/video/backlight/pwm_bl.c linux-2.6.32.12/drivers/video/backlight/pwm_bl.c
27900--- linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400 28282--- linux-2.6.32.12/drivers/video/backlight/pwm_bl.c 2010-03-15 11:52:04.000000000 -0400
27901+++ linux-2.6.32.11/drivers/video/backlight/pwm_bl.c 2010-04-04 20:46:41.633638271 -0400 28283+++ linux-2.6.32.12/drivers/video/backlight/pwm_bl.c 2010-04-04 20:46:41.633638271 -0400
27902@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness( 28284@@ -56,7 +56,7 @@ static int pwm_backlight_get_brightness(
27903 return bl->props.brightness; 28285 return bl->props.brightness;
27904 } 28286 }
@@ -27908,9 +28290,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/pwm_bl.c linux-2.6.32.11/driv
27908 .update_status = pwm_backlight_update_status, 28290 .update_status = pwm_backlight_update_status,
27909 .get_brightness = pwm_backlight_get_brightness, 28291 .get_brightness = pwm_backlight_get_brightness,
27910 }; 28292 };
27911diff -urNp linux-2.6.32.11/drivers/video/backlight/tosa_bl.c linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 28293diff -urNp linux-2.6.32.12/drivers/video/backlight/tosa_bl.c linux-2.6.32.12/drivers/video/backlight/tosa_bl.c
27912--- linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400 28294--- linux-2.6.32.12/drivers/video/backlight/tosa_bl.c 2010-03-15 11:52:04.000000000 -0400
27913+++ linux-2.6.32.11/drivers/video/backlight/tosa_bl.c 2010-04-04 20:46:41.633638271 -0400 28295+++ linux-2.6.32.12/drivers/video/backlight/tosa_bl.c 2010-04-04 20:46:41.633638271 -0400
27914@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct 28296@@ -72,7 +72,7 @@ static int tosa_bl_get_brightness(struct
27915 return props->brightness; 28297 return props->brightness;
27916 } 28298 }
@@ -27920,9 +28302,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/tosa_bl.c linux-2.6.32.11/dri
27920 .get_brightness = tosa_bl_get_brightness, 28302 .get_brightness = tosa_bl_get_brightness,
27921 .update_status = tosa_bl_update_status, 28303 .update_status = tosa_bl_update_status,
27922 }; 28304 };
27923diff -urNp linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 28305diff -urNp linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c
27924--- linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400 28306--- linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c 2010-03-15 11:52:04.000000000 -0400
27925+++ linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c 2010-04-04 20:46:41.633638271 -0400 28307+++ linux-2.6.32.12/drivers/video/backlight/wm831x_bl.c 2010-04-04 20:46:41.633638271 -0400
27926@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne 28308@@ -112,7 +112,7 @@ static int wm831x_backlight_get_brightne
27927 return data->current_brightness; 28309 return data->current_brightness;
27928 } 28310 }
@@ -27932,9 +28314,9 @@ diff -urNp linux-2.6.32.11/drivers/video/backlight/wm831x_bl.c linux-2.6.32.11/d
27932 .options = BL_CORE_SUSPENDRESUME, 28314 .options = BL_CORE_SUSPENDRESUME,
27933 .update_status = wm831x_backlight_update_status, 28315 .update_status = wm831x_backlight_update_status,
27934 .get_brightness = wm831x_backlight_get_brightness, 28316 .get_brightness = wm831x_backlight_get_brightness,
27935diff -urNp linux-2.6.32.11/drivers/video/bf54x-lq043fb.c linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 28317diff -urNp linux-2.6.32.12/drivers/video/bf54x-lq043fb.c linux-2.6.32.12/drivers/video/bf54x-lq043fb.c
27936--- linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400 28318--- linux-2.6.32.12/drivers/video/bf54x-lq043fb.c 2010-03-15 11:52:04.000000000 -0400
27937+++ linux-2.6.32.11/drivers/video/bf54x-lq043fb.c 2010-04-04 20:46:41.633638271 -0400 28319+++ linux-2.6.32.12/drivers/video/bf54x-lq043fb.c 2010-04-04 20:46:41.633638271 -0400
27938@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back 28320@@ -463,7 +463,7 @@ static int bl_get_brightness(struct back
27939 return 0; 28321 return 0;
27940 } 28322 }
@@ -27944,9 +28326,9 @@ diff -urNp linux-2.6.32.11/drivers/video/bf54x-lq043fb.c linux-2.6.32.11/drivers
27944 .get_brightness = bl_get_brightness, 28326 .get_brightness = bl_get_brightness,
27945 }; 28327 };
27946 28328
27947diff -urNp linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 28329diff -urNp linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c
27948--- linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400 28330--- linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c 2010-03-15 11:52:04.000000000 -0400
27949+++ linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c 2010-04-04 20:46:41.633638271 -0400 28331+++ linux-2.6.32.12/drivers/video/bfin-t350mcqb-fb.c 2010-04-04 20:46:41.633638271 -0400
27950@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back 28332@@ -381,7 +381,7 @@ static int bl_get_brightness(struct back
27951 return 0; 28333 return 0;
27952 } 28334 }
@@ -27956,9 +28338,22 @@ diff -urNp linux-2.6.32.11/drivers/video/bfin-t350mcqb-fb.c linux-2.6.32.11/driv
27956 .get_brightness = bl_get_brightness, 28338 .get_brightness = bl_get_brightness,
27957 }; 28339 };
27958 28340
27959diff -urNp linux-2.6.32.11/drivers/video/fbmem.c linux-2.6.32.11/drivers/video/fbmem.c 28341diff -urNp linux-2.6.32.12/drivers/video/fbcmap.c linux-2.6.32.12/drivers/video/fbcmap.c
27960--- linux-2.6.32.11/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400 28342--- linux-2.6.32.12/drivers/video/fbcmap.c 2010-03-15 11:52:04.000000000 -0400
27961+++ linux-2.6.32.11/drivers/video/fbmem.c 2010-04-04 20:46:41.633638271 -0400 28343+++ linux-2.6.32.12/drivers/video/fbcmap.c 2010-04-29 17:46:37.213234717 -0400
28344@@ -266,8 +266,7 @@ int fb_set_user_cmap(struct fb_cmap_user
28345 rc = -ENODEV;
28346 goto out;
28347 }
28348- if (cmap->start < 0 || (!info->fbops->fb_setcolreg &&
28349- !info->fbops->fb_setcmap)) {
28350+ if (!info->fbops->fb_setcolreg && !info->fbops->fb_setcmap) {
28351 rc = -EINVAL;
28352 goto out1;
28353 }
28354diff -urNp linux-2.6.32.12/drivers/video/fbmem.c linux-2.6.32.12/drivers/video/fbmem.c
28355--- linux-2.6.32.12/drivers/video/fbmem.c 2010-03-15 11:52:04.000000000 -0400
28356+++ linux-2.6.32.12/drivers/video/fbmem.c 2010-04-04 20:46:41.633638271 -0400
27962@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in 28357@@ -403,7 +403,7 @@ static void fb_do_show_logo(struct fb_in
27963 image->dx += image->width + 8; 28358 image->dx += image->width + 8;
27964 } 28359 }
@@ -27986,9 +28381,9 @@ diff -urNp linux-2.6.32.11/drivers/video/fbmem.c linux-2.6.32.11/drivers/video/f
27986 return -EINVAL; 28381 return -EINVAL;
27987 if (!registered_fb[con2fb.framebuffer]) 28382 if (!registered_fb[con2fb.framebuffer])
27988 request_module("fb%d", con2fb.framebuffer); 28383 request_module("fb%d", con2fb.framebuffer);
27989diff -urNp linux-2.6.32.11/drivers/video/fbmon.c linux-2.6.32.11/drivers/video/fbmon.c 28384diff -urNp linux-2.6.32.12/drivers/video/fbmon.c linux-2.6.32.12/drivers/video/fbmon.c
27990--- linux-2.6.32.11/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400 28385--- linux-2.6.32.12/drivers/video/fbmon.c 2010-03-15 11:52:04.000000000 -0400
27991+++ linux-2.6.32.11/drivers/video/fbmon.c 2010-04-04 20:46:41.633638271 -0400 28386+++ linux-2.6.32.12/drivers/video/fbmon.c 2010-04-04 20:46:41.633638271 -0400
27992@@ -45,7 +45,7 @@ 28387@@ -45,7 +45,7 @@
27993 #ifdef DEBUG 28388 #ifdef DEBUG
27994 #define DPRINTK(fmt, args...) printk(fmt,## args) 28389 #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
27998 #endif 28393 #endif
27999 28394
28000 #define FBMON_FIX_HEADER 1 28395 #define FBMON_FIX_HEADER 1
28001diff -urNp linux-2.6.32.11/drivers/video/i810/i810_accel.c linux-2.6.32.11/drivers/video/i810/i810_accel.c 28396diff -urNp linux-2.6.32.12/drivers/video/i810/i810_accel.c linux-2.6.32.12/drivers/video/i810/i810_accel.c
28002--- linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400 28397--- linux-2.6.32.12/drivers/video/i810/i810_accel.c 2010-03-15 11:52:04.000000000 -0400
28003+++ linux-2.6.32.11/drivers/video/i810/i810_accel.c 2010-04-04 20:46:41.633638271 -0400 28398+++ linux-2.6.32.12/drivers/video/i810/i810_accel.c 2010-04-04 20:46:41.633638271 -0400
28004@@ -73,6 +73,7 @@ static inline int wait_for_space(struct 28399@@ -73,6 +73,7 @@ static inline int wait_for_space(struct
28005 } 28400 }
28006 } 28401 }
@@ -28009,9 +28404,9 @@ diff -urNp linux-2.6.32.11/drivers/video/i810/i810_accel.c linux-2.6.32.11/drive
28009 i810_report_error(mmio); 28404 i810_report_error(mmio);
28010 par->dev_flags |= LOCKUP; 28405 par->dev_flags |= LOCKUP;
28011 info->pixmap.scan_align = 1; 28406 info->pixmap.scan_align = 1;
28012diff -urNp linux-2.6.32.11/drivers/video/i810/i810_main.c linux-2.6.32.11/drivers/video/i810/i810_main.c 28407diff -urNp linux-2.6.32.12/drivers/video/i810/i810_main.c linux-2.6.32.12/drivers/video/i810/i810_main.c
28013--- linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400 28408--- linux-2.6.32.12/drivers/video/i810/i810_main.c 2010-03-15 11:52:04.000000000 -0400
28014+++ linux-2.6.32.11/drivers/video/i810/i810_main.c 2010-04-04 20:46:41.633638271 -0400 28409+++ linux-2.6.32.12/drivers/video/i810/i810_main.c 2010-04-04 20:46:41.633638271 -0400
28015@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t 28410@@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t
28016 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, 28411 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 },
28017 { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, 28412 { 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
28021 }; 28416 };
28022 28417
28023 static struct pci_driver i810fb_driver = { 28418 static struct pci_driver i810fb_driver = {
28024diff -urNp linux-2.6.32.11/drivers/video/modedb.c linux-2.6.32.11/drivers/video/modedb.c 28419diff -urNp linux-2.6.32.12/drivers/video/modedb.c linux-2.6.32.12/drivers/video/modedb.c
28025--- linux-2.6.32.11/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400 28420--- linux-2.6.32.12/drivers/video/modedb.c 2010-03-15 11:52:04.000000000 -0400
28026+++ linux-2.6.32.11/drivers/video/modedb.c 2010-04-04 20:46:41.637780128 -0400 28421+++ linux-2.6.32.12/drivers/video/modedb.c 2010-04-04 20:46:41.637780128 -0400
28027@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[ 28422@@ -38,240 +38,240 @@ static const struct fb_videomode modedb[
28028 { 28423 {
28029 /* 640x400 @ 70 Hz, 31.5 kHz hsync */ 28424 /* 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/
28324 }, 28719 },
28325 }; 28720 };
28326 28721
28327diff -urNp linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 28722diff -urNp linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c
28328--- linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400 28723--- linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c 2010-03-15 11:52:04.000000000 -0400
28329+++ linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c 2010-04-04 20:46:41.637780128 -0400 28724+++ linux-2.6.32.12/drivers/video/nvidia/nv_backlight.c 2010-04-04 20:46:41.637780128 -0400
28330@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru 28725@@ -87,7 +87,7 @@ static int nvidia_bl_get_brightness(stru
28331 return bd->props.brightness; 28726 return bd->props.brightness;
28332 } 28727 }
@@ -28336,9 +28731,9 @@ diff -urNp linux-2.6.32.11/drivers/video/nvidia/nv_backlight.c linux-2.6.32.11/d
28336 .get_brightness = nvidia_bl_get_brightness, 28731 .get_brightness = nvidia_bl_get_brightness,
28337 .update_status = nvidia_bl_update_status, 28732 .update_status = nvidia_bl_update_status,
28338 }; 28733 };
28339diff -urNp linux-2.6.32.11/drivers/video/riva/fbdev.c linux-2.6.32.11/drivers/video/riva/fbdev.c 28734diff -urNp linux-2.6.32.12/drivers/video/riva/fbdev.c linux-2.6.32.12/drivers/video/riva/fbdev.c
28340--- linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400 28735--- linux-2.6.32.12/drivers/video/riva/fbdev.c 2010-03-15 11:52:04.000000000 -0400
28341+++ linux-2.6.32.11/drivers/video/riva/fbdev.c 2010-04-04 20:46:41.637780128 -0400 28736+++ linux-2.6.32.12/drivers/video/riva/fbdev.c 2010-04-04 20:46:41.637780128 -0400
28342@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct 28737@@ -331,7 +331,7 @@ static int riva_bl_get_brightness(struct
28343 return bd->props.brightness; 28738 return bd->props.brightness;
28344 } 28739 }
@@ -28348,9 +28743,9 @@ diff -urNp linux-2.6.32.11/drivers/video/riva/fbdev.c linux-2.6.32.11/drivers/vi
28348 .get_brightness = riva_bl_get_brightness, 28743 .get_brightness = riva_bl_get_brightness,
28349 .update_status = riva_bl_update_status, 28744 .update_status = riva_bl_update_status,
28350 }; 28745 };
28351diff -urNp linux-2.6.32.11/drivers/video/uvesafb.c linux-2.6.32.11/drivers/video/uvesafb.c 28746diff -urNp linux-2.6.32.12/drivers/video/uvesafb.c linux-2.6.32.12/drivers/video/uvesafb.c
28352--- linux-2.6.32.11/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400 28747--- linux-2.6.32.12/drivers/video/uvesafb.c 2010-03-15 11:52:04.000000000 -0400
28353+++ linux-2.6.32.11/drivers/video/uvesafb.c 2010-04-04 20:46:41.637780128 -0400 28748+++ linux-2.6.32.12/drivers/video/uvesafb.c 2010-04-04 20:46:41.637780128 -0400
28354@@ -18,6 +18,7 @@ 28749@@ -18,6 +18,7 @@
28355 #include <linux/fb.h> 28750 #include <linux/fb.h>
28356 #include <linux/io.h> 28751 #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
28426 } 28821 }
28427 28822
28428 framebuffer_release(info); 28823 framebuffer_release(info);
28429diff -urNp linux-2.6.32.11/drivers/video/vesafb.c linux-2.6.32.11/drivers/video/vesafb.c 28824diff -urNp linux-2.6.32.12/drivers/video/vesafb.c linux-2.6.32.12/drivers/video/vesafb.c
28430--- linux-2.6.32.11/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400 28825--- linux-2.6.32.12/drivers/video/vesafb.c 2010-03-15 11:52:04.000000000 -0400
28431+++ linux-2.6.32.11/drivers/video/vesafb.c 2010-04-04 20:46:41.637780128 -0400 28826+++ linux-2.6.32.12/drivers/video/vesafb.c 2010-04-04 20:46:41.637780128 -0400
28432@@ -9,6 +9,7 @@ 28827@@ -9,6 +9,7 @@
28433 */ 28828 */
28434 28829
@@ -28532,9 +28927,9 @@ diff -urNp linux-2.6.32.11/drivers/video/vesafb.c linux-2.6.32.11/drivers/video/
28532 if (info->screen_base) 28927 if (info->screen_base)
28533 iounmap(info->screen_base); 28928 iounmap(info->screen_base);
28534 framebuffer_release(info); 28929 framebuffer_release(info);
28535diff -urNp linux-2.6.32.11/drivers/xen/sys-hypervisor.c linux-2.6.32.11/drivers/xen/sys-hypervisor.c 28930diff -urNp linux-2.6.32.12/drivers/xen/sys-hypervisor.c linux-2.6.32.12/drivers/xen/sys-hypervisor.c
28536--- linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400 28931--- linux-2.6.32.12/drivers/xen/sys-hypervisor.c 2010-03-15 11:52:04.000000000 -0400
28537+++ linux-2.6.32.11/drivers/xen/sys-hypervisor.c 2010-04-04 20:46:41.637780128 -0400 28932+++ linux-2.6.32.12/drivers/xen/sys-hypervisor.c 2010-04-04 20:46:41.637780128 -0400
28538@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko 28933@@ -425,7 +425,7 @@ static ssize_t hyp_sysfs_store(struct ko
28539 return 0; 28934 return 0;
28540 } 28935 }
@@ -28544,9 +28939,9 @@ diff -urNp linux-2.6.32.11/drivers/xen/sys-hypervisor.c linux-2.6.32.11/drivers/
28544 .show = hyp_sysfs_show, 28939 .show = hyp_sysfs_show,
28545 .store = hyp_sysfs_store, 28940 .store = hyp_sysfs_store,
28546 }; 28941 };
28547diff -urNp linux-2.6.32.11/fs/9p/vfs_inode.c linux-2.6.32.11/fs/9p/vfs_inode.c 28942diff -urNp linux-2.6.32.12/fs/9p/vfs_inode.c linux-2.6.32.12/fs/9p/vfs_inode.c
28548--- linux-2.6.32.11/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400 28943--- linux-2.6.32.12/fs/9p/vfs_inode.c 2010-03-15 11:52:04.000000000 -0400
28549+++ linux-2.6.32.11/fs/9p/vfs_inode.c 2010-04-04 20:46:41.637780128 -0400 28944+++ linux-2.6.32.12/fs/9p/vfs_inode.c 2010-04-04 20:46:41.637780128 -0400
28550@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct 28945@@ -1079,7 +1079,7 @@ static void *v9fs_vfs_follow_link(struct
28551 static void 28946 static void
28552 v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 28947 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
28556 28951
28557 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, 28952 P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name,
28558 IS_ERR(s) ? "<error>" : s); 28953 IS_ERR(s) ? "<error>" : s);
28559diff -urNp linux-2.6.32.11/fs/aio.c linux-2.6.32.11/fs/aio.c 28954diff -urNp linux-2.6.32.12/fs/aio.c linux-2.6.32.12/fs/aio.c
28560--- linux-2.6.32.11/fs/aio.c 2010-03-15 11:52:04.000000000 -0400 28955--- linux-2.6.32.12/fs/aio.c 2010-03-15 11:52:04.000000000 -0400
28561+++ linux-2.6.32.11/fs/aio.c 2010-04-04 20:46:41.637780128 -0400 28956+++ linux-2.6.32.12/fs/aio.c 2010-04-04 20:46:41.637780128 -0400
28562@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx 28957@@ -115,7 +115,7 @@ static int aio_setup_ring(struct kioctx
28563 size += sizeof(struct io_event) * nr_events; 28958 size += sizeof(struct io_event) * nr_events;
28564 nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; 28959 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
28568 return -EINVAL; 28963 return -EINVAL;
28569 28964
28570 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); 28965 nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event);
28571diff -urNp linux-2.6.32.11/fs/attr.c linux-2.6.32.11/fs/attr.c 28966diff -urNp linux-2.6.32.12/fs/attr.c linux-2.6.32.12/fs/attr.c
28572--- linux-2.6.32.11/fs/attr.c 2010-03-15 11:52:04.000000000 -0400 28967--- linux-2.6.32.12/fs/attr.c 2010-03-15 11:52:04.000000000 -0400
28573+++ linux-2.6.32.11/fs/attr.c 2010-04-04 20:46:41.637780128 -0400 28968+++ linux-2.6.32.12/fs/attr.c 2010-04-04 20:46:41.637780128 -0400
28574@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode 28969@@ -83,6 +83,7 @@ int inode_newsize_ok(const struct inode
28575 unsigned long limit; 28970 unsigned long limit;
28576 28971
@@ -28579,9 +28974,9 @@ diff -urNp linux-2.6.32.11/fs/attr.c linux-2.6.32.11/fs/attr.c
28579 if (limit != RLIM_INFINITY && offset > limit) 28974 if (limit != RLIM_INFINITY && offset > limit)
28580 goto out_sig; 28975 goto out_sig;
28581 if (offset > inode->i_sb->s_maxbytes) 28976 if (offset > inode->i_sb->s_maxbytes)
28582diff -urNp linux-2.6.32.11/fs/autofs/root.c linux-2.6.32.11/fs/autofs/root.c 28977diff -urNp linux-2.6.32.12/fs/autofs/root.c linux-2.6.32.12/fs/autofs/root.c
28583--- linux-2.6.32.11/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400 28978--- linux-2.6.32.12/fs/autofs/root.c 2010-03-15 11:52:04.000000000 -0400
28584+++ linux-2.6.32.11/fs/autofs/root.c 2010-04-04 20:46:41.637780128 -0400 28979+++ linux-2.6.32.12/fs/autofs/root.c 2010-04-04 20:46:41.637780128 -0400
28585@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in 28980@@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in
28586 set_bit(n,sbi->symlink_bitmap); 28981 set_bit(n,sbi->symlink_bitmap);
28587 sl = &sbi->symlink[n]; 28982 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
28592 if (!sl->data) { 28987 if (!sl->data) {
28593 clear_bit(n,sbi->symlink_bitmap); 28988 clear_bit(n,sbi->symlink_bitmap);
28594 unlock_kernel(); 28989 unlock_kernel();
28595diff -urNp linux-2.6.32.11/fs/autofs4/symlink.c linux-2.6.32.11/fs/autofs4/symlink.c 28990diff -urNp linux-2.6.32.12/fs/autofs4/symlink.c linux-2.6.32.12/fs/autofs4/symlink.c
28596--- linux-2.6.32.11/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400 28991--- linux-2.6.32.12/fs/autofs4/symlink.c 2010-03-15 11:52:04.000000000 -0400
28597+++ linux-2.6.32.11/fs/autofs4/symlink.c 2010-04-04 20:46:41.637780128 -0400 28992+++ linux-2.6.32.12/fs/autofs4/symlink.c 2010-04-04 20:46:41.637780128 -0400
28598@@ -15,7 +15,7 @@ 28993@@ -15,7 +15,7 @@
28599 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) 28994 static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd)
28600 { 28995 {
@@ -28604,9 +28999,9 @@ diff -urNp linux-2.6.32.11/fs/autofs4/symlink.c linux-2.6.32.11/fs/autofs4/symli
28604 return NULL; 28999 return NULL;
28605 } 29000 }
28606 29001
28607diff -urNp linux-2.6.32.11/fs/befs/linuxvfs.c linux-2.6.32.11/fs/befs/linuxvfs.c 29002diff -urNp linux-2.6.32.12/fs/befs/linuxvfs.c linux-2.6.32.12/fs/befs/linuxvfs.c
28608--- linux-2.6.32.11/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400 29003--- linux-2.6.32.12/fs/befs/linuxvfs.c 2010-03-15 11:52:04.000000000 -0400
28609+++ linux-2.6.32.11/fs/befs/linuxvfs.c 2010-04-04 20:46:41.637780128 -0400 29004+++ linux-2.6.32.12/fs/befs/linuxvfs.c 2010-04-04 20:46:41.637780128 -0400
28610@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry 29005@@ -493,7 +493,7 @@ static void befs_put_link(struct dentry
28611 { 29006 {
28612 befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); 29007 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
28616 if (!IS_ERR(link)) 29011 if (!IS_ERR(link))
28617 kfree(link); 29012 kfree(link);
28618 } 29013 }
28619diff -urNp linux-2.6.32.11/fs/binfmt_aout.c linux-2.6.32.11/fs/binfmt_aout.c 29014diff -urNp linux-2.6.32.12/fs/binfmt_aout.c linux-2.6.32.12/fs/binfmt_aout.c
28620--- linux-2.6.32.11/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400 29015--- linux-2.6.32.12/fs/binfmt_aout.c 2010-03-15 11:52:04.000000000 -0400
28621+++ linux-2.6.32.11/fs/binfmt_aout.c 2010-04-04 20:46:41.637780128 -0400 29016+++ linux-2.6.32.12/fs/binfmt_aout.c 2010-04-04 20:46:41.637780128 -0400
28622@@ -16,6 +16,7 @@ 29017@@ -16,6 +16,7 @@
28623 #include <linux/string.h> 29018 #include <linux/string.h>
28624 #include <linux/fs.h> 29019 #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
28686 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, 29081 MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
28687 fd_offset + ex.a_text); 29082 fd_offset + ex.a_text);
28688 up_write(&current->mm->mmap_sem); 29083 up_write(&current->mm->mmap_sem);
28689diff -urNp linux-2.6.32.11/fs/binfmt_elf.c linux-2.6.32.11/fs/binfmt_elf.c 29084diff -urNp linux-2.6.32.12/fs/binfmt_elf.c linux-2.6.32.12/fs/binfmt_elf.c
28690--- linux-2.6.32.11/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 29085--- linux-2.6.32.12/fs/binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
28691+++ linux-2.6.32.11/fs/binfmt_elf.c 2010-04-04 20:47:28.956670452 -0400 29086+++ linux-2.6.32.12/fs/binfmt_elf.c 2010-04-04 20:47:28.956670452 -0400
28692@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str 29087@@ -50,6 +50,10 @@ static int elf_core_dump(long signr, str
28693 #define elf_core_dump NULL 29088 #define elf_core_dump NULL
28694 #endif 29089 #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
29324 static int __init init_elf_binfmt(void) 29719 static int __init init_elf_binfmt(void)
29325 { 29720 {
29326 return register_binfmt(&elf_format); 29721 return register_binfmt(&elf_format);
29327diff -urNp linux-2.6.32.11/fs/binfmt_flat.c linux-2.6.32.11/fs/binfmt_flat.c 29722diff -urNp linux-2.6.32.12/fs/binfmt_flat.c linux-2.6.32.12/fs/binfmt_flat.c
29328--- linux-2.6.32.11/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400 29723--- linux-2.6.32.12/fs/binfmt_flat.c 2010-03-15 11:52:04.000000000 -0400
29329+++ linux-2.6.32.11/fs/binfmt_flat.c 2010-04-04 20:46:41.641560293 -0400 29724+++ linux-2.6.32.12/fs/binfmt_flat.c 2010-04-04 20:46:41.641560293 -0400
29330@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b 29725@@ -564,7 +564,9 @@ static int load_flat_file(struct linux_b
29331 realdatastart = (unsigned long) -ENOMEM; 29726 realdatastart = (unsigned long) -ENOMEM;
29332 printk("Unable to allocate RAM for process data, errno %d\n", 29727 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
29359 ret = result; 29754 ret = result;
29360 goto err; 29755 goto err;
29361 } 29756 }
29362diff -urNp linux-2.6.32.11/fs/binfmt_misc.c linux-2.6.32.11/fs/binfmt_misc.c 29757diff -urNp linux-2.6.32.12/fs/binfmt_misc.c linux-2.6.32.12/fs/binfmt_misc.c
29363--- linux-2.6.32.11/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400 29758--- linux-2.6.32.12/fs/binfmt_misc.c 2010-03-15 11:52:04.000000000 -0400
29364+++ linux-2.6.32.11/fs/binfmt_misc.c 2010-04-04 20:46:41.641560293 -0400 29759+++ linux-2.6.32.12/fs/binfmt_misc.c 2010-04-04 20:46:41.641560293 -0400
29365@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl 29760@@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl
29366 static struct tree_descr bm_files[] = { 29761 static struct tree_descr bm_files[] = {
29367 [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, 29762 [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
29371 }; 29766 };
29372 int err = simple_fill_super(sb, 0x42494e4d, bm_files); 29767 int err = simple_fill_super(sb, 0x42494e4d, bm_files);
29373 if (!err) 29768 if (!err)
29374diff -urNp linux-2.6.32.11/fs/bio.c linux-2.6.32.11/fs/bio.c 29769diff -urNp linux-2.6.32.12/fs/bio.c linux-2.6.32.12/fs/bio.c
29375--- linux-2.6.32.11/fs/bio.c 2010-03-15 11:52:04.000000000 -0400 29770--- linux-2.6.32.12/fs/bio.c 2010-03-15 11:52:04.000000000 -0400
29376+++ linux-2.6.32.11/fs/bio.c 2010-04-04 20:46:41.641560293 -0400 29771+++ linux-2.6.32.12/fs/bio.c 2010-04-04 20:46:41.641560293 -0400
29377@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr 29772@@ -78,7 +78,7 @@ static struct kmem_cache *bio_find_or_cr
29378 29773
29379 i = 0; 29774 i = 0;
@@ -29392,9 +29787,21 @@ diff -urNp linux-2.6.32.11/fs/bio.c linux-2.6.32.11/fs/bio.c
29392 29787
29393 __bio_for_each_segment(bvec, bio, i, 0) { 29788 __bio_for_each_segment(bvec, bio, i, 0) {
29394 char *addr = page_address(bvec->bv_page); 29789 char *addr = page_address(bvec->bv_page);
29395diff -urNp linux-2.6.32.11/fs/btrfs/ctree.c linux-2.6.32.11/fs/btrfs/ctree.c 29790diff -urNp linux-2.6.32.12/fs/block_dev.c linux-2.6.32.12/fs/block_dev.c
29396--- linux-2.6.32.11/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400 29791--- linux-2.6.32.12/fs/block_dev.c 2010-04-29 17:49:38.421500081 -0400
29397+++ linux-2.6.32.11/fs/btrfs/ctree.c 2010-04-04 20:46:41.641560293 -0400 29792+++ linux-2.6.32.12/fs/block_dev.c 2010-04-29 17:49:58.449523678 -0400
29793@@ -664,7 +664,7 @@ int bd_claim(struct block_device *bdev,
29794 else if (bdev->bd_contains == bdev)
29795 res = 0; /* is a whole device which isn't held */
29796
29797- else if (bdev->bd_contains->bd_holder == bd_claim)
29798+ else if (bdev->bd_contains->bd_holder == (void *)bd_claim)
29799 res = 0; /* is a partition of a device that is being partitioned */
29800 else if (bdev->bd_contains->bd_holder != NULL)
29801 res = -EBUSY; /* is a partition of a held device */
29802diff -urNp linux-2.6.32.12/fs/btrfs/ctree.c linux-2.6.32.12/fs/btrfs/ctree.c
29803--- linux-2.6.32.12/fs/btrfs/ctree.c 2010-03-15 11:52:04.000000000 -0400
29804+++ linux-2.6.32.12/fs/btrfs/ctree.c 2010-04-04 20:46:41.641560293 -0400
29398@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran 29805@@ -3568,7 +3568,6 @@ setup_items_for_insert(struct btrfs_tran
29399 29806
29400 ret = 0; 29807 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
29403 btrfs_cpu_key_to_disk(&disk_key, cpu_key); 29810 btrfs_cpu_key_to_disk(&disk_key, cpu_key);
29404 ret = fixup_low_keys(trans, root, path, &disk_key, 1); 29811 ret = fixup_low_keys(trans, root, path, &disk_key, 1);
29405 } 29812 }
29406diff -urNp linux-2.6.32.11/fs/btrfs/disk-io.c linux-2.6.32.11/fs/btrfs/disk-io.c 29813diff -urNp linux-2.6.32.12/fs/btrfs/disk-io.c linux-2.6.32.12/fs/btrfs/disk-io.c
29407--- linux-2.6.32.11/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400 29814--- linux-2.6.32.12/fs/btrfs/disk-io.c 2010-03-15 11:52:04.000000000 -0400
29408+++ linux-2.6.32.11/fs/btrfs/disk-io.c 2010-04-04 20:46:41.641560293 -0400 29815+++ linux-2.6.32.12/fs/btrfs/disk-io.c 2010-04-04 20:46:41.641560293 -0400
29409@@ -39,7 +39,7 @@ 29816@@ -39,7 +39,7 @@
29410 #include "tree-log.h" 29817 #include "tree-log.h"
29411 #include "free-space-cache.h" 29818 #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
29424 .write_cache_pages_lock_hook = btree_lock_page_hook, 29831 .write_cache_pages_lock_hook = btree_lock_page_hook,
29425 .readpage_end_io_hook = btree_readpage_end_io_hook, 29832 .readpage_end_io_hook = btree_readpage_end_io_hook,
29426 .submit_bio_hook = btree_submit_bio_hook, 29833 .submit_bio_hook = btree_submit_bio_hook,
29427diff -urNp linux-2.6.32.11/fs/btrfs/extent_io.h linux-2.6.32.11/fs/btrfs/extent_io.h 29834diff -urNp linux-2.6.32.12/fs/btrfs/extent_io.h linux-2.6.32.12/fs/btrfs/extent_io.h
29428--- linux-2.6.32.11/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400 29835--- linux-2.6.32.12/fs/btrfs/extent_io.h 2010-03-15 11:52:04.000000000 -0400
29429+++ linux-2.6.32.11/fs/btrfs/extent_io.h 2010-04-04 20:46:41.641560293 -0400 29836+++ linux-2.6.32.12/fs/btrfs/extent_io.h 2010-04-04 20:46:41.641560293 -0400
29430@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s 29837@@ -49,36 +49,36 @@ typedef int (extent_submit_bio_hook_t)(s
29431 struct bio *bio, int mirror_num, 29838 struct bio *bio, int mirror_num,
29432 unsigned long bio_flags); 29839 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_
29487 }; 29894 };
29488 29895
29489 struct extent_state { 29896 struct extent_state {
29490diff -urNp linux-2.6.32.11/fs/btrfs/free-space-cache.c linux-2.6.32.11/fs/btrfs/free-space-cache.c 29897diff -urNp linux-2.6.32.12/fs/btrfs/free-space-cache.c linux-2.6.32.12/fs/btrfs/free-space-cache.c
29491--- linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400 29898--- linux-2.6.32.12/fs/btrfs/free-space-cache.c 2010-03-15 11:52:04.000000000 -0400
29492+++ linux-2.6.32.11/fs/btrfs/free-space-cache.c 2010-04-04 20:46:41.641560293 -0400 29899+++ linux-2.6.32.12/fs/btrfs/free-space-cache.c 2010-04-04 20:46:41.641560293 -0400
29493@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf 29900@@ -1074,8 +1074,6 @@ u64 btrfs_alloc_from_cluster(struct btrf
29494 29901
29495 while(1) { 29902 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/
29508 29915
29509 if (entry->bitmap && entry->bytes > bytes + empty_size) { 29916 if (entry->bitmap && entry->bytes > bytes + empty_size) {
29510 ret = btrfs_bitmap_cluster(block_group, entry, cluster, 29917 ret = btrfs_bitmap_cluster(block_group, entry, cluster,
29511diff -urNp linux-2.6.32.11/fs/btrfs/inode.c linux-2.6.32.11/fs/btrfs/inode.c 29918diff -urNp linux-2.6.32.12/fs/btrfs/inode.c linux-2.6.32.12/fs/btrfs/inode.c
29512--- linux-2.6.32.11/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400 29919--- linux-2.6.32.12/fs/btrfs/inode.c 2010-03-15 11:52:04.000000000 -0400
29513+++ linux-2.6.32.11/fs/btrfs/inode.c 2010-04-04 20:46:41.641560293 -0400 29920+++ linux-2.6.32.12/fs/btrfs/inode.c 2010-04-04 20:46:41.641560293 -0400
29514@@ -63,7 +63,7 @@ static const struct inode_operations btr 29921@@ -63,7 +63,7 @@ static const struct inode_operations btr
29515 static const struct address_space_operations btrfs_aops; 29922 static const struct address_space_operations btrfs_aops;
29516 static const struct address_space_operations btrfs_symlink_aops; 29923 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
29529 .fill_delalloc = run_delalloc_range, 29936 .fill_delalloc = run_delalloc_range,
29530 .submit_bio_hook = btrfs_submit_bio_hook, 29937 .submit_bio_hook = btrfs_submit_bio_hook,
29531 .merge_bio_hook = btrfs_merge_bio_hook, 29938 .merge_bio_hook = btrfs_merge_bio_hook,
29532diff -urNp linux-2.6.32.11/fs/btrfs/sysfs.c linux-2.6.32.11/fs/btrfs/sysfs.c 29939diff -urNp linux-2.6.32.12/fs/btrfs/sysfs.c linux-2.6.32.12/fs/btrfs/sysfs.c
29533--- linux-2.6.32.11/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400 29940--- linux-2.6.32.12/fs/btrfs/sysfs.c 2010-03-15 11:52:04.000000000 -0400
29534+++ linux-2.6.32.11/fs/btrfs/sysfs.c 2010-04-04 20:46:41.641560293 -0400 29941+++ linux-2.6.32.12/fs/btrfs/sysfs.c 2010-04-04 20:46:41.641560293 -0400
29535@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko 29942@@ -164,12 +164,12 @@ static void btrfs_root_release(struct ko
29536 complete(&root->kobj_unregister); 29943 complete(&root->kobj_unregister);
29537 } 29944 }
@@ -29547,9 +29954,9 @@ diff -urNp linux-2.6.32.11/fs/btrfs/sysfs.c linux-2.6.32.11/fs/btrfs/sysfs.c
29547 .show = btrfs_root_attr_show, 29954 .show = btrfs_root_attr_show,
29548 .store = btrfs_root_attr_store, 29955 .store = btrfs_root_attr_store,
29549 }; 29956 };
29550diff -urNp linux-2.6.32.11/fs/buffer.c linux-2.6.32.11/fs/buffer.c 29957diff -urNp linux-2.6.32.12/fs/buffer.c linux-2.6.32.12/fs/buffer.c
29551--- linux-2.6.32.11/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400 29958--- linux-2.6.32.12/fs/buffer.c 2010-03-15 11:52:04.000000000 -0400
29552+++ linux-2.6.32.11/fs/buffer.c 2010-04-04 20:46:41.641560293 -0400 29959+++ linux-2.6.32.12/fs/buffer.c 2010-04-04 20:46:41.641560293 -0400
29553@@ -25,6 +25,7 @@ 29960@@ -25,6 +25,7 @@
29554 #include <linux/percpu.h> 29961 #include <linux/percpu.h>
29555 #include <linux/slab.h> 29962 #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
29558 #include <linux/blkdev.h> 29965 #include <linux/blkdev.h>
29559 #include <linux/file.h> 29966 #include <linux/file.h>
29560 #include <linux/quotaops.h> 29967 #include <linux/quotaops.h>
29561diff -urNp linux-2.6.32.11/fs/cachefiles/rdwr.c linux-2.6.32.11/fs/cachefiles/rdwr.c 29968diff -urNp linux-2.6.32.12/fs/cachefiles/bind.c linux-2.6.32.12/fs/cachefiles/bind.c
29562--- linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400 29969--- linux-2.6.32.12/fs/cachefiles/bind.c 2010-03-15 11:52:04.000000000 -0400
29563+++ linux-2.6.32.11/fs/cachefiles/rdwr.c 2010-04-04 20:46:41.641560293 -0400 29970+++ linux-2.6.32.12/fs/cachefiles/bind.c 2010-04-29 17:46:37.245246835 -0400
29971@@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
29972 args);
29973
29974 /* start by checking things over */
29975- ASSERT(cache->fstop_percent >= 0 &&
29976- cache->fstop_percent < cache->fcull_percent &&
29977+ ASSERT(cache->fstop_percent < cache->fcull_percent &&
29978 cache->fcull_percent < cache->frun_percent &&
29979 cache->frun_percent < 100);
29980
29981- ASSERT(cache->bstop_percent >= 0 &&
29982- cache->bstop_percent < cache->bcull_percent &&
29983+ ASSERT(cache->bstop_percent < cache->bcull_percent &&
29984 cache->bcull_percent < cache->brun_percent &&
29985 cache->brun_percent < 100);
29986
29987diff -urNp linux-2.6.32.12/fs/cachefiles/daemon.c linux-2.6.32.12/fs/cachefiles/daemon.c
29988--- linux-2.6.32.12/fs/cachefiles/daemon.c 2010-03-15 11:52:04.000000000 -0400
29989+++ linux-2.6.32.12/fs/cachefiles/daemon.c 2010-04-29 17:46:37.253252101 -0400
29990@@ -220,7 +220,7 @@ static ssize_t cachefiles_daemon_write(s
29991 if (test_bit(CACHEFILES_DEAD, &cache->flags))
29992 return -EIO;
29993
29994- if (datalen < 0 || datalen > PAGE_SIZE - 1)
29995+ if (datalen > PAGE_SIZE - 1)
29996 return -EOPNOTSUPP;
29997
29998 /* drag the command string into the kernel so we can parse it */
29999@@ -385,7 +385,7 @@ static int cachefiles_daemon_fstop(struc
30000 if (args[0] != '%' || args[1] != '\0')
30001 return -EINVAL;
30002
30003- if (fstop < 0 || fstop >= cache->fcull_percent)
30004+ if (fstop >= cache->fcull_percent)
30005 return cachefiles_daemon_range_error(cache, args);
30006
30007 cache->fstop_percent = fstop;
30008@@ -457,7 +457,7 @@ static int cachefiles_daemon_bstop(struc
30009 if (args[0] != '%' || args[1] != '\0')
30010 return -EINVAL;
30011
30012- if (bstop < 0 || bstop >= cache->bcull_percent)
30013+ if (bstop >= cache->bcull_percent)
30014 return cachefiles_daemon_range_error(cache, args);
30015
30016 cache->bstop_percent = bstop;
30017diff -urNp linux-2.6.32.12/fs/cachefiles/rdwr.c linux-2.6.32.12/fs/cachefiles/rdwr.c
30018--- linux-2.6.32.12/fs/cachefiles/rdwr.c 2010-03-15 11:52:04.000000000 -0400
30019+++ linux-2.6.32.12/fs/cachefiles/rdwr.c 2010-04-04 20:46:41.641560293 -0400
29564@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache 30020@@ -946,7 +946,7 @@ int cachefiles_write_page(struct fscache
29565 old_fs = get_fs(); 30021 old_fs = get_fs();
29566 set_fs(KERNEL_DS); 30022 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
29570 set_fs(old_fs); 30026 set_fs(old_fs);
29571 kunmap(page); 30027 kunmap(page);
29572 if (ret != len) 30028 if (ret != len)
29573diff -urNp linux-2.6.32.11/fs/cifs/cifs_uniupr.h linux-2.6.32.11/fs/cifs/cifs_uniupr.h 30029diff -urNp linux-2.6.32.12/fs/cifs/cifs_uniupr.h linux-2.6.32.12/fs/cifs/cifs_uniupr.h
29574--- linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400 30030--- linux-2.6.32.12/fs/cifs/cifs_uniupr.h 2010-03-15 11:52:04.000000000 -0400
29575+++ linux-2.6.32.11/fs/cifs/cifs_uniupr.h 2010-04-04 20:46:41.645781188 -0400 30031+++ linux-2.6.32.12/fs/cifs/cifs_uniupr.h 2010-04-04 20:46:41.645781188 -0400
29576@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa 30032@@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa
29577 {0x0490, 0x04cc, UniCaseRangeU0490}, 30033 {0x0490, 0x04cc, UniCaseRangeU0490},
29578 {0x1e00, 0x1ffc, UniCaseRangeU1e00}, 30034 {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
29582 }; 30038 };
29583 #endif 30039 #endif
29584 30040
29585diff -urNp linux-2.6.32.11/fs/cifs/link.c linux-2.6.32.11/fs/cifs/link.c 30041diff -urNp linux-2.6.32.12/fs/cifs/link.c linux-2.6.32.12/fs/cifs/link.c
29586--- linux-2.6.32.11/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400 30042--- linux-2.6.32.12/fs/cifs/link.c 2010-03-15 11:52:04.000000000 -0400
29587+++ linux-2.6.32.11/fs/cifs/link.c 2010-04-04 20:46:41.645781188 -0400 30043+++ linux-2.6.32.12/fs/cifs/link.c 2010-04-04 20:46:41.645781188 -0400
29588@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct 30044@@ -215,7 +215,7 @@ cifs_symlink(struct inode *inode, struct
29589 30045
29590 void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) 30046 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
29594 if (!IS_ERR(p)) 30050 if (!IS_ERR(p))
29595 kfree(p); 30051 kfree(p);
29596 } 30052 }
29597diff -urNp linux-2.6.32.11/fs/compat_binfmt_elf.c linux-2.6.32.11/fs/compat_binfmt_elf.c 30053diff -urNp linux-2.6.32.12/fs/compat_binfmt_elf.c linux-2.6.32.12/fs/compat_binfmt_elf.c
29598--- linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400 30054--- linux-2.6.32.12/fs/compat_binfmt_elf.c 2010-03-15 11:52:04.000000000 -0400
29599+++ linux-2.6.32.11/fs/compat_binfmt_elf.c 2010-04-04 20:46:41.645781188 -0400 30055+++ linux-2.6.32.12/fs/compat_binfmt_elf.c 2010-04-04 20:46:41.645781188 -0400
29600@@ -29,10 +29,12 @@ 30056@@ -29,10 +29,12 @@
29601 #undef elfhdr 30057 #undef elfhdr
29602 #undef elf_phdr 30058 #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
29610 #define elf_addr_t Elf32_Addr 30066 #define elf_addr_t Elf32_Addr
29611 30067
29612 /* 30068 /*
29613diff -urNp linux-2.6.32.11/fs/compat.c linux-2.6.32.11/fs/compat.c 30069diff -urNp linux-2.6.32.12/fs/compat.c linux-2.6.32.12/fs/compat.c
29614--- linux-2.6.32.11/fs/compat.c 2010-03-15 11:52:04.000000000 -0400 30070--- linux-2.6.32.12/fs/compat.c 2010-03-15 11:52:04.000000000 -0400
29615+++ linux-2.6.32.11/fs/compat.c 2010-04-04 20:46:41.645781188 -0400 30071+++ linux-2.6.32.12/fs/compat.c 2010-04-04 20:46:41.645781188 -0400
29616@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc, 30072@@ -1410,14 +1410,12 @@ static int compat_copy_strings(int argc,
29617 if (!kmapped_page || kpos != (pos & PAGE_MASK)) { 30073 if (!kmapped_page || kpos != (pos & PAGE_MASK)) {
29618 struct page *page; 30074 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
29712 out: 30168 out:
29713 if (bprm->mm) 30169 if (bprm->mm)
29714 mmput(bprm->mm); 30170 mmput(bprm->mm);
29715diff -urNp linux-2.6.32.11/fs/compat_ioctl.c linux-2.6.32.11/fs/compat_ioctl.c 30171diff -urNp linux-2.6.32.12/fs/compat_ioctl.c linux-2.6.32.12/fs/compat_ioctl.c
29716--- linux-2.6.32.11/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400 30172--- linux-2.6.32.12/fs/compat_ioctl.c 2010-03-15 11:52:04.000000000 -0400
29717+++ linux-2.6.32.11/fs/compat_ioctl.c 2010-04-04 20:46:41.645781188 -0400 30173+++ linux-2.6.32.12/fs/compat_ioctl.c 2010-04-04 20:46:41.645781188 -0400
29718@@ -1827,15 +1827,15 @@ struct ioctl_trans { 30174@@ -1827,15 +1827,15 @@ struct ioctl_trans {
29719 }; 30175 };
29720 30176
@@ -29734,9 +30190,9 @@ diff -urNp linux-2.6.32.11/fs/compat_ioctl.c linux-2.6.32.11/fs/compat_ioctl.c
29734 30190
29735 /* ioctl should not be warned about even if it's not implemented. 30191 /* ioctl should not be warned about even if it's not implemented.
29736 Valid reasons to use this: 30192 Valid reasons to use this:
29737diff -urNp linux-2.6.32.11/fs/debugfs/inode.c linux-2.6.32.11/fs/debugfs/inode.c 30193diff -urNp linux-2.6.32.12/fs/debugfs/inode.c linux-2.6.32.12/fs/debugfs/inode.c
29738--- linux-2.6.32.11/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400 30194--- linux-2.6.32.12/fs/debugfs/inode.c 2010-03-15 11:52:04.000000000 -0400
29739+++ linux-2.6.32.11/fs/debugfs/inode.c 2010-04-04 20:46:41.645781188 -0400 30195+++ linux-2.6.32.12/fs/debugfs/inode.c 2010-04-04 20:46:41.645781188 -0400
29740@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc 30196@@ -128,7 +128,7 @@ static inline int debugfs_positive(struc
29741 30197
29742 static int debug_fill_super(struct super_block *sb, void *data, int silent) 30198 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
29746 30202
29747 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); 30203 return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files);
29748 } 30204 }
29749diff -urNp linux-2.6.32.11/fs/dlm/lockspace.c linux-2.6.32.11/fs/dlm/lockspace.c 30205diff -urNp linux-2.6.32.12/fs/dlm/lockspace.c linux-2.6.32.12/fs/dlm/lockspace.c
29750--- linux-2.6.32.11/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400 30206--- linux-2.6.32.12/fs/dlm/lockspace.c 2010-03-15 11:52:04.000000000 -0400
29751+++ linux-2.6.32.11/fs/dlm/lockspace.c 2010-04-04 20:46:41.645781188 -0400 30207+++ linux-2.6.32.12/fs/dlm/lockspace.c 2010-04-04 20:46:41.645781188 -0400
29752@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc 30208@@ -148,7 +148,7 @@ static void lockspace_kobj_release(struc
29753 kfree(ls); 30209 kfree(ls);
29754 } 30210 }
@@ -29758,10 +30214,10 @@ diff -urNp linux-2.6.32.11/fs/dlm/lockspace.c linux-2.6.32.11/fs/dlm/lockspace.c
29758 .show = dlm_attr_show, 30214 .show = dlm_attr_show,
29759 .store = dlm_attr_store, 30215 .store = dlm_attr_store,
29760 }; 30216 };
29761diff -urNp linux-2.6.32.11/fs/ecryptfs/inode.c linux-2.6.32.11/fs/ecryptfs/inode.c 30217diff -urNp linux-2.6.32.12/fs/ecryptfs/inode.c linux-2.6.32.12/fs/ecryptfs/inode.c
29762--- linux-2.6.32.11/fs/ecryptfs/inode.c 2010-03-15 11:52:04.000000000 -0400 30218--- linux-2.6.32.12/fs/ecryptfs/inode.c 2010-04-29 17:49:38.429034237 -0400
29763+++ linux-2.6.32.11/fs/ecryptfs/inode.c 2010-04-04 20:46:41.645781188 -0400 30219+++ linux-2.6.32.12/fs/ecryptfs/inode.c 2010-04-29 17:49:58.465067636 -0400
29764@@ -676,7 +676,7 @@ ecryptfs_readlink(struct dentry *dentry, 30220@@ -655,7 +655,7 @@ static int ecryptfs_readlink_lower(struc
29765 old_fs = get_fs(); 30221 old_fs = get_fs();
29766 set_fs(get_ds()); 30222 set_fs(get_ds());
29767 rc = lower_dentry->d_inode->i_op->readlink(lower_dentry, 30223 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
29769+ (__force char __user *)lower_buf, 30225+ (__force char __user *)lower_buf,
29770 lower_bufsiz); 30226 lower_bufsiz);
29771 set_fs(old_fs); 30227 set_fs(old_fs);
29772 if (rc >= 0) { 30228 if (rc < 0)
29773@@ -720,7 +720,7 @@ static void *ecryptfs_follow_link(struct 30229@@ -701,7 +701,7 @@ static void *ecryptfs_follow_link(struct
29774 } 30230 }
29775 old_fs = get_fs(); 30231 old_fs = get_fs();
29776 set_fs(get_ds()); 30232 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
29779 set_fs(old_fs); 30235 set_fs(old_fs);
29780 if (rc < 0) 30236 if (rc < 0)
29781 goto out_free; 30237 goto out_free;
29782diff -urNp linux-2.6.32.11/fs/exec.c linux-2.6.32.11/fs/exec.c 30238diff -urNp linux-2.6.32.12/fs/exec.c linux-2.6.32.12/fs/exec.c
29783--- linux-2.6.32.11/fs/exec.c 2010-04-04 20:41:50.037938751 -0400 30239--- linux-2.6.32.12/fs/exec.c 2010-04-04 20:41:50.037938751 -0400
29784+++ linux-2.6.32.11/fs/exec.c 2010-04-04 20:46:41.645781188 -0400 30240+++ linux-2.6.32.12/fs/exec.c 2010-04-04 20:46:41.645781188 -0400
29785@@ -56,12 +56,24 @@ 30241@@ -56,12 +56,24 @@
29786 #include <linux/fsnotify.h> 30242 #include <linux/fsnotify.h>
29787 #include <linux/fs_struct.h> 30243 #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
30260 /* 30716 /*
30261 * lock_kernel() because format_corename() is controlled by sysctl, which 30717 * lock_kernel() because format_corename() is controlled by sysctl, which
30262 * uses lock_kernel() 30718 * uses lock_kernel()
30263diff -urNp linux-2.6.32.11/fs/ext2/balloc.c linux-2.6.32.11/fs/ext2/balloc.c 30719diff -urNp linux-2.6.32.12/fs/ext2/balloc.c linux-2.6.32.12/fs/ext2/balloc.c
30264--- linux-2.6.32.11/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400 30720--- linux-2.6.32.12/fs/ext2/balloc.c 2010-03-15 11:52:04.000000000 -0400
30265+++ linux-2.6.32.11/fs/ext2/balloc.c 2010-04-04 20:46:41.645781188 -0400 30721+++ linux-2.6.32.12/fs/ext2/balloc.c 2010-04-04 20:46:41.645781188 -0400
30266@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e 30722@@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
30267 30723
30268 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30724 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
30272 sbi->s_resuid != current_fsuid() && 30728 sbi->s_resuid != current_fsuid() &&
30273 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30729 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
30274 return 0; 30730 return 0;
30275diff -urNp linux-2.6.32.11/fs/ext3/balloc.c linux-2.6.32.11/fs/ext3/balloc.c 30731diff -urNp linux-2.6.32.12/fs/ext2/xattr.c linux-2.6.32.12/fs/ext2/xattr.c
30276--- linux-2.6.32.11/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400 30732--- linux-2.6.32.12/fs/ext2/xattr.c 2010-03-15 11:52:04.000000000 -0400
30277+++ linux-2.6.32.11/fs/ext3/balloc.c 2010-04-04 20:46:41.645781188 -0400 30733+++ linux-2.6.32.12/fs/ext2/xattr.c 2010-04-29 17:46:37.253252101 -0400
30734@@ -85,8 +85,8 @@
30735 printk("\n"); \
30736 } while (0)
30737 #else
30738-# define ea_idebug(f...)
30739-# define ea_bdebug(f...)
30740+# define ea_idebug(inode, f...) do {} while (0)
30741+# define ea_bdebug(bh, f...) do {} while (0)
30742 #endif
30743
30744 static int ext2_xattr_set2(struct inode *, struct buffer_head *,
30745diff -urNp linux-2.6.32.12/fs/ext3/balloc.c linux-2.6.32.12/fs/ext3/balloc.c
30746--- linux-2.6.32.12/fs/ext3/balloc.c 2010-03-15 11:52:04.000000000 -0400
30747+++ linux-2.6.32.12/fs/ext3/balloc.c 2010-04-04 20:46:41.645781188 -0400
30278@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e 30748@@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e
30279 30749
30280 free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); 30750 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
30284 sbi->s_resuid != current_fsuid() && 30754 sbi->s_resuid != current_fsuid() &&
30285 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { 30755 (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
30286 return 0; 30756 return 0;
30287diff -urNp linux-2.6.32.11/fs/ext3/namei.c linux-2.6.32.11/fs/ext3/namei.c 30757diff -urNp linux-2.6.32.12/fs/ext3/namei.c linux-2.6.32.12/fs/ext3/namei.c
30288--- linux-2.6.32.11/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400 30758--- linux-2.6.32.12/fs/ext3/namei.c 2010-03-15 11:52:04.000000000 -0400
30289+++ linux-2.6.32.11/fs/ext3/namei.c 2010-04-04 20:46:41.649500937 -0400 30759+++ linux-2.6.32.12/fs/ext3/namei.c 2010-04-04 20:46:41.649500937 -0400
30290@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split 30760@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split
30291 char *data1 = (*bh)->b_data, *data2; 30761 char *data1 = (*bh)->b_data, *data2;
30292 unsigned split, move, size; 30762 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
30296 30766
30297 bh2 = ext3_append (handle, dir, &newblock, &err); 30767 bh2 = ext3_append (handle, dir, &newblock, &err);
30298 if (!(bh2)) { 30768 if (!(bh2)) {
30299diff -urNp linux-2.6.32.11/fs/ext3/xattr.c linux-2.6.32.11/fs/ext3/xattr.c 30769diff -urNp linux-2.6.32.12/fs/ext3/xattr.c linux-2.6.32.12/fs/ext3/xattr.c
30300--- linux-2.6.32.11/fs/ext3/xattr.c 2010-03-15 11:52:04.000000000 -0400 30770--- linux-2.6.32.12/fs/ext3/xattr.c 2010-04-29 17:49:38.429034237 -0400
30301+++ linux-2.6.32.11/fs/ext3/xattr.c 2010-04-04 20:46:41.649500937 -0400 30771+++ linux-2.6.32.12/fs/ext3/xattr.c 2010-04-29 17:49:58.485032679 -0400
30302@@ -89,8 +89,8 @@ 30772@@ -89,8 +89,8 @@
30303 printk("\n"); \ 30773 printk("\n"); \
30304 } while (0) 30774 } 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
30310 #endif 30780 #endif
30311 30781
30312 static void ext3_xattr_cache_insert(struct buffer_head *); 30782 static void ext3_xattr_cache_insert(struct buffer_head *);
30313diff -urNp linux-2.6.32.11/fs/ext4/balloc.c linux-2.6.32.11/fs/ext4/balloc.c 30783diff -urNp linux-2.6.32.12/fs/ext4/balloc.c linux-2.6.32.12/fs/ext4/balloc.c
30314--- linux-2.6.32.11/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400 30784--- linux-2.6.32.12/fs/ext4/balloc.c 2010-03-15 11:52:04.000000000 -0400
30315+++ linux-2.6.32.11/fs/ext4/balloc.c 2010-04-04 20:46:41.649500937 -0400 30785+++ linux-2.6.32.12/fs/ext4/balloc.c 2010-04-04 20:46:41.649500937 -0400
30316@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ 30786@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_
30317 /* Hm, nope. Are (enough) root reserved blocks available? */ 30787 /* Hm, nope. Are (enough) root reserved blocks available? */
30318 if (sbi->s_resuid == current_fsuid() || 30788 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
30322 if (free_blocks >= (nblocks + dirty_blocks)) 30792 if (free_blocks >= (nblocks + dirty_blocks))
30323 return 1; 30793 return 1;
30324 } 30794 }
30325diff -urNp linux-2.6.32.11/fs/ext4/ioctl.c linux-2.6.32.11/fs/ext4/ioctl.c 30795diff -urNp linux-2.6.32.12/fs/ext4/ioctl.c linux-2.6.32.12/fs/ext4/ioctl.c
30326--- linux-2.6.32.11/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400 30796--- linux-2.6.32.12/fs/ext4/ioctl.c 2010-03-15 11:52:04.000000000 -0400
30327+++ linux-2.6.32.11/fs/ext4/ioctl.c 2010-04-04 20:46:41.649500937 -0400 30797+++ linux-2.6.32.12/fs/ext4/ioctl.c 2010-04-04 20:46:41.649500937 -0400
30328@@ -221,6 +221,9 @@ setversion_out: 30798@@ -221,6 +221,9 @@ setversion_out:
30329 struct file *donor_filp; 30799 struct file *donor_filp;
30330 int err; 30800 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
30335 if (!(filp->f_mode & FMODE_READ) || 30805 if (!(filp->f_mode & FMODE_READ) ||
30336 !(filp->f_mode & FMODE_WRITE)) 30806 !(filp->f_mode & FMODE_WRITE))
30337 return -EBADF; 30807 return -EBADF;
30338diff -urNp linux-2.6.32.11/fs/ext4/namei.c linux-2.6.32.11/fs/ext4/namei.c 30808diff -urNp linux-2.6.32.12/fs/ext4/namei.c linux-2.6.32.12/fs/ext4/namei.c
30339--- linux-2.6.32.11/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400 30809--- linux-2.6.32.12/fs/ext4/namei.c 2010-03-15 11:52:04.000000000 -0400
30340+++ linux-2.6.32.11/fs/ext4/namei.c 2010-04-04 20:46:41.649500937 -0400 30810+++ linux-2.6.32.12/fs/ext4/namei.c 2010-04-04 20:46:41.649500937 -0400
30341@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split 30811@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split
30342 char *data1 = (*bh)->b_data, *data2; 30812 char *data1 = (*bh)->b_data, *data2;
30343 unsigned split, move, size; 30813 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
30347 30817
30348 bh2 = ext4_append (handle, dir, &newblock, &err); 30818 bh2 = ext4_append (handle, dir, &newblock, &err);
30349 if (!(bh2)) { 30819 if (!(bh2)) {
30350diff -urNp linux-2.6.32.11/fs/ext4/super.c linux-2.6.32.11/fs/ext4/super.c 30820diff -urNp linux-2.6.32.12/fs/ext4/super.c linux-2.6.32.12/fs/ext4/super.c
30351--- linux-2.6.32.11/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400 30821--- linux-2.6.32.12/fs/ext4/super.c 2010-03-15 11:52:04.000000000 -0400
30352+++ linux-2.6.32.11/fs/ext4/super.c 2010-04-04 20:46:41.649500937 -0400 30822+++ linux-2.6.32.12/fs/ext4/super.c 2010-04-04 20:46:41.649500937 -0400
30353@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje 30823@@ -2276,7 +2276,7 @@ static void ext4_sb_release(struct kobje
30354 } 30824 }
30355 30825
@@ -30359,9 +30829,23 @@ diff -urNp linux-2.6.32.11/fs/ext4/super.c linux-2.6.32.11/fs/ext4/super.c
30359 .show = ext4_attr_show, 30829 .show = ext4_attr_show,
30360 .store = ext4_attr_store, 30830 .store = ext4_attr_store,
30361 }; 30831 };
30362diff -urNp linux-2.6.32.11/fs/fcntl.c linux-2.6.32.11/fs/fcntl.c 30832diff -urNp linux-2.6.32.12/fs/ext4/xattr.c linux-2.6.32.12/fs/ext4/xattr.c
30363--- linux-2.6.32.11/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400 30833--- linux-2.6.32.12/fs/ext4/xattr.c 2010-03-15 11:52:04.000000000 -0400
30364+++ linux-2.6.32.11/fs/fcntl.c 2010-04-04 20:46:41.649500937 -0400 30834+++ linux-2.6.32.12/fs/ext4/xattr.c 2010-04-29 17:46:37.279760502 -0400
30835@@ -82,8 +82,8 @@
30836 printk("\n"); \
30837 } while (0)
30838 #else
30839-# define ea_idebug(f...)
30840-# define ea_bdebug(f...)
30841+# define ea_idebug(inode, f...) do {} while (0)
30842+# define ea_bdebug(bh, f...) do {} while (0)
30843 #endif
30844
30845 static void ext4_xattr_cache_insert(struct buffer_head *);
30846diff -urNp linux-2.6.32.12/fs/fcntl.c linux-2.6.32.12/fs/fcntl.c
30847--- linux-2.6.32.12/fs/fcntl.c 2010-03-15 11:52:04.000000000 -0400
30848+++ linux-2.6.32.12/fs/fcntl.c 2010-04-04 20:46:41.649500937 -0400
30365@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in 30849@@ -344,6 +344,7 @@ static long do_fcntl(int fd, unsigned in
30366 switch (cmd) { 30850 switch (cmd) {
30367 case F_DUPFD: 30851 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
30380 rcu_read_unlock(); 30864 rcu_read_unlock();
30381 return ret; 30865 return ret;
30382 } 30866 }
30383diff -urNp linux-2.6.32.11/fs/fifo.c linux-2.6.32.11/fs/fifo.c 30867diff -urNp linux-2.6.32.12/fs/fifo.c linux-2.6.32.12/fs/fifo.c
30384--- linux-2.6.32.11/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400 30868--- linux-2.6.32.12/fs/fifo.c 2010-03-15 11:52:04.000000000 -0400
30385+++ linux-2.6.32.11/fs/fifo.c 2010-04-04 20:46:41.649500937 -0400 30869+++ linux-2.6.32.12/fs/fifo.c 2010-04-04 20:46:41.649500937 -0400
30386@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode 30870@@ -59,10 +59,10 @@ static int fifo_open(struct inode *inode
30387 */ 30871 */
30388 filp->f_op = &read_pipefifo_fops; 30872 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
30453 free_pipe_info(inode); 30937 free_pipe_info(inode);
30454 30938
30455 err_nocleanup: 30939 err_nocleanup:
30456diff -urNp linux-2.6.32.11/fs/file.c linux-2.6.32.11/fs/file.c 30940diff -urNp linux-2.6.32.12/fs/file.c linux-2.6.32.12/fs/file.c
30457--- linux-2.6.32.11/fs/file.c 2010-03-15 11:52:04.000000000 -0400 30941--- linux-2.6.32.12/fs/file.c 2010-03-15 11:52:04.000000000 -0400
30458+++ linux-2.6.32.11/fs/file.c 2010-04-04 20:46:41.649500937 -0400 30942+++ linux-2.6.32.12/fs/file.c 2010-04-04 20:46:41.649500937 -0400
30459@@ -14,6 +14,7 @@ 30943@@ -14,6 +14,7 @@
30460 #include <linux/slab.h> 30944 #include <linux/slab.h>
30461 #include <linux/vmalloc.h> 30945 #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
30473 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 30957 if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
30474 return -EMFILE; 30958 return -EMFILE;
30475 30959
30476diff -urNp linux-2.6.32.11/fs/fs_struct.c linux-2.6.32.11/fs/fs_struct.c 30960diff -urNp linux-2.6.32.12/fs/fs_struct.c linux-2.6.32.12/fs/fs_struct.c
30477--- linux-2.6.32.11/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400 30961--- linux-2.6.32.12/fs/fs_struct.c 2010-03-15 11:52:04.000000000 -0400
30478+++ linux-2.6.32.11/fs/fs_struct.c 2010-04-04 20:46:41.649500937 -0400 30962+++ linux-2.6.32.12/fs/fs_struct.c 2010-04-04 20:46:41.649500937 -0400
30479@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo 30963@@ -45,10 +45,12 @@ void chroot_fs_refs(struct path *old_roo
30480 struct task_struct *g, *p; 30964 struct task_struct *g, *p;
30481 struct fs_struct *fs; 30965 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
30580 31064
30581 task_unlock(current); 31065 task_unlock(current);
30582 if (kill) 31066 if (kill)
30583diff -urNp linux-2.6.32.11/fs/fuse/control.c linux-2.6.32.11/fs/fuse/control.c 31067diff -urNp linux-2.6.32.12/fs/fuse/control.c linux-2.6.32.12/fs/fuse/control.c
30584--- linux-2.6.32.11/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400 31068--- linux-2.6.32.12/fs/fuse/control.c 2010-03-15 11:52:04.000000000 -0400
30585+++ linux-2.6.32.11/fs/fuse/control.c 2010-04-04 20:46:41.649500937 -0400 31069+++ linux-2.6.32.12/fs/fuse/control.c 2010-04-04 20:46:41.649500937 -0400
30586@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co 31070@@ -293,7 +293,7 @@ void fuse_ctl_remove_conn(struct fuse_co
30587 31071
30588 static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) 31072 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
30592 struct fuse_conn *fc; 31076 struct fuse_conn *fc;
30593 int err; 31077 int err;
30594 31078
30595diff -urNp linux-2.6.32.11/fs/fuse/cuse.c linux-2.6.32.11/fs/fuse/cuse.c 31079diff -urNp linux-2.6.32.12/fs/fuse/cuse.c linux-2.6.32.12/fs/fuse/cuse.c
30596--- linux-2.6.32.11/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400 31080--- linux-2.6.32.12/fs/fuse/cuse.c 2010-03-15 11:52:04.000000000 -0400
30597+++ linux-2.6.32.11/fs/fuse/cuse.c 2010-04-04 20:46:41.649500937 -0400 31081+++ linux-2.6.32.12/fs/fuse/cuse.c 2010-04-04 20:46:41.649500937 -0400
30598@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i 31082@@ -528,8 +528,18 @@ static int cuse_channel_release(struct i
30599 return rc; 31083 return rc;
30600 } 31084 }
@@ -30629,9 +31113,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/cuse.c linux-2.6.32.11/fs/fuse/cuse.c
30629 cuse_class = class_create(THIS_MODULE, "cuse"); 31113 cuse_class = class_create(THIS_MODULE, "cuse");
30630 if (IS_ERR(cuse_class)) 31114 if (IS_ERR(cuse_class))
30631 return PTR_ERR(cuse_class); 31115 return PTR_ERR(cuse_class);
30632diff -urNp linux-2.6.32.11/fs/fuse/dev.c linux-2.6.32.11/fs/fuse/dev.c 31116diff -urNp linux-2.6.32.12/fs/fuse/dev.c linux-2.6.32.12/fs/fuse/dev.c
30633--- linux-2.6.32.11/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400 31117--- linux-2.6.32.12/fs/fuse/dev.c 2010-03-15 11:52:04.000000000 -0400
30634+++ linux-2.6.32.11/fs/fuse/dev.c 2010-04-04 20:46:41.649500937 -0400 31118+++ linux-2.6.32.12/fs/fuse/dev.c 2010-04-04 20:46:41.649500937 -0400
30635@@ -745,7 +745,7 @@ __releases(&fc->lock) 31119@@ -745,7 +745,7 @@ __releases(&fc->lock)
30636 * request_end(). Otherwise add it to the processing list, and set 31120 * request_end(). Otherwise add it to the processing list, and set
30637 * the 'sent' flag. 31121 * 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
30737 31221
30738 const struct file_operations fuse_dev_operations = { 31222 const struct file_operations fuse_dev_operations = {
30739 .owner = THIS_MODULE, 31223 .owner = THIS_MODULE,
30740diff -urNp linux-2.6.32.11/fs/fuse/dir.c linux-2.6.32.11/fs/fuse/dir.c 31224diff -urNp linux-2.6.32.12/fs/fuse/dir.c linux-2.6.32.12/fs/fuse/dir.c
30741--- linux-2.6.32.11/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400 31225--- linux-2.6.32.12/fs/fuse/dir.c 2010-03-15 11:52:04.000000000 -0400
30742+++ linux-2.6.32.11/fs/fuse/dir.c 2010-04-04 20:46:41.649500937 -0400 31226+++ linux-2.6.32.12/fs/fuse/dir.c 2010-04-04 20:46:41.649500937 -0400
30743@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de 31227@@ -1127,7 +1127,7 @@ static char *read_link(struct dentry *de
30744 return link; 31228 return link;
30745 } 31229 }
@@ -30749,9 +31233,9 @@ diff -urNp linux-2.6.32.11/fs/fuse/dir.c linux-2.6.32.11/fs/fuse/dir.c
30749 { 31233 {
30750 if (!IS_ERR(link)) 31234 if (!IS_ERR(link))
30751 free_page((unsigned long) link); 31235 free_page((unsigned long) link);
30752diff -urNp linux-2.6.32.11/fs/fuse/fuse_i.h linux-2.6.32.11/fs/fuse/fuse_i.h 31236diff -urNp linux-2.6.32.12/fs/fuse/fuse_i.h linux-2.6.32.12/fs/fuse/fuse_i.h
30753--- linux-2.6.32.11/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400 31237--- linux-2.6.32.12/fs/fuse/fuse_i.h 2010-03-15 11:52:04.000000000 -0400
30754+++ linux-2.6.32.11/fs/fuse/fuse_i.h 2010-04-04 20:46:41.649500937 -0400 31238+++ linux-2.6.32.12/fs/fuse/fuse_i.h 2010-04-04 20:46:41.649500937 -0400
30755@@ -521,6 +521,16 @@ extern const struct file_operations fuse 31239@@ -521,6 +521,16 @@ extern const struct file_operations fuse
30756 31240
30757 extern const struct dentry_operations fuse_dentry_operations; 31241 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
30769 /** 31253 /**
30770 * Inode to nodeid comparison. 31254 * Inode to nodeid comparison.
30771 */ 31255 */
30772diff -urNp linux-2.6.32.11/fs/gfs2/sys.c linux-2.6.32.11/fs/gfs2/sys.c 31256diff -urNp linux-2.6.32.12/fs/gfs2/sys.c linux-2.6.32.12/fs/gfs2/sys.c
30773--- linux-2.6.32.11/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400 31257--- linux-2.6.32.12/fs/gfs2/sys.c 2010-03-15 11:52:04.000000000 -0400
30774+++ linux-2.6.32.11/fs/gfs2/sys.c 2010-04-04 20:46:41.649500937 -0400 31258+++ linux-2.6.32.12/fs/gfs2/sys.c 2010-04-04 20:46:41.649500937 -0400
30775@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko 31259@@ -49,7 +49,7 @@ static ssize_t gfs2_attr_store(struct ko
30776 return a->store ? a->store(sdp, buf, len) : len; 31260 return a->store ? a->store(sdp, buf, len) : len;
30777 } 31261 }
@@ -30790,9 +31274,9 @@ diff -urNp linux-2.6.32.11/fs/gfs2/sys.c linux-2.6.32.11/fs/gfs2/sys.c
30790 .uevent = gfs2_uevent, 31274 .uevent = gfs2_uevent,
30791 }; 31275 };
30792 31276
30793diff -urNp linux-2.6.32.11/fs/hfs/inode.c linux-2.6.32.11/fs/hfs/inode.c 31277diff -urNp linux-2.6.32.12/fs/hfs/inode.c linux-2.6.32.12/fs/hfs/inode.c
30794--- linux-2.6.32.11/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400 31278--- linux-2.6.32.12/fs/hfs/inode.c 2010-03-15 11:52:04.000000000 -0400
30795+++ linux-2.6.32.11/fs/hfs/inode.c 2010-04-04 20:46:41.653544810 -0400 31279+++ linux-2.6.32.12/fs/hfs/inode.c 2010-04-04 20:46:41.653544810 -0400
30796@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, 31280@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode,
30797 31281
30798 if (S_ISDIR(main_inode->i_mode)) { 31282 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
30811 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, 31295 hfs_bnode_read(fd.bnode, &rec, fd.entryoffset,
30812 sizeof(struct hfs_cat_file)); 31296 sizeof(struct hfs_cat_file));
30813 if (rec.type != HFS_CDR_FIL || 31297 if (rec.type != HFS_CDR_FIL ||
30814diff -urNp linux-2.6.32.11/fs/hfsplus/inode.c linux-2.6.32.11/fs/hfsplus/inode.c 31298diff -urNp linux-2.6.32.12/fs/hfsplus/inode.c linux-2.6.32.12/fs/hfsplus/inode.c
30815--- linux-2.6.32.11/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400 31299--- linux-2.6.32.12/fs/hfsplus/inode.c 2010-03-15 11:52:04.000000000 -0400
30816+++ linux-2.6.32.11/fs/hfsplus/inode.c 2010-04-04 20:46:41.653544810 -0400 31300+++ linux-2.6.32.12/fs/hfsplus/inode.c 2010-04-04 20:46:41.653544810 -0400
30817@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode 31301@@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode
30818 struct hfsplus_cat_folder *folder = &entry.folder; 31302 struct hfsplus_cat_folder *folder = &entry.folder;
30819 31303
@@ -30850,9 +31334,9 @@ diff -urNp linux-2.6.32.11/fs/hfsplus/inode.c linux-2.6.32.11/fs/hfsplus/inode.c
30850 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, 31334 hfs_bnode_read(fd.bnode, &entry, fd.entryoffset,
30851 sizeof(struct hfsplus_cat_file)); 31335 sizeof(struct hfsplus_cat_file));
30852 hfsplus_inode_write_fork(inode, &file->data_fork); 31336 hfsplus_inode_write_fork(inode, &file->data_fork);
30853diff -urNp linux-2.6.32.11/fs/hugetlbfs/inode.c linux-2.6.32.11/fs/hugetlbfs/inode.c 31337diff -urNp linux-2.6.32.12/fs/hugetlbfs/inode.c linux-2.6.32.12/fs/hugetlbfs/inode.c
30854--- linux-2.6.32.11/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400 31338--- linux-2.6.32.12/fs/hugetlbfs/inode.c 2010-03-15 11:52:04.000000000 -0400
30855+++ linux-2.6.32.11/fs/hugetlbfs/inode.c 2010-04-06 22:13:08.677504702 -0400 31339+++ linux-2.6.32.12/fs/hugetlbfs/inode.c 2010-04-06 22:13:08.677504702 -0400
30856@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs 31340@@ -909,7 +909,7 @@ static struct file_system_type hugetlbfs
30857 .kill_sb = kill_litter_super, 31341 .kill_sb = kill_litter_super,
30858 }; 31342 };
@@ -30862,9 +31346,9 @@ diff -urNp linux-2.6.32.11/fs/hugetlbfs/inode.c linux-2.6.32.11/fs/hugetlbfs/ino
30862 31346
30863 static int can_do_hugetlb_shm(void) 31347 static int can_do_hugetlb_shm(void)
30864 { 31348 {
30865diff -urNp linux-2.6.32.11/fs/ioctl.c linux-2.6.32.11/fs/ioctl.c 31349diff -urNp linux-2.6.32.12/fs/ioctl.c linux-2.6.32.12/fs/ioctl.c
30866--- linux-2.6.32.11/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400 31350--- linux-2.6.32.12/fs/ioctl.c 2010-03-15 11:52:04.000000000 -0400
30867+++ linux-2.6.32.11/fs/ioctl.c 2010-04-04 20:46:41.653544810 -0400 31351+++ linux-2.6.32.12/fs/ioctl.c 2010-04-04 20:46:41.653544810 -0400
30868@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema 31352@@ -97,7 +97,7 @@ int fiemap_fill_next_extent(struct fiema
30869 u64 phys, u64 len, u32 flags) 31353 u64 phys, u64 len, u32 flags)
30870 { 31354 {
@@ -30892,9 +31376,9 @@ diff -urNp linux-2.6.32.11/fs/ioctl.c linux-2.6.32.11/fs/ioctl.c
30892 error = -EFAULT; 31376 error = -EFAULT;
30893 31377
30894 return error; 31378 return error;
30895diff -urNp linux-2.6.32.11/fs/jffs2/debug.h linux-2.6.32.11/fs/jffs2/debug.h 31379diff -urNp linux-2.6.32.12/fs/jffs2/debug.h linux-2.6.32.12/fs/jffs2/debug.h
30896--- linux-2.6.32.11/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400 31380--- linux-2.6.32.12/fs/jffs2/debug.h 2010-03-15 11:52:04.000000000 -0400
30897+++ linux-2.6.32.11/fs/jffs2/debug.h 2010-04-04 20:46:41.653544810 -0400 31381+++ linux-2.6.32.12/fs/jffs2/debug.h 2010-04-04 20:46:41.653544810 -0400
30898@@ -52,13 +52,13 @@ 31382@@ -52,13 +52,13 @@
30899 #if CONFIG_JFFS2_FS_DEBUG > 0 31383 #if CONFIG_JFFS2_FS_DEBUG > 0
30900 #define D1(x) x 31384 #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
30996 #endif 31480 #endif
30997 31481
30998 /* "Sanity" checks */ 31482 /* "Sanity" checks */
30999diff -urNp linux-2.6.32.11/fs/jffs2/erase.c linux-2.6.32.11/fs/jffs2/erase.c 31483diff -urNp linux-2.6.32.12/fs/jffs2/erase.c linux-2.6.32.12/fs/jffs2/erase.c
31000--- linux-2.6.32.11/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400 31484--- linux-2.6.32.12/fs/jffs2/erase.c 2010-03-15 11:52:04.000000000 -0400
31001+++ linux-2.6.32.11/fs/jffs2/erase.c 2010-04-04 20:46:41.653544810 -0400 31485+++ linux-2.6.32.12/fs/jffs2/erase.c 2010-04-04 20:46:41.653544810 -0400
31002@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru 31486@@ -434,7 +434,8 @@ static void jffs2_mark_erased_block(stru
31003 struct jffs2_unknown_node marker = { 31487 struct jffs2_unknown_node marker = {
31004 .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), 31488 .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
31009 }; 31493 };
31010 31494
31011 jffs2_prealloc_raw_node_refs(c, jeb, 1); 31495 jffs2_prealloc_raw_node_refs(c, jeb, 1);
31012diff -urNp linux-2.6.32.11/fs/jffs2/summary.h linux-2.6.32.11/fs/jffs2/summary.h 31496diff -urNp linux-2.6.32.12/fs/jffs2/summary.h linux-2.6.32.12/fs/jffs2/summary.h
31013--- linux-2.6.32.11/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400 31497--- linux-2.6.32.12/fs/jffs2/summary.h 2010-03-15 11:52:04.000000000 -0400
31014+++ linux-2.6.32.11/fs/jffs2/summary.h 2010-04-04 20:46:41.653544810 -0400 31498+++ linux-2.6.32.12/fs/jffs2/summary.h 2010-04-04 20:46:41.653544810 -0400
31015@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ 31499@@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_
31016 31500
31017 #define jffs2_sum_active() (0) 31501 #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
31040 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) 31524 #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0)
31041 31525
31042 #endif /* CONFIG_JFFS2_SUMMARY */ 31526 #endif /* CONFIG_JFFS2_SUMMARY */
31043diff -urNp linux-2.6.32.11/fs/jffs2/wbuf.c linux-2.6.32.11/fs/jffs2/wbuf.c 31527diff -urNp linux-2.6.32.12/fs/jffs2/wbuf.c linux-2.6.32.12/fs/jffs2/wbuf.c
31044--- linux-2.6.32.11/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400 31528--- linux-2.6.32.12/fs/jffs2/wbuf.c 2010-03-15 11:52:04.000000000 -0400
31045+++ linux-2.6.32.11/fs/jffs2/wbuf.c 2010-04-04 20:46:41.653544810 -0400 31529+++ linux-2.6.32.12/fs/jffs2/wbuf.c 2010-04-04 20:46:41.653544810 -0400
31046@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o 31530@@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
31047 { 31531 {
31048 .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), 31532 .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
31053 }; 31537 };
31054 31538
31055 /* 31539 /*
31056diff -urNp linux-2.6.32.11/fs/lockd/svc.c linux-2.6.32.11/fs/lockd/svc.c 31540diff -urNp linux-2.6.32.12/fs/lockd/svc.c linux-2.6.32.12/fs/lockd/svc.c
31057--- linux-2.6.32.11/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400 31541--- linux-2.6.32.12/fs/lockd/svc.c 2010-03-15 11:52:04.000000000 -0400
31058+++ linux-2.6.32.11/fs/lockd/svc.c 2010-04-04 20:46:41.653544810 -0400 31542+++ linux-2.6.32.12/fs/lockd/svc.c 2010-04-04 20:46:41.653544810 -0400
31059@@ -43,7 +43,7 @@ 31543@@ -43,7 +43,7 @@
31060 31544
31061 static struct svc_program nlmsvc_program; 31545 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
31065 EXPORT_SYMBOL_GPL(nlmsvc_ops); 31549 EXPORT_SYMBOL_GPL(nlmsvc_ops);
31066 31550
31067 static DEFINE_MUTEX(nlmsvc_mutex); 31551 static DEFINE_MUTEX(nlmsvc_mutex);
31068diff -urNp linux-2.6.32.11/fs/locks.c linux-2.6.32.11/fs/locks.c 31552diff -urNp linux-2.6.32.12/fs/locks.c linux-2.6.32.12/fs/locks.c
31069--- linux-2.6.32.11/fs/locks.c 2010-03-15 11:52:04.000000000 -0400 31553--- linux-2.6.32.12/fs/locks.c 2010-03-15 11:52:04.000000000 -0400
31070+++ linux-2.6.32.11/fs/locks.c 2010-04-04 20:46:41.653544810 -0400 31554+++ linux-2.6.32.12/fs/locks.c 2010-04-04 20:46:41.653544810 -0400
31071@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil 31555@@ -2007,16 +2007,16 @@ void locks_remove_flock(struct file *fil
31072 return; 31556 return;
31073 31557
@@ -31089,9 +31573,9 @@ diff -urNp linux-2.6.32.11/fs/locks.c linux-2.6.32.11/fs/locks.c
31089 } 31573 }
31090 31574
31091 lock_kernel(); 31575 lock_kernel();
31092diff -urNp linux-2.6.32.11/fs/namei.c linux-2.6.32.11/fs/namei.c 31576diff -urNp linux-2.6.32.12/fs/namei.c linux-2.6.32.12/fs/namei.c
31093--- linux-2.6.32.11/fs/namei.c 2010-03-15 11:52:04.000000000 -0400 31577--- linux-2.6.32.12/fs/namei.c 2010-03-15 11:52:04.000000000 -0400
31094+++ linux-2.6.32.11/fs/namei.c 2010-04-04 20:46:41.653544810 -0400 31578+++ linux-2.6.32.12/fs/namei.c 2010-04-04 20:46:41.653544810 -0400
31095@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l 31579@@ -638,7 +638,7 @@ static __always_inline int __do_follow_l
31096 cookie = dentry->d_inode->i_op->follow_link(dentry, nd); 31580 cookie = dentry->d_inode->i_op->follow_link(dentry, nd);
31097 error = PTR_ERR(cookie); 31581 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
31418 exit6: 31902 exit6:
31419 mnt_drop_write(oldnd.path.mnt); 31903 mnt_drop_write(oldnd.path.mnt);
31420 exit5: 31904 exit5:
31421diff -urNp linux-2.6.32.11/fs/namespace.c linux-2.6.32.11/fs/namespace.c 31905diff -urNp linux-2.6.32.12/fs/namespace.c linux-2.6.32.12/fs/namespace.c
31422--- linux-2.6.32.11/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400 31906--- linux-2.6.32.12/fs/namespace.c 2010-03-15 11:52:04.000000000 -0400
31423+++ linux-2.6.32.11/fs/namespace.c 2010-04-04 20:46:41.653544810 -0400 31907+++ linux-2.6.32.12/fs/namespace.c 2010-04-04 20:46:41.653544810 -0400
31424@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn 31908@@ -1083,6 +1083,9 @@ static int do_umount(struct vfsmount *mn
31425 if (!(sb->s_flags & MS_RDONLY)) 31909 if (!(sb->s_flags & MS_RDONLY))
31426 retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); 31910 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
31481 read_lock(&current->fs->lock); 31965 read_lock(&current->fs->lock);
31482 root = current->fs->root; 31966 root = current->fs->root;
31483 path_get(&current->fs->root); 31967 path_get(&current->fs->root);
31484diff -urNp linux-2.6.32.11/fs/nfs/inode.c linux-2.6.32.11/fs/nfs/inode.c 31968diff -urNp linux-2.6.32.12/fs/nfs/inode.c linux-2.6.32.12/fs/nfs/inode.c
31485--- linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400 31969--- linux-2.6.32.12/fs/nfs/inode.c 2010-04-04 20:41:50.045778117 -0400
31486+++ linux-2.6.32.11/fs/nfs/inode.c 2010-04-04 20:46:41.653544810 -0400 31970+++ linux-2.6.32.12/fs/nfs/inode.c 2010-04-04 20:46:41.653544810 -0400
31487@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st 31971@@ -965,16 +965,16 @@ static int nfs_size_need_update(const st
31488 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode); 31972 return nfs_size_to_loff_t(fattr->size) > i_size_read(inode);
31489 } 31973 }
@@ -31504,9 +31988,9 @@ diff -urNp linux-2.6.32.11/fs/nfs/inode.c linux-2.6.32.11/fs/nfs/inode.c
31504 } 31988 }
31505 31989
31506 void nfs_fattr_init(struct nfs_fattr *fattr) 31990 void nfs_fattr_init(struct nfs_fattr *fattr)
31507diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c 31991diff -urNp linux-2.6.32.12/fs/nfs/nfs4proc.c linux-2.6.32.12/fs/nfs/nfs4proc.c
31508--- linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-03-15 11:52:04.000000000 -0400 31992--- linux-2.6.32.12/fs/nfs/nfs4proc.c 2010-04-29 17:49:38.445067399 -0400
31509+++ linux-2.6.32.11/fs/nfs/nfs4proc.c 2010-04-04 20:46:41.653544810 -0400 31993+++ linux-2.6.32.12/fs/nfs/nfs4proc.c 2010-04-29 17:49:58.597031543 -0400
31510@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct 31994@@ -1131,7 +1131,7 @@ static int _nfs4_do_open_reclaim(struct
31511 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) 31995 static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state)
31512 { 31996 {
@@ -31525,7 +32009,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31525 struct nfs_server *server = NFS_SERVER(state->inode); 32009 struct nfs_server *server = NFS_SERVER(state->inode);
31526 int err; 32010 int err;
31527 do { 32011 do {
31528@@ -1491,7 +1491,7 @@ static int _nfs4_open_expired(struct nfs 32012@@ -1493,7 +1493,7 @@ static int _nfs4_open_expired(struct nfs
31529 static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state) 32013 static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state)
31530 { 32014 {
31531 struct nfs_server *server = NFS_SERVER(state->inode); 32015 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
31534 int err; 32018 int err;
31535 32019
31536 do { 32020 do {
31537@@ -1591,7 +1591,7 @@ out_err: 32021@@ -1593,7 +1593,7 @@ out_err:
31538 32022
31539 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) 32023 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)
31540 { 32024 {
@@ -31543,7 +32027,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31543 struct nfs4_state *res; 32027 struct nfs4_state *res;
31544 int status; 32028 int status;
31545 32029
31546@@ -1682,7 +1682,7 @@ static int nfs4_do_setattr(struct inode 32030@@ -1684,7 +1684,7 @@ static int nfs4_do_setattr(struct inode
31547 struct nfs4_state *state) 32031 struct nfs4_state *state)
31548 { 32032 {
31549 struct nfs_server *server = NFS_SERVER(inode); 32033 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
31552 int err; 32036 int err;
31553 do { 32037 do {
31554 err = nfs4_handle_exception(server, 32038 err = nfs4_handle_exception(server,
31555@@ -2048,7 +2048,7 @@ static int _nfs4_server_capabilities(str 32039@@ -2050,7 +2050,7 @@ static int _nfs4_server_capabilities(str
31556 32040
31557 int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) 32041 int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle)
31558 { 32042 {
@@ -31561,7 +32045,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31561 int err; 32045 int err;
31562 do { 32046 do {
31563 err = nfs4_handle_exception(server, 32047 err = nfs4_handle_exception(server,
31564@@ -2082,7 +2082,7 @@ static int _nfs4_lookup_root(struct nfs_ 32048@@ -2084,7 +2084,7 @@ static int _nfs4_lookup_root(struct nfs_
31565 static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, 32049 static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle,
31566 struct nfs_fsinfo *info) 32050 struct nfs_fsinfo *info)
31567 { 32051 {
@@ -31570,7 +32054,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31570 int err; 32054 int err;
31571 do { 32055 do {
31572 err = nfs4_handle_exception(server, 32056 err = nfs4_handle_exception(server,
31573@@ -2171,7 +2171,7 @@ static int _nfs4_proc_getattr(struct nfs 32057@@ -2173,7 +2173,7 @@ static int _nfs4_proc_getattr(struct nfs
31574 32058
31575 static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) 32059 static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
31576 { 32060 {
@@ -31579,7 +32063,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31579 int err; 32063 int err;
31580 do { 32064 do {
31581 err = nfs4_handle_exception(server, 32065 err = nfs4_handle_exception(server,
31582@@ -2259,7 +2259,7 @@ static int nfs4_proc_lookupfh(struct nfs 32066@@ -2261,7 +2261,7 @@ static int nfs4_proc_lookupfh(struct nfs
31583 struct qstr *name, struct nfs_fh *fhandle, 32067 struct qstr *name, struct nfs_fh *fhandle,
31584 struct nfs_fattr *fattr) 32068 struct nfs_fattr *fattr)
31585 { 32069 {
@@ -31588,7 +32072,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31588 int err; 32072 int err;
31589 do { 32073 do {
31590 err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); 32074 err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr);
31591@@ -2288,7 +2288,7 @@ static int _nfs4_proc_lookup(struct inod 32075@@ -2290,7 +2290,7 @@ static int _nfs4_proc_lookup(struct inod
31592 32076
31593 static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) 32077 static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr)
31594 { 32078 {
@@ -31597,7 +32081,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31597 int err; 32081 int err;
31598 do { 32082 do {
31599 err = nfs4_handle_exception(NFS_SERVER(dir), 32083 err = nfs4_handle_exception(NFS_SERVER(dir),
31600@@ -2352,7 +2352,7 @@ static int _nfs4_proc_access(struct inod 32084@@ -2354,7 +2354,7 @@ static int _nfs4_proc_access(struct inod
31601 32085
31602 static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) 32086 static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry)
31603 { 32087 {
@@ -31606,7 +32090,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31606 int err; 32090 int err;
31607 do { 32091 do {
31608 err = nfs4_handle_exception(NFS_SERVER(inode), 32092 err = nfs4_handle_exception(NFS_SERVER(inode),
31609@@ -2408,7 +2408,7 @@ static int _nfs4_proc_readlink(struct in 32093@@ -2410,7 +2410,7 @@ static int _nfs4_proc_readlink(struct in
31610 static int nfs4_proc_readlink(struct inode *inode, struct page *page, 32094 static int nfs4_proc_readlink(struct inode *inode, struct page *page,
31611 unsigned int pgbase, unsigned int pglen) 32095 unsigned int pgbase, unsigned int pglen)
31612 { 32096 {
@@ -31615,7 +32099,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31615 int err; 32099 int err;
31616 do { 32100 do {
31617 err = nfs4_handle_exception(NFS_SERVER(inode), 32101 err = nfs4_handle_exception(NFS_SERVER(inode),
31618@@ -2506,7 +2506,7 @@ static int _nfs4_proc_remove(struct inod 32102@@ -2508,7 +2508,7 @@ static int _nfs4_proc_remove(struct inod
31619 32103
31620 static int nfs4_proc_remove(struct inode *dir, struct qstr *name) 32104 static int nfs4_proc_remove(struct inode *dir, struct qstr *name)
31621 { 32105 {
@@ -31624,7 +32108,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31624 int err; 32108 int err;
31625 do { 32109 do {
31626 err = nfs4_handle_exception(NFS_SERVER(dir), 32110 err = nfs4_handle_exception(NFS_SERVER(dir),
31627@@ -2580,7 +2580,7 @@ static int _nfs4_proc_rename(struct inod 32111@@ -2582,7 +2582,7 @@ static int _nfs4_proc_rename(struct inod
31628 static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, 32112 static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name,
31629 struct inode *new_dir, struct qstr *new_name) 32113 struct inode *new_dir, struct qstr *new_name)
31630 { 32114 {
@@ -31633,7 +32117,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31633 int err; 32117 int err;
31634 do { 32118 do {
31635 err = nfs4_handle_exception(NFS_SERVER(old_dir), 32119 err = nfs4_handle_exception(NFS_SERVER(old_dir),
31636@@ -2627,7 +2627,7 @@ static int _nfs4_proc_link(struct inode 32120@@ -2629,7 +2629,7 @@ static int _nfs4_proc_link(struct inode
31637 32121
31638 static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) 32122 static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name)
31639 { 32123 {
@@ -31642,7 +32126,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31642 int err; 32126 int err;
31643 do { 32127 do {
31644 err = nfs4_handle_exception(NFS_SERVER(inode), 32128 err = nfs4_handle_exception(NFS_SERVER(inode),
31645@@ -2719,7 +2719,7 @@ out: 32129@@ -2721,7 +2721,7 @@ out:
31646 static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, 32130 static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry,
31647 struct page *page, unsigned int len, struct iattr *sattr) 32131 struct page *page, unsigned int len, struct iattr *sattr)
31648 { 32132 {
@@ -31651,7 +32135,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31651 int err; 32135 int err;
31652 do { 32136 do {
31653 err = nfs4_handle_exception(NFS_SERVER(dir), 32137 err = nfs4_handle_exception(NFS_SERVER(dir),
31654@@ -2750,7 +2750,7 @@ out: 32138@@ -2752,7 +2752,7 @@ out:
31655 static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, 32139 static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry,
31656 struct iattr *sattr) 32140 struct iattr *sattr)
31657 { 32141 {
@@ -31660,7 +32144,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31660 int err; 32144 int err;
31661 do { 32145 do {
31662 err = nfs4_handle_exception(NFS_SERVER(dir), 32146 err = nfs4_handle_exception(NFS_SERVER(dir),
31663@@ -2799,7 +2799,7 @@ static int _nfs4_proc_readdir(struct den 32147@@ -2801,7 +2801,7 @@ static int _nfs4_proc_readdir(struct den
31664 static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, 32148 static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred,
31665 u64 cookie, struct page *page, unsigned int count, int plus) 32149 u64 cookie, struct page *page, unsigned int count, int plus)
31666 { 32150 {
@@ -31669,7 +32153,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31669 int err; 32153 int err;
31670 do { 32154 do {
31671 err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), 32155 err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode),
31672@@ -2847,7 +2847,7 @@ out: 32156@@ -2849,7 +2849,7 @@ out:
31673 static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, 32157 static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry,
31674 struct iattr *sattr, dev_t rdev) 32158 struct iattr *sattr, dev_t rdev)
31675 { 32159 {
@@ -31678,7 +32162,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31678 int err; 32162 int err;
31679 do { 32163 do {
31680 err = nfs4_handle_exception(NFS_SERVER(dir), 32164 err = nfs4_handle_exception(NFS_SERVER(dir),
31681@@ -2879,7 +2879,7 @@ static int _nfs4_proc_statfs(struct nfs_ 32165@@ -2881,7 +2881,7 @@ static int _nfs4_proc_statfs(struct nfs_
31682 32166
31683 static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) 32167 static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat)
31684 { 32168 {
@@ -31687,7 +32171,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31687 int err; 32171 int err;
31688 do { 32172 do {
31689 err = nfs4_handle_exception(server, 32173 err = nfs4_handle_exception(server,
31690@@ -2910,7 +2910,7 @@ static int _nfs4_do_fsinfo(struct nfs_se 32174@@ -2912,7 +2912,7 @@ static int _nfs4_do_fsinfo(struct nfs_se
31691 32175
31692 static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) 32176 static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo)
31693 { 32177 {
@@ -31696,7 +32180,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31696 int err; 32180 int err;
31697 32181
31698 do { 32182 do {
31699@@ -2956,7 +2956,7 @@ static int _nfs4_proc_pathconf(struct nf 32183@@ -2958,7 +2958,7 @@ static int _nfs4_proc_pathconf(struct nf
31700 static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, 32184 static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle,
31701 struct nfs_pathconf *pathconf) 32185 struct nfs_pathconf *pathconf)
31702 { 32186 {
@@ -31705,7 +32189,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31705 int err; 32189 int err;
31706 32190
31707 do { 32191 do {
31708@@ -3255,7 +3255,7 @@ out_free: 32192@@ -3257,7 +3257,7 @@ out_free:
31709 32193
31710 static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) 32194 static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen)
31711 { 32195 {
@@ -31714,7 +32198,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31714 ssize_t ret; 32198 ssize_t ret;
31715 do { 32199 do {
31716 ret = __nfs4_get_acl_uncached(inode, buf, buflen); 32200 ret = __nfs4_get_acl_uncached(inode, buf, buflen);
31717@@ -3311,7 +3311,7 @@ static int __nfs4_proc_set_acl(struct in 32201@@ -3313,7 +3313,7 @@ static int __nfs4_proc_set_acl(struct in
31718 32202
31719 static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) 32203 static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen)
31720 { 32204 {
@@ -31723,7 +32207,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31723 int err; 32207 int err;
31724 do { 32208 do {
31725 err = nfs4_handle_exception(NFS_SERVER(inode), 32209 err = nfs4_handle_exception(NFS_SERVER(inode),
31726@@ -3576,7 +3576,7 @@ out: 32210@@ -3578,7 +3578,7 @@ out:
31727 int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) 32211 int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync)
31728 { 32212 {
31729 struct nfs_server *server = NFS_SERVER(inode); 32213 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
31732 int err; 32216 int err;
31733 do { 32217 do {
31734 err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); 32218 err = _nfs4_proc_delegreturn(inode, cred, stateid, issync);
31735@@ -3649,7 +3649,7 @@ out: 32219@@ -3651,7 +3651,7 @@ out:
31736 32220
31737 static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) 32221 static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request)
31738 { 32222 {
@@ -31741,7 +32225,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31741 int err; 32225 int err;
31742 32226
31743 do { 32227 do {
31744@@ -4042,7 +4042,7 @@ static int _nfs4_do_setlk(struct nfs4_st 32228@@ -4044,7 +4044,7 @@ static int _nfs4_do_setlk(struct nfs4_st
31745 static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) 32229 static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request)
31746 { 32230 {
31747 struct nfs_server *server = NFS_SERVER(state->inode); 32231 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
31750 int err; 32234 int err;
31751 32235
31752 do { 32236 do {
31753@@ -4060,7 +4060,7 @@ static int nfs4_lock_reclaim(struct nfs4 32237@@ -4062,7 +4062,7 @@ static int nfs4_lock_reclaim(struct nfs4
31754 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) 32238 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request)
31755 { 32239 {
31756 struct nfs_server *server = NFS_SERVER(state->inode); 32240 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
31759 int err; 32243 int err;
31760 32244
31761 err = nfs4_set_lock_state(state, request); 32245 err = nfs4_set_lock_state(state, request);
31762@@ -4118,7 +4118,7 @@ out: 32246@@ -4120,7 +4120,7 @@ out:
31763 32247
31764 static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) 32248 static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request)
31765 { 32249 {
@@ -31768,7 +32252,7 @@ diff -urNp linux-2.6.32.11/fs/nfs/nfs4proc.c linux-2.6.32.11/fs/nfs/nfs4proc.c
31768 int err; 32252 int err;
31769 32253
31770 do { 32254 do {
31771@@ -4178,7 +4178,7 @@ nfs4_proc_lock(struct file *filp, int cm 32255@@ -4180,7 +4180,7 @@ nfs4_proc_lock(struct file *filp, int cm
31772 int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) 32256 int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl)
31773 { 32257 {
31774 struct nfs_server *server = NFS_SERVER(state->inode); 32258 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
31777 int err; 32261 int err;
31778 32262
31779 err = nfs4_set_lock_state(state, fl); 32263 err = nfs4_set_lock_state(state, fl);
31780diff -urNp linux-2.6.32.11/fs/nfsd/lockd.c linux-2.6.32.11/fs/nfsd/lockd.c 32264diff -urNp linux-2.6.32.12/fs/nfsd/lockd.c linux-2.6.32.12/fs/nfsd/lockd.c
31781--- linux-2.6.32.11/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400 32265--- linux-2.6.32.12/fs/nfsd/lockd.c 2010-03-15 11:52:04.000000000 -0400
31782+++ linux-2.6.32.11/fs/nfsd/lockd.c 2010-04-04 20:46:41.653544810 -0400 32266+++ linux-2.6.32.12/fs/nfsd/lockd.c 2010-04-04 20:46:41.653544810 -0400
31783@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp) 32267@@ -67,7 +67,7 @@ nlm_fclose(struct file *filp)
31784 fput(filp); 32268 fput(filp);
31785 } 32269 }
@@ -31789,9 +32273,9 @@ diff -urNp linux-2.6.32.11/fs/nfsd/lockd.c linux-2.6.32.11/fs/nfsd/lockd.c
31789 .fopen = nlm_fopen, /* open file for locking */ 32273 .fopen = nlm_fopen, /* open file for locking */
31790 .fclose = nlm_fclose, /* close file */ 32274 .fclose = nlm_fclose, /* close file */
31791 }; 32275 };
31792diff -urNp linux-2.6.32.11/fs/nfsd/vfs.c linux-2.6.32.11/fs/nfsd/vfs.c 32276diff -urNp linux-2.6.32.12/fs/nfsd/vfs.c linux-2.6.32.12/fs/nfsd/vfs.c
31793--- linux-2.6.32.11/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400 32277--- linux-2.6.32.12/fs/nfsd/vfs.c 2010-03-15 11:52:04.000000000 -0400
31794+++ linux-2.6.32.11/fs/nfsd/vfs.c 2010-04-04 20:46:41.657782339 -0400 32278+++ linux-2.6.32.12/fs/nfsd/vfs.c 2010-04-04 20:46:41.657782339 -0400
31795@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st 32279@@ -937,7 +937,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
31796 } else { 32280 } else {
31797 oldfs = get_fs(); 32281 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
31819 set_fs(oldfs); 32303 set_fs(oldfs);
31820 32304
31821 if (host_err < 0) 32305 if (host_err < 0)
31822diff -urNp linux-2.6.32.11/fs/nls/nls_base.c linux-2.6.32.11/fs/nls/nls_base.c 32306diff -urNp linux-2.6.32.12/fs/nls/nls_base.c linux-2.6.32.12/fs/nls/nls_base.c
31823--- linux-2.6.32.11/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400 32307--- linux-2.6.32.12/fs/nls/nls_base.c 2010-03-15 11:52:04.000000000 -0400
31824+++ linux-2.6.32.11/fs/nls/nls_base.c 2010-04-04 20:46:41.657782339 -0400 32308+++ linux-2.6.32.12/fs/nls/nls_base.c 2010-04-04 20:46:41.657782339 -0400
31825@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl 32309@@ -41,7 +41,7 @@ static const struct utf8_table utf8_tabl
31826 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, 32310 {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */},
31827 {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, 32311 {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
31831 }; 32315 };
31832 32316
31833 #define UNICODE_MAX 0x0010ffff 32317 #define UNICODE_MAX 0x0010ffff
31834diff -urNp linux-2.6.32.11/fs/ntfs/file.c linux-2.6.32.11/fs/ntfs/file.c 32318diff -urNp linux-2.6.32.12/fs/ntfs/file.c linux-2.6.32.12/fs/ntfs/file.c
31835--- linux-2.6.32.11/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400 32319--- linux-2.6.32.12/fs/ntfs/file.c 2010-03-15 11:52:04.000000000 -0400
31836+++ linux-2.6.32.11/fs/ntfs/file.c 2010-04-04 20:46:41.657782339 -0400 32320+++ linux-2.6.32.12/fs/ntfs/file.c 2010-04-04 20:46:41.657782339 -0400
31837@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_ 32321@@ -2243,6 +2243,6 @@ const struct inode_operations ntfs_file_
31838 #endif /* NTFS_RW */ 32322 #endif /* NTFS_RW */
31839 }; 32323 };
@@ -31843,9 +32327,9 @@ diff -urNp linux-2.6.32.11/fs/ntfs/file.c linux-2.6.32.11/fs/ntfs/file.c
31843 32327
31844-const struct inode_operations ntfs_empty_inode_ops = {}; 32328-const struct inode_operations ntfs_empty_inode_ops = {};
31845+const struct inode_operations ntfs_empty_inode_ops __read_only; 32329+const struct inode_operations ntfs_empty_inode_ops __read_only;
31846diff -urNp linux-2.6.32.11/fs/ocfs2/cluster/masklog.c linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 32330diff -urNp linux-2.6.32.12/fs/ocfs2/cluster/masklog.c linux-2.6.32.12/fs/ocfs2/cluster/masklog.c
31847--- linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400 32331--- linux-2.6.32.12/fs/ocfs2/cluster/masklog.c 2010-03-15 11:52:04.000000000 -0400
31848+++ linux-2.6.32.11/fs/ocfs2/cluster/masklog.c 2010-04-04 20:46:41.657782339 -0400 32332+++ linux-2.6.32.12/fs/ocfs2/cluster/masklog.c 2010-04-04 20:46:41.657782339 -0400
31849@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject 32333@@ -135,7 +135,7 @@ static ssize_t mlog_store(struct kobject
31850 return mlog_mask_store(mlog_attr->mask, buf, count); 32334 return mlog_mask_store(mlog_attr->mask, buf, count);
31851 } 32335 }
@@ -31855,9 +32339,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/cluster/masklog.c linux-2.6.32.11/fs/ocfs2/c
31855 .show = mlog_show, 32339 .show = mlog_show,
31856 .store = mlog_store, 32340 .store = mlog_store,
31857 }; 32341 };
31858diff -urNp linux-2.6.32.11/fs/ocfs2/localalloc.c linux-2.6.32.11/fs/ocfs2/localalloc.c 32342diff -urNp linux-2.6.32.12/fs/ocfs2/localalloc.c linux-2.6.32.12/fs/ocfs2/localalloc.c
31859--- linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400 32343--- linux-2.6.32.12/fs/ocfs2/localalloc.c 2010-03-15 11:52:04.000000000 -0400
31860+++ linux-2.6.32.11/fs/ocfs2/localalloc.c 2010-04-04 20:46:41.657782339 -0400 32344+++ linux-2.6.32.12/fs/ocfs2/localalloc.c 2010-04-04 20:46:41.657782339 -0400
31861@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo 32345@@ -1188,7 +1188,7 @@ static int ocfs2_local_alloc_slide_windo
31862 goto bail; 32346 goto bail;
31863 } 32347 }
@@ -31867,9 +32351,9 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/localalloc.c linux-2.6.32.11/fs/ocfs2/locala
31867 32351
31868 status = 0; 32352 status = 0;
31869 bail: 32353 bail:
31870diff -urNp linux-2.6.32.11/fs/ocfs2/ocfs2.h linux-2.6.32.11/fs/ocfs2/ocfs2.h 32354diff -urNp linux-2.6.32.12/fs/ocfs2/ocfs2.h linux-2.6.32.12/fs/ocfs2/ocfs2.h
31871--- linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400 32355--- linux-2.6.32.12/fs/ocfs2/ocfs2.h 2010-03-15 11:52:04.000000000 -0400
31872+++ linux-2.6.32.11/fs/ocfs2/ocfs2.h 2010-04-04 20:46:41.657782339 -0400 32356+++ linux-2.6.32.12/fs/ocfs2/ocfs2.h 2010-04-04 20:46:41.657782339 -0400
31873@@ -217,11 +217,11 @@ enum ocfs2_vol_state 32357@@ -217,11 +217,11 @@ enum ocfs2_vol_state
31874 32358
31875 struct ocfs2_alloc_stats 32359 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
31887 }; 32371 };
31888 32372
31889 enum ocfs2_local_alloc_state 32373 enum ocfs2_local_alloc_state
31890diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc.c 32374diff -urNp linux-2.6.32.12/fs/ocfs2/suballoc.c linux-2.6.32.12/fs/ocfs2/suballoc.c
31891--- linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-03-15 11:52:04.000000000 -0400 32375--- linux-2.6.32.12/fs/ocfs2/suballoc.c 2010-04-29 17:49:38.449086403 -0400
31892+++ linux-2.6.32.11/fs/ocfs2/suballoc.c 2010-04-04 20:46:41.657782339 -0400 32376+++ linux-2.6.32.12/fs/ocfs2/suballoc.c 2010-04-29 17:49:58.609026943 -0400
31893@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s 32377@@ -623,7 +623,7 @@ static int ocfs2_reserve_suballoc_bits(s
31894 mlog_errno(status); 32378 mlog_errno(status);
31895 goto bail; 32379 goto bail;
31896 } 32380 }
@@ -31899,7 +32383,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
31899 32383
31900 /* You should never ask for this much metadata */ 32384 /* You should never ask for this much metadata */
31901 BUG_ON(bits_wanted > 32385 BUG_ON(bits_wanted >
31902@@ -1651,7 +1651,7 @@ int ocfs2_claim_metadata(struct ocfs2_su 32386@@ -1654,7 +1654,7 @@ int ocfs2_claim_metadata(struct ocfs2_su
31903 mlog_errno(status); 32387 mlog_errno(status);
31904 goto bail; 32388 goto bail;
31905 } 32389 }
@@ -31908,7 +32392,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
31908 32392
31909 *blkno_start = bg_blkno + (u64) *suballoc_bit_start; 32393 *blkno_start = bg_blkno + (u64) *suballoc_bit_start;
31910 ac->ac_bits_given += (*num_bits); 32394 ac->ac_bits_given += (*num_bits);
31911@@ -1725,7 +1725,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s 32395@@ -1728,7 +1728,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s
31912 mlog_errno(status); 32396 mlog_errno(status);
31913 goto bail; 32397 goto bail;
31914 } 32398 }
@@ -31917,7 +32401,7 @@ diff -urNp linux-2.6.32.11/fs/ocfs2/suballoc.c linux-2.6.32.11/fs/ocfs2/suballoc
31917 32401
31918 BUG_ON(num_bits != 1); 32402 BUG_ON(num_bits != 1);
31919 32403
31920@@ -1827,7 +1827,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ 32404@@ -1830,7 +1830,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
31921 cluster_start, 32405 cluster_start,
31922 num_clusters); 32406 num_clusters);
31923 if (!status) 32407 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
31926 } else { 32410 } else {
31927 if (min_clusters > (osb->bitmap_cpg - 1)) { 32411 if (min_clusters > (osb->bitmap_cpg - 1)) {
31928 /* The only paths asking for contiguousness 32412 /* The only paths asking for contiguousness
31929@@ -1855,7 +1855,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ 32413@@ -1858,7 +1858,7 @@ int __ocfs2_claim_clusters(struct ocfs2_
31930 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode, 32414 ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode,
31931 bg_blkno, 32415 bg_blkno,
31932 bg_bit_off); 32416 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
31935 } 32419 }
31936 } 32420 }
31937 if (status < 0) { 32421 if (status < 0) {
31938diff -urNp linux-2.6.32.11/fs/ocfs2/super.c linux-2.6.32.11/fs/ocfs2/super.c 32422diff -urNp linux-2.6.32.12/fs/ocfs2/super.c linux-2.6.32.12/fs/ocfs2/super.c
31939--- linux-2.6.32.11/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400 32423--- linux-2.6.32.12/fs/ocfs2/super.c 2010-03-15 11:52:04.000000000 -0400
31940+++ linux-2.6.32.11/fs/ocfs2/super.c 2010-04-04 20:46:41.657782339 -0400 32424+++ linux-2.6.32.12/fs/ocfs2/super.c 2010-04-04 20:46:41.657782339 -0400
31941@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s 32425@@ -284,11 +284,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
31942 "%10s => GlobalAllocs: %d LocalAllocs: %d " 32426 "%10s => GlobalAllocs: %d LocalAllocs: %d "
31943 "SubAllocs: %d LAWinMoves: %d SAExtends: %d\n", 32427 "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
31972 32456
31973 /* Copy the blockcheck stats from the superblock probe */ 32457 /* Copy the blockcheck stats from the superblock probe */
31974 osb->osb_ecc_stats = *stats; 32458 osb->osb_ecc_stats = *stats;
31975diff -urNp linux-2.6.32.11/fs/open.c linux-2.6.32.11/fs/open.c 32459diff -urNp linux-2.6.32.12/fs/open.c linux-2.6.32.12/fs/open.c
31976--- linux-2.6.32.11/fs/open.c 2010-03-15 11:52:04.000000000 -0400 32460--- linux-2.6.32.12/fs/open.c 2010-03-15 11:52:04.000000000 -0400
31977+++ linux-2.6.32.11/fs/open.c 2010-04-04 20:46:41.657782339 -0400 32461+++ linux-2.6.32.12/fs/open.c 2010-04-04 20:46:41.657782339 -0400
31978@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l 32462@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l
31979 if (length < 0) 32463 if (length < 0)
31980 return -EINVAL; 32464 return -EINVAL;
@@ -32148,9 +32632,9 @@ diff -urNp linux-2.6.32.11/fs/open.c linux-2.6.32.11/fs/open.c
32148 mnt_drop_write(file->f_path.mnt); 32632 mnt_drop_write(file->f_path.mnt);
32149 out_fput: 32633 out_fput:
32150 fput(file); 32634 fput(file);
32151diff -urNp linux-2.6.32.11/fs/pipe.c linux-2.6.32.11/fs/pipe.c 32635diff -urNp linux-2.6.32.12/fs/pipe.c linux-2.6.32.12/fs/pipe.c
32152--- linux-2.6.32.11/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400 32636--- linux-2.6.32.12/fs/pipe.c 2010-03-15 11:52:04.000000000 -0400
32153+++ linux-2.6.32.11/fs/pipe.c 2010-04-04 20:46:41.657782339 -0400 32637+++ linux-2.6.32.12/fs/pipe.c 2010-04-04 20:46:41.657782339 -0400
32154@@ -401,9 +401,9 @@ redo: 32638@@ -401,9 +401,9 @@ redo:
32155 } 32639 }
32156 if (bufs) /* More to do? */ 32640 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
32274 inode->i_fop = &rdwr_pipefifo_fops; 32758 inode->i_fop = &rdwr_pipefifo_fops;
32275 32759
32276 /* 32760 /*
32277diff -urNp linux-2.6.32.11/fs/proc/array.c linux-2.6.32.11/fs/proc/array.c 32761diff -urNp linux-2.6.32.12/fs/proc/array.c linux-2.6.32.12/fs/proc/array.c
32278--- linux-2.6.32.11/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400 32762--- linux-2.6.32.12/fs/proc/array.c 2010-03-15 11:52:04.000000000 -0400
32279+++ linux-2.6.32.11/fs/proc/array.c 2010-04-04 20:46:41.657782339 -0400 32763+++ linux-2.6.32.12/fs/proc/array.c 2010-04-04 20:46:41.657782339 -0400
32280@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct 32764@@ -410,6 +410,21 @@ static void task_show_stack_usage(struct
32281 } 32765 }
32282 #endif /* CONFIG_MMU */ 32766 #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
32367+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip); 32851+ return sprintf(buffer, "%pI4\n", &task->signal->curr_ip);
32368+} 32852+}
32369+#endif 32853+#endif
32370diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c 32854diff -urNp linux-2.6.32.12/fs/proc/base.c linux-2.6.32.12/fs/proc/base.c
32371--- linux-2.6.32.11/fs/proc/base.c 2010-03-15 11:52:04.000000000 -0400 32855--- linux-2.6.32.12/fs/proc/base.c 2010-04-29 17:49:38.453075413 -0400
32372+++ linux-2.6.32.11/fs/proc/base.c 2010-04-04 20:46:41.661529739 -0400 32856+++ linux-2.6.32.12/fs/proc/base.c 2010-04-29 17:49:58.609026943 -0400
32373@@ -102,6 +102,22 @@ struct pid_entry { 32857@@ -102,6 +102,22 @@ struct pid_entry {
32374 union proc_op op; 32858 union proc_op op;
32375 }; 32859 };
@@ -32449,7 +32933,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32449 32933
32450 #define MAX_STACK_TRACE_DEPTH 64 32934 #define MAX_STACK_TRACE_DEPTH 64
32451 32935
32452@@ -521,7 +557,7 @@ static int proc_pid_limits(struct task_s 32936@@ -522,7 +558,7 @@ static int proc_pid_limits(struct task_s
32453 return count; 32937 return count;
32454 } 32938 }
32455 32939
@@ -32458,7 +32942,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32458 static int proc_pid_syscall(struct task_struct *task, char *buffer) 32942 static int proc_pid_syscall(struct task_struct *task, char *buffer)
32459 { 32943 {
32460 long nr; 32944 long nr;
32461@@ -935,6 +971,9 @@ static ssize_t environ_read(struct file 32945@@ -936,6 +972,9 @@ static ssize_t environ_read(struct file
32462 if (!task) 32946 if (!task)
32463 goto out_no_task; 32947 goto out_no_task;
32464 32948
@@ -32468,7 +32952,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32468 if (!ptrace_may_access(task, PTRACE_MODE_READ)) 32952 if (!ptrace_may_access(task, PTRACE_MODE_READ))
32469 goto out; 32953 goto out;
32470 32954
32471@@ -1455,7 +1494,11 @@ static struct inode *proc_pid_make_inode 32955@@ -1456,7 +1495,11 @@ static struct inode *proc_pid_make_inode
32472 rcu_read_lock(); 32956 rcu_read_lock();
32473 cred = __task_cred(task); 32957 cred = __task_cred(task);
32474 inode->i_uid = cred->euid; 32958 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
32480 rcu_read_unlock(); 32964 rcu_read_unlock();
32481 } 32965 }
32482 security_task_to_inode(task, inode); 32966 security_task_to_inode(task, inode);
32483@@ -1473,6 +1516,9 @@ static int pid_getattr(struct vfsmount * 32967@@ -1474,6 +1517,9 @@ static int pid_getattr(struct vfsmount *
32484 struct inode *inode = dentry->d_inode; 32968 struct inode *inode = dentry->d_inode;
32485 struct task_struct *task; 32969 struct task_struct *task;
32486 const struct cred *cred; 32970 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
32490 32974
32491 generic_fillattr(inode, stat); 32975 generic_fillattr(inode, stat);
32492 32976
32493@@ -1480,12 +1526,34 @@ static int pid_getattr(struct vfsmount * 32977@@ -1481,12 +1527,34 @@ static int pid_getattr(struct vfsmount *
32494 stat->uid = 0; 32978 stat->uid = 0;
32495 stat->gid = 0; 32979 stat->gid = 0;
32496 task = pid_task(proc_pid(inode), PIDTYPE_PID); 32980 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
32526 } 33010 }
32527 } 33011 }
32528 rcu_read_unlock(); 33012 rcu_read_unlock();
32529@@ -1517,11 +1585,20 @@ static int pid_revalidate(struct dentry 33013@@ -1518,11 +1586,20 @@ static int pid_revalidate(struct dentry
32530 33014
32531 if (task) { 33015 if (task) {
32532 if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || 33016 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
32547 rcu_read_unlock(); 33031 rcu_read_unlock();
32548 } else { 33032 } else {
32549 inode->i_uid = 0; 33033 inode->i_uid = 0;
32550@@ -1642,7 +1719,8 @@ static int proc_fd_info(struct inode *in 33034@@ -1643,7 +1720,8 @@ static int proc_fd_info(struct inode *in
32551 int fd = proc_fd(inode); 33035 int fd = proc_fd(inode);
32552 33036
32553 if (task) { 33037 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
32557 put_task_struct(task); 33041 put_task_struct(task);
32558 } 33042 }
32559 if (files) { 33043 if (files) {
32560@@ -1894,12 +1972,22 @@ static const struct file_operations proc 33044@@ -1895,12 +1973,22 @@ static const struct file_operations proc
32561 static int proc_fd_permission(struct inode *inode, int mask) 33045 static int proc_fd_permission(struct inode *inode, int mask)
32562 { 33046 {
32563 int rv; 33047 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
32582 return rv; 33066 return rv;
32583 } 33067 }
32584 33068
32585@@ -2008,6 +2096,9 @@ static struct dentry *proc_pident_lookup 33069@@ -2009,6 +2097,9 @@ static struct dentry *proc_pident_lookup
32586 if (!task) 33070 if (!task)
32587 goto out_no_task; 33071 goto out_no_task;
32588 33072
@@ -32592,7 +33076,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32592 /* 33076 /*
32593 * Yes, it does not scale. And it should not. Don't add 33077 * Yes, it does not scale. And it should not. Don't add
32594 * new entries into /proc/<tgid>/ without very good reasons. 33078 * new entries into /proc/<tgid>/ without very good reasons.
32595@@ -2052,6 +2143,9 @@ static int proc_pident_readdir(struct fi 33079@@ -2053,6 +2144,9 @@ static int proc_pident_readdir(struct fi
32596 if (!task) 33080 if (!task)
32597 goto out_no_task; 33081 goto out_no_task;
32598 33082
@@ -32602,7 +33086,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32602 ret = 0; 33086 ret = 0;
32603 i = filp->f_pos; 33087 i = filp->f_pos;
32604 switch (i) { 33088 switch (i) {
32605@@ -2319,7 +2413,7 @@ static void *proc_self_follow_link(struc 33089@@ -2320,7 +2414,7 @@ static void *proc_self_follow_link(struc
32606 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd, 33090 static void proc_self_put_link(struct dentry *dentry, struct nameidata *nd,
32607 void *cookie) 33091 void *cookie)
32608 { 33092 {
@@ -32611,7 +33095,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32611 if (!IS_ERR(s)) 33095 if (!IS_ERR(s))
32612 __putname(s); 33096 __putname(s);
32613 } 33097 }
32614@@ -2432,6 +2526,9 @@ static struct dentry *proc_base_lookup(s 33098@@ -2433,6 +2527,9 @@ static struct dentry *proc_base_lookup(s
32615 if (p > last) 33099 if (p > last)
32616 goto out; 33100 goto out;
32617 33101
@@ -32621,7 +33105,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32621 error = proc_base_instantiate(dir, dentry, task, p); 33105 error = proc_base_instantiate(dir, dentry, task, p);
32622 33106
32623 out: 33107 out:
32624@@ -2518,7 +2615,7 @@ static const struct pid_entry tgid_base_ 33108@@ -2519,7 +2616,7 @@ static const struct pid_entry tgid_base_
32625 #ifdef CONFIG_SCHED_DEBUG 33109 #ifdef CONFIG_SCHED_DEBUG
32626 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), 33110 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
32627 #endif 33111 #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
32630 INF("syscall", S_IRUSR, proc_pid_syscall), 33114 INF("syscall", S_IRUSR, proc_pid_syscall),
32631 #endif 33115 #endif
32632 INF("cmdline", S_IRUGO, proc_pid_cmdline), 33116 INF("cmdline", S_IRUGO, proc_pid_cmdline),
32633@@ -2546,7 +2643,7 @@ static const struct pid_entry tgid_base_ 33117@@ -2547,7 +2644,7 @@ static const struct pid_entry tgid_base_
32634 #ifdef CONFIG_KALLSYMS 33118 #ifdef CONFIG_KALLSYMS
32635 INF("wchan", S_IRUGO, proc_pid_wchan), 33119 INF("wchan", S_IRUGO, proc_pid_wchan),
32636 #endif 33120 #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
32639 ONE("stack", S_IRUSR, proc_pid_stack), 33123 ONE("stack", S_IRUSR, proc_pid_stack),
32640 #endif 33124 #endif
32641 #ifdef CONFIG_SCHEDSTATS 33125 #ifdef CONFIG_SCHEDSTATS
32642@@ -2576,6 +2673,9 @@ static const struct pid_entry tgid_base_ 33126@@ -2577,6 +2674,9 @@ static const struct pid_entry tgid_base_
32643 #ifdef CONFIG_TASK_IO_ACCOUNTING 33127 #ifdef CONFIG_TASK_IO_ACCOUNTING
32644 INF("io", S_IRUGO, proc_tgid_io_accounting), 33128 INF("io", S_IRUGO, proc_tgid_io_accounting),
32645 #endif 33129 #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
32649 }; 33133 };
32650 33134
32651 static int proc_tgid_base_readdir(struct file * filp, 33135 static int proc_tgid_base_readdir(struct file * filp,
32652@@ -2700,7 +2800,14 @@ static struct dentry *proc_pid_instantia 33136@@ -2701,7 +2801,14 @@ static struct dentry *proc_pid_instantia
32653 if (!inode) 33137 if (!inode)
32654 goto out; 33138 goto out;
32655 33139
@@ -32664,7 +33148,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32664 inode->i_op = &proc_tgid_base_inode_operations; 33148 inode->i_op = &proc_tgid_base_inode_operations;
32665 inode->i_fop = &proc_tgid_base_operations; 33149 inode->i_fop = &proc_tgid_base_operations;
32666 inode->i_flags|=S_IMMUTABLE; 33150 inode->i_flags|=S_IMMUTABLE;
32667@@ -2742,7 +2849,11 @@ struct dentry *proc_pid_lookup(struct in 33151@@ -2743,7 +2850,11 @@ struct dentry *proc_pid_lookup(struct in
32668 if (!task) 33152 if (!task)
32669 goto out; 33153 goto out;
32670 33154
@@ -32676,7 +33160,7 @@ diff -urNp linux-2.6.32.11/fs/proc/base.c linux-2.6.32.11/fs/proc/base.c
32676 put_task_struct(task); 33160 put_task_struct(task);
32677 out: 33161 out:
32678 return result; 33162 return result;
32679@@ -2807,6 +2918,11 @@ int proc_pid_readdir(struct file * filp, 33163@@ -2808,6 +2919,11 @@ int proc_pid_readdir(struct file * filp,
32680 { 33164 {
32681 unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; 33165 unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY;
32682 struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); 33166 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
32688 struct tgid_iter iter; 33172 struct tgid_iter iter;
32689 struct pid_namespace *ns; 33173 struct pid_namespace *ns;
32690 33174
32691@@ -2825,8 +2941,27 @@ int proc_pid_readdir(struct file * filp, 33175@@ -2826,8 +2942,27 @@ int proc_pid_readdir(struct file * filp,
32692 for (iter = next_tgid(ns, iter); 33176 for (iter = next_tgid(ns, iter);
32693 iter.task; 33177 iter.task;
32694 iter.tgid += 1, iter = next_tgid(ns, iter)) { 33178 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
32717 put_task_struct(iter.task); 33201 put_task_struct(iter.task);
32718 goto out; 33202 goto out;
32719 } 33203 }
32720@@ -2852,7 +2987,7 @@ static const struct pid_entry tid_base_s 33204@@ -2853,7 +2988,7 @@ static const struct pid_entry tid_base_s
32721 #ifdef CONFIG_SCHED_DEBUG 33205 #ifdef CONFIG_SCHED_DEBUG
32722 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), 33206 REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations),
32723 #endif 33207 #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
32726 INF("syscall", S_IRUSR, proc_pid_syscall), 33210 INF("syscall", S_IRUSR, proc_pid_syscall),
32727 #endif 33211 #endif
32728 INF("cmdline", S_IRUGO, proc_pid_cmdline), 33212 INF("cmdline", S_IRUGO, proc_pid_cmdline),
32729@@ -2879,7 +3014,7 @@ static const struct pid_entry tid_base_s 33213@@ -2880,7 +3015,7 @@ static const struct pid_entry tid_base_s
32730 #ifdef CONFIG_KALLSYMS 33214 #ifdef CONFIG_KALLSYMS
32731 INF("wchan", S_IRUGO, proc_pid_wchan), 33215 INF("wchan", S_IRUGO, proc_pid_wchan),
32732 #endif 33216 #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
32735 ONE("stack", S_IRUSR, proc_pid_stack), 33219 ONE("stack", S_IRUSR, proc_pid_stack),
32736 #endif 33220 #endif
32737 #ifdef CONFIG_SCHEDSTATS 33221 #ifdef CONFIG_SCHEDSTATS
32738diff -urNp linux-2.6.32.11/fs/proc/cmdline.c linux-2.6.32.11/fs/proc/cmdline.c 33222diff -urNp linux-2.6.32.12/fs/proc/cmdline.c linux-2.6.32.12/fs/proc/cmdline.c
32739--- linux-2.6.32.11/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400 33223--- linux-2.6.32.12/fs/proc/cmdline.c 2010-03-15 11:52:04.000000000 -0400
32740+++ linux-2.6.32.11/fs/proc/cmdline.c 2010-04-04 20:46:41.661529739 -0400 33224+++ linux-2.6.32.12/fs/proc/cmdline.c 2010-04-04 20:46:41.661529739 -0400
32741@@ -23,7 +23,11 @@ static const struct file_operations cmdl 33225@@ -23,7 +23,11 @@ static const struct file_operations cmdl
32742 33226
32743 static int __init proc_cmdline_init(void) 33227 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
32750 return 0; 33234 return 0;
32751 } 33235 }
32752 module_init(proc_cmdline_init); 33236 module_init(proc_cmdline_init);
32753diff -urNp linux-2.6.32.11/fs/proc/devices.c linux-2.6.32.11/fs/proc/devices.c 33237diff -urNp linux-2.6.32.12/fs/proc/devices.c linux-2.6.32.12/fs/proc/devices.c
32754--- linux-2.6.32.11/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400 33238--- linux-2.6.32.12/fs/proc/devices.c 2010-03-15 11:52:04.000000000 -0400
32755+++ linux-2.6.32.11/fs/proc/devices.c 2010-04-04 20:46:41.661529739 -0400 33239+++ linux-2.6.32.12/fs/proc/devices.c 2010-04-04 20:46:41.661529739 -0400
32756@@ -64,7 +64,11 @@ static const struct file_operations proc 33240@@ -64,7 +64,11 @@ static const struct file_operations proc
32757 33241
32758 static int __init proc_devices_init(void) 33242 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
32765 return 0; 33249 return 0;
32766 } 33250 }
32767 module_init(proc_devices_init); 33251 module_init(proc_devices_init);
32768diff -urNp linux-2.6.32.11/fs/proc/inode.c linux-2.6.32.11/fs/proc/inode.c 33252diff -urNp linux-2.6.32.12/fs/proc/inode.c linux-2.6.32.12/fs/proc/inode.c
32769--- linux-2.6.32.11/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400 33253--- linux-2.6.32.12/fs/proc/inode.c 2010-03-15 11:52:04.000000000 -0400
32770+++ linux-2.6.32.11/fs/proc/inode.c 2010-04-04 20:46:41.661529739 -0400 33254+++ linux-2.6.32.12/fs/proc/inode.c 2010-04-04 20:46:41.661529739 -0400
32771@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe 33255@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe
32772 if (de->mode) { 33256 if (de->mode) {
32773 inode->i_mode = de->mode; 33257 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
32780 } 33264 }
32781 if (de->size) 33265 if (de->size)
32782 inode->i_size = de->size; 33266 inode->i_size = de->size;
32783diff -urNp linux-2.6.32.11/fs/proc/internal.h linux-2.6.32.11/fs/proc/internal.h 33267diff -urNp linux-2.6.32.12/fs/proc/internal.h linux-2.6.32.12/fs/proc/internal.h
32784--- linux-2.6.32.11/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400 33268--- linux-2.6.32.12/fs/proc/internal.h 2010-03-15 11:52:04.000000000 -0400
32785+++ linux-2.6.32.11/fs/proc/internal.h 2010-04-04 20:46:41.661529739 -0400 33269+++ linux-2.6.32.12/fs/proc/internal.h 2010-04-04 20:46:41.661529739 -0400
32786@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi 33270@@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
32787 struct pid *pid, struct task_struct *task); 33271 struct pid *pid, struct task_struct *task);
32788 extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, 33272 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
32793 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); 33277 extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
32794 33278
32795 extern const struct file_operations proc_maps_operations; 33279 extern const struct file_operations proc_maps_operations;
32796diff -urNp linux-2.6.32.11/fs/proc/Kconfig linux-2.6.32.11/fs/proc/Kconfig 33280diff -urNp linux-2.6.32.12/fs/proc/Kconfig linux-2.6.32.12/fs/proc/Kconfig
32797--- linux-2.6.32.11/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400 33281--- linux-2.6.32.12/fs/proc/Kconfig 2010-03-15 11:52:04.000000000 -0400
32798+++ linux-2.6.32.11/fs/proc/Kconfig 2010-04-04 20:46:41.661529739 -0400 33282+++ linux-2.6.32.12/fs/proc/Kconfig 2010-04-04 20:46:41.661529739 -0400
32799@@ -30,12 +30,12 @@ config PROC_FS 33283@@ -30,12 +30,12 @@ config PROC_FS
32800 33284
32801 config PROC_KCORE 33285 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
32823 bool "Enable /proc page monitoring" if EMBEDDED 33307 bool "Enable /proc page monitoring" if EMBEDDED
32824 help 33308 help
32825 Various /proc files exist to monitor process memory utilization: 33309 Various /proc files exist to monitor process memory utilization:
32826diff -urNp linux-2.6.32.11/fs/proc/kcore.c linux-2.6.32.11/fs/proc/kcore.c 33310diff -urNp linux-2.6.32.12/fs/proc/kcore.c linux-2.6.32.12/fs/proc/kcore.c
32827--- linux-2.6.32.11/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400 33311--- linux-2.6.32.12/fs/proc/kcore.c 2010-03-15 11:52:04.000000000 -0400
32828+++ linux-2.6.32.11/fs/proc/kcore.c 2010-04-04 20:46:41.661529739 -0400 33312+++ linux-2.6.32.12/fs/proc/kcore.c 2010-04-04 20:46:41.661529739 -0400
32829@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use 33313@@ -541,6 +541,9 @@ read_kcore(struct file *file, char __use
32830 33314
32831 static int open_kcore(struct inode *inode, struct file *filp) 33315 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
32836 if (!capable(CAP_SYS_RAWIO)) 33320 if (!capable(CAP_SYS_RAWIO))
32837 return -EPERM; 33321 return -EPERM;
32838 if (kcore_need_update) 33322 if (kcore_need_update)
32839diff -urNp linux-2.6.32.11/fs/proc/meminfo.c linux-2.6.32.11/fs/proc/meminfo.c 33323diff -urNp linux-2.6.32.12/fs/proc/meminfo.c linux-2.6.32.12/fs/proc/meminfo.c
32840--- linux-2.6.32.11/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400 33324--- linux-2.6.32.12/fs/proc/meminfo.c 2010-03-15 11:52:04.000000000 -0400
32841+++ linux-2.6.32.11/fs/proc/meminfo.c 2010-04-04 20:46:41.661529739 -0400 33325+++ linux-2.6.32.12/fs/proc/meminfo.c 2010-04-04 20:46:41.661529739 -0400
32842@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_ 33326@@ -149,7 +149,7 @@ static int meminfo_proc_show(struct seq_
32843 vmi.used >> 10, 33327 vmi.used >> 10,
32844 vmi.largest_chunk >> 10 33328 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
32848 #endif 33332 #endif
32849 ); 33333 );
32850 33334
32851diff -urNp linux-2.6.32.11/fs/proc/nommu.c linux-2.6.32.11/fs/proc/nommu.c 33335diff -urNp linux-2.6.32.12/fs/proc/nommu.c linux-2.6.32.12/fs/proc/nommu.c
32852--- linux-2.6.32.11/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400 33336--- linux-2.6.32.12/fs/proc/nommu.c 2010-03-15 11:52:04.000000000 -0400
32853+++ linux-2.6.32.11/fs/proc/nommu.c 2010-04-04 20:46:41.661529739 -0400 33337+++ linux-2.6.32.12/fs/proc/nommu.c 2010-04-04 20:46:41.661529739 -0400
32854@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ 33338@@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_
32855 if (len < 1) 33339 if (len < 1)
32856 len = 1; 33340 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
32860 } 33344 }
32861 33345
32862 seq_putc(m, '\n'); 33346 seq_putc(m, '\n');
32863diff -urNp linux-2.6.32.11/fs/proc/proc_net.c linux-2.6.32.11/fs/proc/proc_net.c 33347diff -urNp linux-2.6.32.12/fs/proc/proc_net.c linux-2.6.32.12/fs/proc/proc_net.c
32864--- linux-2.6.32.11/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400 33348--- linux-2.6.32.12/fs/proc/proc_net.c 2010-03-15 11:52:04.000000000 -0400
32865+++ linux-2.6.32.11/fs/proc/proc_net.c 2010-04-04 20:46:41.661529739 -0400 33349+++ linux-2.6.32.12/fs/proc/proc_net.c 2010-04-04 20:46:41.661529739 -0400
32866@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str 33350@@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str
32867 struct task_struct *task; 33351 struct task_struct *task;
32868 struct nsproxy *ns; 33352 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
32881 33365
32882 rcu_read_lock(); 33366 rcu_read_lock();
32883 task = pid_task(proc_pid(dir), PIDTYPE_PID); 33367 task = pid_task(proc_pid(dir), PIDTYPE_PID);
32884diff -urNp linux-2.6.32.11/fs/proc/proc_sysctl.c linux-2.6.32.11/fs/proc/proc_sysctl.c 33368diff -urNp linux-2.6.32.12/fs/proc/proc_sysctl.c linux-2.6.32.12/fs/proc/proc_sysctl.c
32885--- linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 33369--- linux-2.6.32.12/fs/proc/proc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
32886+++ linux-2.6.32.11/fs/proc/proc_sysctl.c 2010-04-04 20:46:41.661529739 -0400 33370+++ linux-2.6.32.12/fs/proc/proc_sysctl.c 2010-04-04 20:46:41.661529739 -0400
32887@@ -7,6 +7,8 @@ 33371@@ -7,6 +7,8 @@
32888 #include <linux/security.h> 33372 #include <linux/security.h>
32889 #include "internal.h" 33373 #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
32923 generic_fillattr(inode, stat); 33407 generic_fillattr(inode, stat);
32924 if (table) 33408 if (table)
32925 stat->mode = (stat->mode & S_IFMT) | table->mode; 33409 stat->mode = (stat->mode & S_IFMT) | table->mode;
32926diff -urNp linux-2.6.32.11/fs/proc/root.c linux-2.6.32.11/fs/proc/root.c 33410diff -urNp linux-2.6.32.12/fs/proc/root.c linux-2.6.32.12/fs/proc/root.c
32927--- linux-2.6.32.11/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400 33411--- linux-2.6.32.12/fs/proc/root.c 2010-03-15 11:52:04.000000000 -0400
32928+++ linux-2.6.32.11/fs/proc/root.c 2010-04-04 20:46:41.661529739 -0400 33412+++ linux-2.6.32.12/fs/proc/root.c 2010-04-04 20:46:41.661529739 -0400
32929@@ -134,7 +134,15 @@ void __init proc_root_init(void) 33413@@ -134,7 +134,15 @@ void __init proc_root_init(void)
32930 #ifdef CONFIG_PROC_DEVICETREE 33414 #ifdef CONFIG_PROC_DEVICETREE
32931 proc_device_tree_init(); 33415 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
32942 proc_sys_init(); 33426 proc_sys_init();
32943 } 33427 }
32944 33428
32945diff -urNp linux-2.6.32.11/fs/proc/task_mmu.c linux-2.6.32.11/fs/proc/task_mmu.c 33429diff -urNp linux-2.6.32.12/fs/proc/task_mmu.c linux-2.6.32.12/fs/proc/task_mmu.c
32946--- linux-2.6.32.11/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400 33430--- linux-2.6.32.12/fs/proc/task_mmu.c 2010-03-15 11:52:04.000000000 -0400
32947+++ linux-2.6.32.11/fs/proc/task_mmu.c 2010-04-04 20:46:41.661529739 -0400 33431+++ linux-2.6.32.12/fs/proc/task_mmu.c 2010-04-04 20:46:41.661529739 -0400
32948@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct 33432@@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct
32949 "VmStk:\t%8lu kB\n" 33433 "VmStk:\t%8lu kB\n"
32950 "VmExe:\t%8lu kB\n" 33434 "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
33065 mss.resident >> 10, 33549 mss.resident >> 10,
33066 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), 33550 (unsigned long)(mss.pss >> (10 + PSS_SHIFT)),
33067 mss.shared_clean >> 10, 33551 mss.shared_clean >> 10,
33068diff -urNp linux-2.6.32.11/fs/proc/task_nommu.c linux-2.6.32.11/fs/proc/task_nommu.c 33552diff -urNp linux-2.6.32.12/fs/proc/task_nommu.c linux-2.6.32.12/fs/proc/task_nommu.c
33069--- linux-2.6.32.11/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400 33553--- linux-2.6.32.12/fs/proc/task_nommu.c 2010-03-15 11:52:04.000000000 -0400
33070+++ linux-2.6.32.11/fs/proc/task_nommu.c 2010-04-04 20:46:41.661529739 -0400 33554+++ linux-2.6.32.12/fs/proc/task_nommu.c 2010-04-04 20:46:41.661529739 -0400
33071@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct 33555@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct
33072 else 33556 else
33073 bytes += kobjsize(mm); 33557 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
33086 } 33570 }
33087 33571
33088 seq_putc(m, '\n'); 33572 seq_putc(m, '\n');
33089diff -urNp linux-2.6.32.11/fs/readdir.c linux-2.6.32.11/fs/readdir.c 33573diff -urNp linux-2.6.32.12/fs/readdir.c linux-2.6.32.12/fs/readdir.c
33090--- linux-2.6.32.11/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400 33574--- linux-2.6.32.12/fs/readdir.c 2010-03-15 11:52:04.000000000 -0400
33091+++ linux-2.6.32.11/fs/readdir.c 2010-04-04 20:46:41.661529739 -0400 33575+++ linux-2.6.32.12/fs/readdir.c 2010-04-04 20:46:41.661529739 -0400
33092@@ -16,6 +16,7 @@ 33576@@ -16,6 +16,7 @@
33093 #include <linux/security.h> 33577 #include <linux/security.h>
33094 #include <linux/syscalls.h> 33578 #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
33178 buf.count = count; 33662 buf.count = count;
33179 buf.error = 0; 33663 buf.error = 0;
33180 33664
33181diff -urNp linux-2.6.32.11/fs/reiserfs/do_balan.c linux-2.6.32.11/fs/reiserfs/do_balan.c 33665diff -urNp linux-2.6.32.12/fs/reiserfs/do_balan.c linux-2.6.32.12/fs/reiserfs/do_balan.c
33182--- linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400 33666--- linux-2.6.32.12/fs/reiserfs/do_balan.c 2010-03-15 11:52:04.000000000 -0400
33183+++ linux-2.6.32.11/fs/reiserfs/do_balan.c 2010-04-04 20:46:41.661529739 -0400 33667+++ linux-2.6.32.12/fs/reiserfs/do_balan.c 2010-04-04 20:46:41.661529739 -0400
33184@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb, 33668@@ -2058,7 +2058,7 @@ void do_balance(struct tree_balance *tb,
33185 return; 33669 return;
33186 } 33670 }
@@ -33190,9 +33674,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/do_balan.c linux-2.6.32.11/fs/reiserfs/do
33190 do_balance_starts(tb); 33674 do_balance_starts(tb);
33191 33675
33192 /* balance leaf returns 0 except if combining L R and S into 33676 /* balance leaf returns 0 except if combining L R and S into
33193diff -urNp linux-2.6.32.11/fs/reiserfs/item_ops.c linux-2.6.32.11/fs/reiserfs/item_ops.c 33677diff -urNp linux-2.6.32.12/fs/reiserfs/item_ops.c linux-2.6.32.12/fs/reiserfs/item_ops.c
33194--- linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400 33678--- linux-2.6.32.12/fs/reiserfs/item_ops.c 2010-03-15 11:52:04.000000000 -0400
33195+++ linux-2.6.32.11/fs/reiserfs/item_ops.c 2010-04-04 20:46:41.661529739 -0400 33679+++ linux-2.6.32.12/fs/reiserfs/item_ops.c 2010-04-04 20:46:41.661529739 -0400
33196@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i 33680@@ -102,7 +102,7 @@ static void sd_print_vi(struct virtual_i
33197 vi->vi_index, vi->vi_type, vi->vi_ih); 33681 vi->vi_index, vi->vi_type, vi->vi_ih);
33198 } 33682 }
@@ -33247,9 +33731,9 @@ diff -urNp linux-2.6.32.11/fs/reiserfs/item_ops.c linux-2.6.32.11/fs/reiserfs/it
33247 &stat_data_ops, 33731 &stat_data_ops,
33248 &indirect_ops, 33732 &indirect_ops,
33249 &direct_ops, 33733 &direct_ops,
33250diff -urNp linux-2.6.32.11/fs/reiserfs/procfs.c linux-2.6.32.11/fs/reiserfs/procfs.c 33734diff -urNp linux-2.6.32.12/fs/reiserfs/procfs.c linux-2.6.32.12/fs/reiserfs/procfs.c
33251--- linux-2.6.32.11/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400 33735--- linux-2.6.32.12/fs/reiserfs/procfs.c 2010-03-15 11:52:04.000000000 -0400
33252+++ linux-2.6.32.11/fs/reiserfs/procfs.c 2010-04-04 20:46:41.661529739 -0400 33736+++ linux-2.6.32.12/fs/reiserfs/procfs.c 2010-04-04 20:46:41.661529739 -0400
33253@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m 33737@@ -123,7 +123,7 @@ static int show_super(struct seq_file *m
33254 "SMALL_TAILS " : "NO_TAILS ", 33738 "SMALL_TAILS " : "NO_TAILS ",
33255 replay_only(sb) ? "REPLAY_ONLY " : "", 33739 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
33259 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes), 33743 SF(s_disk_reads), SF(s_disk_writes), SF(s_fix_nodes),
33260 SF(s_do_balance), SF(s_unneeded_left_neighbor), 33744 SF(s_do_balance), SF(s_unneeded_left_neighbor),
33261 SF(s_good_search_by_key_reada), SF(s_bmaps), 33745 SF(s_good_search_by_key_reada), SF(s_bmaps),
33262diff -urNp linux-2.6.32.11/fs/select.c linux-2.6.32.11/fs/select.c 33746diff -urNp linux-2.6.32.12/fs/select.c linux-2.6.32.12/fs/select.c
33263--- linux-2.6.32.11/fs/select.c 2010-03-15 11:52:04.000000000 -0400 33747--- linux-2.6.32.12/fs/select.c 2010-03-15 11:52:04.000000000 -0400
33264+++ linux-2.6.32.11/fs/select.c 2010-04-04 20:46:41.661529739 -0400 33748+++ linux-2.6.32.12/fs/select.c 2010-04-04 20:46:41.661529739 -0400
33265@@ -20,6 +20,7 @@ 33749@@ -20,6 +20,7 @@
33266 #include <linux/module.h> 33750 #include <linux/module.h>
33267 #include <linux/slab.h> 33751 #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
33278 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) 33762 if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur)
33279 return -EINVAL; 33763 return -EINVAL;
33280 33764
33281diff -urNp linux-2.6.32.11/fs/seq_file.c linux-2.6.32.11/fs/seq_file.c 33765diff -urNp linux-2.6.32.12/fs/seq_file.c linux-2.6.32.12/fs/seq_file.c
33282--- linux-2.6.32.11/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400 33766--- linux-2.6.32.12/fs/seq_file.c 2010-03-15 11:52:04.000000000 -0400
33283+++ linux-2.6.32.11/fs/seq_file.c 2010-04-04 20:46:41.661529739 -0400 33767+++ linux-2.6.32.12/fs/seq_file.c 2010-04-04 20:46:41.661529739 -0400
33284@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 33768@@ -76,7 +76,8 @@ static int traverse(struct seq_file *m,
33285 return 0; 33769 return 0;
33286 } 33770 }
@@ -33321,9 +33805,9 @@ diff -urNp linux-2.6.32.11/fs/seq_file.c linux-2.6.32.11/fs/seq_file.c
33321 if (!m->buf) 33805 if (!m->buf)
33322 goto Enomem; 33806 goto Enomem;
33323 m->count = 0; 33807 m->count = 0;
33324diff -urNp linux-2.6.32.11/fs/smbfs/symlink.c linux-2.6.32.11/fs/smbfs/symlink.c 33808diff -urNp linux-2.6.32.12/fs/smbfs/symlink.c linux-2.6.32.12/fs/smbfs/symlink.c
33325--- linux-2.6.32.11/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 33809--- linux-2.6.32.12/fs/smbfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
33326+++ linux-2.6.32.11/fs/smbfs/symlink.c 2010-04-04 20:46:41.661529739 -0400 33810+++ linux-2.6.32.12/fs/smbfs/symlink.c 2010-04-04 20:46:41.661529739 -0400
33327@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent 33811@@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent
33328 33812
33329 static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) 33813 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
33333 if (!IS_ERR(s)) 33817 if (!IS_ERR(s))
33334 __putname(s); 33818 __putname(s);
33335 } 33819 }
33336diff -urNp linux-2.6.32.11/fs/splice.c linux-2.6.32.11/fs/splice.c 33820diff -urNp linux-2.6.32.12/fs/splice.c linux-2.6.32.12/fs/splice.c
33337--- linux-2.6.32.11/fs/splice.c 2010-03-15 11:52:04.000000000 -0400 33821--- linux-2.6.32.12/fs/splice.c 2010-03-15 11:52:04.000000000 -0400
33338+++ linux-2.6.32.11/fs/splice.c 2010-04-04 20:46:41.661529739 -0400 33822+++ linux-2.6.32.12/fs/splice.c 2010-04-04 20:46:41.661529739 -0400
33339@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode 33823@@ -185,7 +185,7 @@ ssize_t splice_to_pipe(struct pipe_inode
33340 pipe_lock(pipe); 33824 pipe_lock(pipe);
33341 33825
@@ -33474,9 +33958,9 @@ diff -urNp linux-2.6.32.11/fs/splice.c linux-2.6.32.11/fs/splice.c
33474 ret = -EAGAIN; 33958 ret = -EAGAIN;
33475 33959
33476 pipe_unlock(ipipe); 33960 pipe_unlock(ipipe);
33477diff -urNp linux-2.6.32.11/fs/sysfs/file.c linux-2.6.32.11/fs/sysfs/file.c 33961diff -urNp linux-2.6.32.12/fs/sysfs/file.c linux-2.6.32.12/fs/sysfs/file.c
33478--- linux-2.6.32.11/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400 33962--- linux-2.6.32.12/fs/sysfs/file.c 2010-03-15 11:52:04.000000000 -0400
33479+++ linux-2.6.32.11/fs/sysfs/file.c 2010-04-04 20:46:41.661529739 -0400 33963+++ linux-2.6.32.12/fs/sysfs/file.c 2010-04-04 20:46:41.661529739 -0400
33480@@ -53,7 +53,7 @@ struct sysfs_buffer { 33964@@ -53,7 +53,7 @@ struct sysfs_buffer {
33481 size_t count; 33965 size_t count;
33482 loff_t pos; 33966 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
33513 int error = -EACCES; 33997 int error = -EACCES;
33514 char *p; 33998 char *p;
33515 33999
33516diff -urNp linux-2.6.32.11/fs/sysfs/symlink.c linux-2.6.32.11/fs/sysfs/symlink.c 34000diff -urNp linux-2.6.32.12/fs/sysfs/symlink.c linux-2.6.32.12/fs/sysfs/symlink.c
33517--- linux-2.6.32.11/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400 34001--- linux-2.6.32.12/fs/sysfs/symlink.c 2010-03-15 11:52:04.000000000 -0400
33518+++ linux-2.6.32.11/fs/sysfs/symlink.c 2010-04-04 20:46:41.661529739 -0400 34002+++ linux-2.6.32.12/fs/sysfs/symlink.c 2010-04-04 20:46:41.661529739 -0400
33519@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de 34003@@ -204,7 +204,7 @@ static void *sysfs_follow_link(struct de
33520 34004
33521 static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) 34005 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
33525 if (!IS_ERR(page)) 34009 if (!IS_ERR(page))
33526 free_page((unsigned long)page); 34010 free_page((unsigned long)page);
33527 } 34011 }
33528diff -urNp linux-2.6.32.11/fs/udf/balloc.c linux-2.6.32.11/fs/udf/balloc.c 34012diff -urNp linux-2.6.32.12/fs/udf/balloc.c linux-2.6.32.12/fs/udf/balloc.c
33529--- linux-2.6.32.11/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400 34013--- linux-2.6.32.12/fs/udf/balloc.c 2010-03-15 11:52:04.000000000 -0400
33530+++ linux-2.6.32.11/fs/udf/balloc.c 2010-04-04 20:46:41.665784997 -0400 34014+++ linux-2.6.32.12/fs/udf/balloc.c 2010-04-04 20:46:41.665784997 -0400
33531@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc 34015@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc
33532 34016
33533 mutex_lock(&sbi->s_alloc_mutex); 34017 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
33550 udf_debug("%d < %d || %d + %d > %d\n", 34034 udf_debug("%d < %d || %d + %d > %d\n",
33551 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, 34035 bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count,
33552 partmap->s_partition_len); 34036 partmap->s_partition_len);
33553diff -urNp linux-2.6.32.11/fs/utimes.c linux-2.6.32.11/fs/utimes.c 34037diff -urNp linux-2.6.32.12/fs/udf/misc.c linux-2.6.32.12/fs/udf/misc.c
33554--- linux-2.6.32.11/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400 34038--- linux-2.6.32.12/fs/udf/misc.c 2010-03-15 11:52:04.000000000 -0400
33555+++ linux-2.6.32.11/fs/utimes.c 2010-04-04 20:46:41.665784997 -0400 34039+++ linux-2.6.32.12/fs/udf/misc.c 2010-04-29 17:46:37.289044536 -0400
34040@@ -142,8 +142,8 @@ struct genericFormat *udf_add_extendedat
34041 iinfo->i_lenEAttr += size;
34042 return (struct genericFormat *)&ea[offset];
34043 }
34044- if (loc & 0x02)
34045- ;
34046+ if (loc & 0x02) {
34047+ }
34048
34049 return NULL;
34050 }
34051diff -urNp linux-2.6.32.12/fs/udf/udfdecl.h linux-2.6.32.12/fs/udf/udfdecl.h
34052--- linux-2.6.32.12/fs/udf/udfdecl.h 2010-03-15 11:52:04.000000000 -0400
34053+++ linux-2.6.32.12/fs/udf/udfdecl.h 2010-04-29 17:46:37.289044536 -0400
34054@@ -26,7 +26,7 @@ do { \
34055 printk(f, ##a); \
34056 } while (0)
34057 #else
34058-#define udf_debug(f, a...) /**/
34059+#define udf_debug(f, a...) do {} while (0)
34060 #endif
34061
34062 #define udf_info(f, a...) \
34063diff -urNp linux-2.6.32.12/fs/utimes.c linux-2.6.32.12/fs/utimes.c
34064--- linux-2.6.32.12/fs/utimes.c 2010-03-15 11:52:04.000000000 -0400
34065+++ linux-2.6.32.12/fs/utimes.c 2010-04-04 20:46:41.665784997 -0400
33556@@ -1,6 +1,7 @@ 34066@@ -1,6 +1,7 @@
33557 #include <linux/compiler.h> 34067 #include <linux/compiler.h>
33558 #include <linux/file.h> 34068 #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
33574 mutex_lock(&inode->i_mutex); 34084 mutex_lock(&inode->i_mutex);
33575 error = notify_change(path->dentry, &newattrs); 34085 error = notify_change(path->dentry, &newattrs);
33576 mutex_unlock(&inode->i_mutex); 34086 mutex_unlock(&inode->i_mutex);
33577diff -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 34087diff -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
33578--- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400 34088--- linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c 2010-03-15 11:52:04.000000000 -0400
33579+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_ioctl.c 2010-04-04 20:46:41.665784997 -0400 34089+++ linux-2.6.32.12/fs/xfs/linux-2.6/xfs_ioctl.c 2010-04-04 20:46:41.665784997 -0400
33580@@ -134,7 +134,7 @@ xfs_find_handle( 34090@@ -134,7 +134,7 @@ xfs_find_handle(
33581 } 34091 }
33582 34092
@@ -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
33586 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32))) 34096 copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
33587 goto out_put; 34097 goto out_put;
33588 34098
33589diff -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 34099diff -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
33590--- linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-03-15 11:52:04.000000000 -0400 34100--- linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:38.453075413 -0400
33591+++ linux-2.6.32.11/fs/xfs/linux-2.6/xfs_iops.c 2010-04-04 20:46:41.665784997 -0400 34101+++ linux-2.6.32.12/fs/xfs/linux-2.6/xfs_iops.c 2010-04-29 17:49:58.609026943 -0400
33592@@ -468,7 +468,7 @@ xfs_vn_put_link( 34102@@ -468,7 +468,7 @@ xfs_vn_put_link(
33593 struct nameidata *nd, 34103 struct nameidata *nd,
33594 void *p) 34104 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
33598 34108
33599 if (!IS_ERR(s)) 34109 if (!IS_ERR(s))
33600 kfree(s); 34110 kfree(s);
33601diff -urNp linux-2.6.32.11/fs/xfs/xfs_bmap.c linux-2.6.32.11/fs/xfs/xfs_bmap.c 34111diff -urNp linux-2.6.32.12/fs/xfs/xfs_bmap.c linux-2.6.32.12/fs/xfs/xfs_bmap.c
33602--- linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400 34112--- linux-2.6.32.12/fs/xfs/xfs_bmap.c 2010-03-15 11:52:04.000000000 -0400
33603+++ linux-2.6.32.11/fs/xfs/xfs_bmap.c 2010-04-04 20:46:41.665784997 -0400 34113+++ linux-2.6.32.12/fs/xfs/xfs_bmap.c 2010-04-04 20:46:41.665784997 -0400
33604@@ -360,7 +360,7 @@ xfs_bmap_validate_ret( 34114@@ -360,7 +360,7 @@ xfs_bmap_validate_ret(
33605 int nmap, 34115 int nmap,
33606 int ret_nmap); 34116 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
33610 #endif /* DEBUG */ 34120 #endif /* DEBUG */
33611 34121
33612 #if defined(XFS_RW_TRACE) 34122 #if defined(XFS_RW_TRACE)
33613diff -urNp linux-2.6.32.11/grsecurity/gracl_alloc.c linux-2.6.32.11/grsecurity/gracl_alloc.c 34123diff -urNp linux-2.6.32.12/grsecurity/gracl_alloc.c linux-2.6.32.12/grsecurity/gracl_alloc.c
33614--- linux-2.6.32.11/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 34124--- linux-2.6.32.12/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500
33615+++ linux-2.6.32.11/grsecurity/gracl_alloc.c 2010-04-04 20:46:41.665784997 -0400 34125+++ linux-2.6.32.12/grsecurity/gracl_alloc.c 2010-04-04 20:46:41.665784997 -0400
33616@@ -0,0 +1,105 @@ 34126@@ -0,0 +1,105 @@
33617+#include <linux/kernel.h> 34127+#include <linux/kernel.h>
33618+#include <linux/mm.h> 34128+#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
33719+ else 34229+ else
33720+ return 1; 34230+ return 1;
33721+} 34231+}
33722diff -urNp linux-2.6.32.11/grsecurity/gracl.c linux-2.6.32.11/grsecurity/gracl.c 34232diff -urNp linux-2.6.32.12/grsecurity/gracl.c linux-2.6.32.12/grsecurity/gracl.c
33723--- linux-2.6.32.11/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 34233--- linux-2.6.32.12/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500
33724+++ linux-2.6.32.11/grsecurity/gracl.c 2010-04-06 22:16:21.600343588 -0400 34234+++ linux-2.6.32.12/grsecurity/gracl.c 2010-04-29 17:48:04.497204424 -0400
33725@@ -0,0 +1,3924 @@ 34235@@ -0,0 +1,3897 @@
33726+#include <linux/kernel.h> 34236+#include <linux/kernel.h>
33727+#include <linux/module.h> 34237+#include <linux/module.h>
33728+#include <linux/sched.h> 34238+#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
33862+static int 34372+static int
33863+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb) 34373+gr_streq(const char *a, const char *b, const unsigned int lena, const unsigned int lenb)
33864+{ 34374+{
33865+ int i;
33866+ unsigned long *l1;
33867+ unsigned long *l2;
33868+ unsigned char *c1;
33869+ unsigned char *c2;
33870+ int num_longs;
33871+
33872+ if (likely(lena != lenb)) 34375+ if (likely(lena != lenb))
33873+ return 0; 34376+ return 0;
33874+ 34377+
33875+ l1 = (unsigned long *)a; 34378+ return !memcmp(a, b, lena);
33876+ l2 = (unsigned long *)b;
33877+
33878+ num_longs = lena / sizeof(unsigned long);
33879+
33880+ for (i = num_longs; i--; l1++, l2++) {
33881+ if (unlikely(*l1 != *l2))
33882+ return 0;
33883+ }
33884+
33885+ c1 = (unsigned char *) l1;
33886+ c2 = (unsigned char *) l2;
33887+
33888+ i = lena - (num_longs * sizeof(unsigned long));
33889+
33890+ for (; i--; c1++, c2++) {
33891+ if (unlikely(*c1 != *c2))
33892+ return 0;
33893+ }
33894+
33895+ return 1;
33896+} 34379+}
33897+ 34380+
33898+static char * __our_d_path(struct dentry *dentry, struct vfsmount *vfsmnt, 34381+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
37647+EXPORT_SYMBOL(gr_check_group_change); 38130+EXPORT_SYMBOL(gr_check_group_change);
37648+#endif 38131+#endif
37649+ 38132+
37650diff -urNp linux-2.6.32.11/grsecurity/gracl_cap.c linux-2.6.32.11/grsecurity/gracl_cap.c 38133diff -urNp linux-2.6.32.12/grsecurity/gracl_cap.c linux-2.6.32.12/grsecurity/gracl_cap.c
37651--- linux-2.6.32.11/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 38134--- linux-2.6.32.12/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
37652+++ linux-2.6.32.11/grsecurity/gracl_cap.c 2010-04-04 20:46:41.668784531 -0400 38135+++ linux-2.6.32.12/grsecurity/gracl_cap.c 2010-04-04 20:46:41.668784531 -0400
37653@@ -0,0 +1,131 @@ 38136@@ -0,0 +1,131 @@
37654+#include <linux/kernel.h> 38137+#include <linux/kernel.h>
37655+#include <linux/module.h> 38138+#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
37782+ return 0; 38265+ return 0;
37783+} 38266+}
37784+ 38267+
37785diff -urNp linux-2.6.32.11/grsecurity/gracl_fs.c linux-2.6.32.11/grsecurity/gracl_fs.c 38268diff -urNp linux-2.6.32.12/grsecurity/gracl_fs.c linux-2.6.32.12/grsecurity/gracl_fs.c
37786--- linux-2.6.32.11/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 38269--- linux-2.6.32.12/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500
37787+++ linux-2.6.32.11/grsecurity/gracl_fs.c 2010-04-04 20:46:41.668784531 -0400 38270+++ linux-2.6.32.12/grsecurity/gracl_fs.c 2010-04-04 20:46:41.668784531 -0400
37788@@ -0,0 +1,424 @@ 38271@@ -0,0 +1,424 @@
37789+#include <linux/kernel.h> 38272+#include <linux/kernel.h>
37790+#include <linux/sched.h> 38273+#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
38210+ 38693+
38211+ return 0; 38694+ return 0;
38212+} 38695+}
38213diff -urNp linux-2.6.32.11/grsecurity/gracl_ip.c linux-2.6.32.11/grsecurity/gracl_ip.c 38696diff -urNp linux-2.6.32.12/grsecurity/gracl_ip.c linux-2.6.32.12/grsecurity/gracl_ip.c
38214--- linux-2.6.32.11/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 38697--- linux-2.6.32.12/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500
38215+++ linux-2.6.32.11/grsecurity/gracl_ip.c 2010-04-04 20:46:41.668784531 -0400 38698+++ linux-2.6.32.12/grsecurity/gracl_ip.c 2010-04-04 20:46:41.668784531 -0400
38216@@ -0,0 +1,339 @@ 38699@@ -0,0 +1,339 @@
38217+#include <linux/kernel.h> 38700+#include <linux/kernel.h>
38218+#include <asm/uaccess.h> 38701+#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
38553+ 39036+
38554+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); 39037+ return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
38555+} 39038+}
38556diff -urNp linux-2.6.32.11/grsecurity/gracl_learn.c linux-2.6.32.11/grsecurity/gracl_learn.c 39039diff -urNp linux-2.6.32.12/grsecurity/gracl_learn.c linux-2.6.32.12/grsecurity/gracl_learn.c
38557--- linux-2.6.32.11/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 39040--- linux-2.6.32.12/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500
38558+++ linux-2.6.32.11/grsecurity/gracl_learn.c 2010-04-04 20:46:41.668784531 -0400 39041+++ linux-2.6.32.12/grsecurity/gracl_learn.c 2010-04-04 20:46:41.668784531 -0400
38559@@ -0,0 +1,211 @@ 39042@@ -0,0 +1,211 @@
38560+#include <linux/kernel.h> 39043+#include <linux/kernel.h>
38561+#include <linux/mm.h> 39044+#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
38768+ .release = close_learn, 39251+ .release = close_learn,
38769+ .poll = poll_learn, 39252+ .poll = poll_learn,
38770+}; 39253+};
38771diff -urNp linux-2.6.32.11/grsecurity/gracl_res.c linux-2.6.32.11/grsecurity/gracl_res.c 39254diff -urNp linux-2.6.32.12/grsecurity/gracl_res.c linux-2.6.32.12/grsecurity/gracl_res.c
38772--- linux-2.6.32.11/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 39255--- linux-2.6.32.12/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
38773+++ linux-2.6.32.11/grsecurity/gracl_res.c 2010-04-04 20:46:41.668784531 -0400 39256+++ linux-2.6.32.12/grsecurity/gracl_res.c 2010-04-04 20:46:41.668784531 -0400
38774@@ -0,0 +1,65 @@ 39257@@ -0,0 +1,65 @@
38775+#include <linux/kernel.h> 39258+#include <linux/kernel.h>
38776+#include <linux/sched.h> 39259+#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
38837+ rcu_read_unlock(); 39320+ rcu_read_unlock();
38838+ return; 39321+ return;
38839+} 39322+}
38840diff -urNp linux-2.6.32.11/grsecurity/gracl_segv.c linux-2.6.32.11/grsecurity/gracl_segv.c 39323diff -urNp linux-2.6.32.12/grsecurity/gracl_segv.c linux-2.6.32.12/grsecurity/gracl_segv.c
38841--- linux-2.6.32.11/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 39324--- linux-2.6.32.12/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500
38842+++ linux-2.6.32.11/grsecurity/gracl_segv.c 2010-04-04 20:46:41.668784531 -0400 39325+++ linux-2.6.32.12/grsecurity/gracl_segv.c 2010-04-04 20:46:41.668784531 -0400
38843@@ -0,0 +1,310 @@ 39326@@ -0,0 +1,310 @@
38844+#include <linux/kernel.h> 39327+#include <linux/kernel.h>
38845+#include <linux/mm.h> 39328+#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
39151+ 39634+
39152+ return; 39635+ return;
39153+} 39636+}
39154diff -urNp linux-2.6.32.11/grsecurity/gracl_shm.c linux-2.6.32.11/grsecurity/gracl_shm.c 39637diff -urNp linux-2.6.32.12/grsecurity/gracl_shm.c linux-2.6.32.12/grsecurity/gracl_shm.c
39155--- linux-2.6.32.11/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 39638--- linux-2.6.32.12/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
39156+++ linux-2.6.32.11/grsecurity/gracl_shm.c 2010-04-04 20:46:41.668784531 -0400 39639+++ linux-2.6.32.12/grsecurity/gracl_shm.c 2010-04-04 20:46:41.668784531 -0400
39157@@ -0,0 +1,37 @@ 39640@@ -0,0 +1,37 @@
39158+#include <linux/kernel.h> 39641+#include <linux/kernel.h>
39159+#include <linux/mm.h> 39642+#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
39192+ 39675+
39193+ return 1; 39676+ return 1;
39194+} 39677+}
39195diff -urNp linux-2.6.32.11/grsecurity/grsec_chdir.c linux-2.6.32.11/grsecurity/grsec_chdir.c 39678diff -urNp linux-2.6.32.12/grsecurity/grsec_chdir.c linux-2.6.32.12/grsecurity/grsec_chdir.c
39196--- linux-2.6.32.11/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 39679--- linux-2.6.32.12/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500
39197+++ linux-2.6.32.11/grsecurity/grsec_chdir.c 2010-04-04 20:46:41.668784531 -0400 39680+++ linux-2.6.32.12/grsecurity/grsec_chdir.c 2010-04-04 20:46:41.668784531 -0400
39198@@ -0,0 +1,19 @@ 39681@@ -0,0 +1,19 @@
39199+#include <linux/kernel.h> 39682+#include <linux/kernel.h>
39200+#include <linux/sched.h> 39683+#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
39215+#endif 39698+#endif
39216+ return; 39699+ return;
39217+} 39700+}
39218diff -urNp linux-2.6.32.11/grsecurity/grsec_chroot.c linux-2.6.32.11/grsecurity/grsec_chroot.c 39701diff -urNp linux-2.6.32.12/grsecurity/grsec_chroot.c linux-2.6.32.12/grsecurity/grsec_chroot.c
39219--- linux-2.6.32.11/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 39702--- linux-2.6.32.12/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500
39220+++ linux-2.6.32.11/grsecurity/grsec_chroot.c 2010-04-04 20:46:41.668784531 -0400 39703+++ linux-2.6.32.12/grsecurity/grsec_chroot.c 2010-04-04 20:46:41.668784531 -0400
39221@@ -0,0 +1,348 @@ 39704@@ -0,0 +1,348 @@
39222+#include <linux/kernel.h> 39705+#include <linux/kernel.h>
39223+#include <linux/module.h> 39706+#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/
39567+#ifdef CONFIG_SECURITY 40050+#ifdef CONFIG_SECURITY
39568+EXPORT_SYMBOL(gr_handle_chroot_caps); 40051+EXPORT_SYMBOL(gr_handle_chroot_caps);
39569+#endif 40052+#endif
39570diff -urNp linux-2.6.32.11/grsecurity/grsec_disabled.c linux-2.6.32.11/grsecurity/grsec_disabled.c 40053diff -urNp linux-2.6.32.12/grsecurity/grsec_disabled.c linux-2.6.32.12/grsecurity/grsec_disabled.c
39571--- linux-2.6.32.11/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 40054--- linux-2.6.32.12/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500
39572+++ linux-2.6.32.11/grsecurity/grsec_disabled.c 2010-04-04 20:46:41.668784531 -0400 40055+++ linux-2.6.32.12/grsecurity/grsec_disabled.c 2010-04-04 20:46:41.668784531 -0400
39573@@ -0,0 +1,426 @@ 40056@@ -0,0 +1,426 @@
39574+#include <linux/kernel.h> 40057+#include <linux/kernel.h>
39575+#include <linux/module.h> 40058+#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
39997+EXPORT_SYMBOL(gr_check_user_change); 40480+EXPORT_SYMBOL(gr_check_user_change);
39998+EXPORT_SYMBOL(gr_check_group_change); 40481+EXPORT_SYMBOL(gr_check_group_change);
39999+#endif 40482+#endif
40000diff -urNp linux-2.6.32.11/grsecurity/grsec_exec.c linux-2.6.32.11/grsecurity/grsec_exec.c 40483diff -urNp linux-2.6.32.12/grsecurity/grsec_exec.c linux-2.6.32.12/grsecurity/grsec_exec.c
40001--- linux-2.6.32.11/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 40484--- linux-2.6.32.12/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500
40002+++ linux-2.6.32.11/grsecurity/grsec_exec.c 2010-04-04 20:46:41.668784531 -0400 40485+++ linux-2.6.32.12/grsecurity/grsec_exec.c 2010-04-04 20:46:41.668784531 -0400
40003@@ -0,0 +1,89 @@ 40486@@ -0,0 +1,89 @@
40004+#include <linux/kernel.h> 40487+#include <linux/kernel.h>
40005+#include <linux/sched.h> 40488+#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
40090+#endif 40573+#endif
40091+ return; 40574+ return;
40092+} 40575+}
40093diff -urNp linux-2.6.32.11/grsecurity/grsec_fifo.c linux-2.6.32.11/grsecurity/grsec_fifo.c 40576diff -urNp linux-2.6.32.12/grsecurity/grsec_fifo.c linux-2.6.32.12/grsecurity/grsec_fifo.c
40094--- linux-2.6.32.11/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 40577--- linux-2.6.32.12/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500
40095+++ linux-2.6.32.11/grsecurity/grsec_fifo.c 2010-04-04 20:46:41.668784531 -0400 40578+++ linux-2.6.32.12/grsecurity/grsec_fifo.c 2010-04-04 20:46:41.668784531 -0400
40096@@ -0,0 +1,24 @@ 40579@@ -0,0 +1,24 @@
40097+#include <linux/kernel.h> 40580+#include <linux/kernel.h>
40098+#include <linux/sched.h> 40581+#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
40118+#endif 40601+#endif
40119+ return 0; 40602+ return 0;
40120+} 40603+}
40121diff -urNp linux-2.6.32.11/grsecurity/grsec_fork.c linux-2.6.32.11/grsecurity/grsec_fork.c 40604diff -urNp linux-2.6.32.12/grsecurity/grsec_fork.c linux-2.6.32.12/grsecurity/grsec_fork.c
40122--- linux-2.6.32.11/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 40605--- linux-2.6.32.12/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500
40123+++ linux-2.6.32.11/grsecurity/grsec_fork.c 2010-04-04 20:46:41.668784531 -0400 40606+++ linux-2.6.32.12/grsecurity/grsec_fork.c 2010-04-04 20:46:41.668784531 -0400
40124@@ -0,0 +1,15 @@ 40607@@ -0,0 +1,15 @@
40125+#include <linux/kernel.h> 40608+#include <linux/kernel.h>
40126+#include <linux/sched.h> 40609+#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
40137+#endif 40620+#endif
40138+ return; 40621+ return;
40139+} 40622+}
40140diff -urNp linux-2.6.32.11/grsecurity/grsec_init.c linux-2.6.32.11/grsecurity/grsec_init.c 40623diff -urNp linux-2.6.32.12/grsecurity/grsec_init.c linux-2.6.32.12/grsecurity/grsec_init.c
40141--- linux-2.6.32.11/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 40624--- linux-2.6.32.12/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500
40142+++ linux-2.6.32.11/grsecurity/grsec_init.c 2010-04-04 20:46:41.668784531 -0400 40625+++ linux-2.6.32.12/grsecurity/grsec_init.c 2010-04-04 20:46:41.668784531 -0400
40143@@ -0,0 +1,241 @@ 40626@@ -0,0 +1,241 @@
40144+#include <linux/kernel.h> 40627+#include <linux/kernel.h>
40145+#include <linux/sched.h> 40628+#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
40382+ 40865+
40383+ return; 40866+ return;
40384+} 40867+}
40385diff -urNp linux-2.6.32.11/grsecurity/grsec_link.c linux-2.6.32.11/grsecurity/grsec_link.c 40868diff -urNp linux-2.6.32.12/grsecurity/grsec_link.c linux-2.6.32.12/grsecurity/grsec_link.c
40386--- linux-2.6.32.11/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 40869--- linux-2.6.32.12/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500
40387+++ linux-2.6.32.11/grsecurity/grsec_link.c 2010-04-04 20:46:41.668784531 -0400 40870+++ linux-2.6.32.12/grsecurity/grsec_link.c 2010-04-04 20:46:41.668784531 -0400
40388@@ -0,0 +1,43 @@ 40871@@ -0,0 +1,43 @@
40389+#include <linux/kernel.h> 40872+#include <linux/kernel.h>
40390+#include <linux/sched.h> 40873+#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
40429+#endif 40912+#endif
40430+ return 0; 40913+ return 0;
40431+} 40914+}
40432diff -urNp linux-2.6.32.11/grsecurity/grsec_log.c linux-2.6.32.11/grsecurity/grsec_log.c 40915diff -urNp linux-2.6.32.12/grsecurity/grsec_log.c linux-2.6.32.12/grsecurity/grsec_log.c
40433--- linux-2.6.32.11/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 40916--- linux-2.6.32.12/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
40434+++ linux-2.6.32.11/grsecurity/grsec_log.c 2010-04-04 20:46:41.668784531 -0400 40917+++ linux-2.6.32.12/grsecurity/grsec_log.c 2010-04-04 20:46:41.668784531 -0400
40435@@ -0,0 +1,296 @@ 40918@@ -0,0 +1,296 @@
40436+#include <linux/kernel.h> 40919+#include <linux/kernel.h>
40437+#include <linux/sched.h> 40920+#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
40729+ gr_log_end(audit); 41212+ gr_log_end(audit);
40730+ END_LOCKS(audit); 41213+ END_LOCKS(audit);
40731+} 41214+}
40732diff -urNp linux-2.6.32.11/grsecurity/grsec_mem.c linux-2.6.32.11/grsecurity/grsec_mem.c 41215diff -urNp linux-2.6.32.12/grsecurity/grsec_mem.c linux-2.6.32.12/grsecurity/grsec_mem.c
40733--- linux-2.6.32.11/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 41216--- linux-2.6.32.12/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
40734+++ linux-2.6.32.11/grsecurity/grsec_mem.c 2010-04-04 20:46:41.668784531 -0400 41217+++ linux-2.6.32.12/grsecurity/grsec_mem.c 2010-04-04 20:46:41.668784531 -0400
40735@@ -0,0 +1,85 @@ 41218@@ -0,0 +1,85 @@
40736+#include <linux/kernel.h> 41219+#include <linux/kernel.h>
40737+#include <linux/sched.h> 41220+#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
40818+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG); 41301+ gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
40819+ return; 41302+ return;
40820+} 41303+}
40821diff -urNp linux-2.6.32.11/grsecurity/grsec_mount.c linux-2.6.32.11/grsecurity/grsec_mount.c 41304diff -urNp linux-2.6.32.12/grsecurity/grsec_mount.c linux-2.6.32.12/grsecurity/grsec_mount.c
40822--- linux-2.6.32.11/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 41305--- linux-2.6.32.12/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500
40823+++ linux-2.6.32.11/grsecurity/grsec_mount.c 2010-04-04 20:46:41.668784531 -0400 41306+++ linux-2.6.32.12/grsecurity/grsec_mount.c 2010-04-04 20:46:41.668784531 -0400
40824@@ -0,0 +1,62 @@ 41307@@ -0,0 +1,62 @@
40825+#include <linux/kernel.h> 41308+#include <linux/kernel.h>
40826+#include <linux/sched.h> 41309+#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
40884+#endif 41367+#endif
40885+ return 0; 41368+ return 0;
40886+} 41369+}
40887diff -urNp linux-2.6.32.11/grsecurity/grsec_ptrace.c linux-2.6.32.11/grsecurity/grsec_ptrace.c 41370diff -urNp linux-2.6.32.12/grsecurity/grsec_ptrace.c linux-2.6.32.12/grsecurity/grsec_ptrace.c
40888--- linux-2.6.32.11/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500 41371--- linux-2.6.32.12/grsecurity/grsec_ptrace.c 1969-12-31 19:00:00.000000000 -0500
40889+++ linux-2.6.32.11/grsecurity/grsec_ptrace.c 2010-04-04 20:46:41.668784531 -0400 41372+++ linux-2.6.32.12/grsecurity/grsec_ptrace.c 2010-04-04 20:46:41.668784531 -0400
40890@@ -0,0 +1,14 @@ 41373@@ -0,0 +1,14 @@
40891+#include <linux/kernel.h> 41374+#include <linux/kernel.h>
40892+#include <linux/sched.h> 41375+#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/
40902+#endif 41385+#endif
40903+ return; 41386+ return;
40904+} 41387+}
40905diff -urNp linux-2.6.32.11/grsecurity/grsec_sig.c linux-2.6.32.11/grsecurity/grsec_sig.c 41388diff -urNp linux-2.6.32.12/grsecurity/grsec_sig.c linux-2.6.32.12/grsecurity/grsec_sig.c
40906--- linux-2.6.32.11/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 41389--- linux-2.6.32.12/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
40907+++ linux-2.6.32.11/grsecurity/grsec_sig.c 2010-04-04 20:46:41.668784531 -0400 41390+++ linux-2.6.32.12/grsecurity/grsec_sig.c 2010-04-04 20:46:41.668784531 -0400
40908@@ -0,0 +1,65 @@ 41391@@ -0,0 +1,65 @@
40909+#include <linux/kernel.h> 41392+#include <linux/kernel.h>
40910+#include <linux/sched.h> 41393+#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
40971+ return; 41454+ return;
40972+} 41455+}
40973+ 41456+
40974diff -urNp linux-2.6.32.11/grsecurity/grsec_sock.c linux-2.6.32.11/grsecurity/grsec_sock.c 41457diff -urNp linux-2.6.32.12/grsecurity/grsec_sock.c linux-2.6.32.12/grsecurity/grsec_sock.c
40975--- linux-2.6.32.11/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 41458--- linux-2.6.32.12/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500
40976+++ linux-2.6.32.11/grsecurity/grsec_sock.c 2010-04-04 20:46:41.668784531 -0400 41459+++ linux-2.6.32.12/grsecurity/grsec_sock.c 2010-04-04 20:46:41.668784531 -0400
40977@@ -0,0 +1,271 @@ 41460@@ -0,0 +1,271 @@
40978+#include <linux/kernel.h> 41461+#include <linux/kernel.h>
40979+#include <linux/module.h> 41462+#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
41246+ return current_cap(); 41729+ return current_cap();
41247+#endif 41730+#endif
41248+} 41731+}
41249diff -urNp linux-2.6.32.11/grsecurity/grsec_sysctl.c linux-2.6.32.11/grsecurity/grsec_sysctl.c 41732diff -urNp linux-2.6.32.12/grsecurity/grsec_sysctl.c linux-2.6.32.12/grsecurity/grsec_sysctl.c
41250--- linux-2.6.32.11/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 41733--- linux-2.6.32.12/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500
41251+++ linux-2.6.32.11/grsecurity/grsec_sysctl.c 2010-04-04 20:46:41.668784531 -0400 41734+++ linux-2.6.32.12/grsecurity/grsec_sysctl.c 2010-04-04 20:46:41.668784531 -0400
41252@@ -0,0 +1,447 @@ 41735@@ -0,0 +1,447 @@
41253+#include <linux/kernel.h> 41736+#include <linux/kernel.h>
41254+#include <linux/sched.h> 41737+#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/
41697+ { .ctl_name = 0 } 42180+ { .ctl_name = 0 }
41698+}; 42181+};
41699+#endif 42182+#endif
41700diff -urNp linux-2.6.32.11/grsecurity/grsec_textrel.c linux-2.6.32.11/grsecurity/grsec_textrel.c 42183diff -urNp linux-2.6.32.12/grsecurity/grsec_textrel.c linux-2.6.32.12/grsecurity/grsec_textrel.c
41701--- linux-2.6.32.11/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 42184--- linux-2.6.32.12/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500
41702+++ linux-2.6.32.11/grsecurity/grsec_textrel.c 2010-04-04 20:46:41.668784531 -0400 42185+++ linux-2.6.32.12/grsecurity/grsec_textrel.c 2010-04-04 20:46:41.668784531 -0400
41703@@ -0,0 +1,16 @@ 42186@@ -0,0 +1,16 @@
41704+#include <linux/kernel.h> 42187+#include <linux/kernel.h>
41705+#include <linux/sched.h> 42188+#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
41717+#endif 42200+#endif
41718+ return; 42201+ return;
41719+} 42202+}
41720diff -urNp linux-2.6.32.11/grsecurity/grsec_time.c linux-2.6.32.11/grsecurity/grsec_time.c 42203diff -urNp linux-2.6.32.12/grsecurity/grsec_time.c linux-2.6.32.12/grsecurity/grsec_time.c
41721--- linux-2.6.32.11/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 42204--- linux-2.6.32.12/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500
41722+++ linux-2.6.32.11/grsecurity/grsec_time.c 2010-04-04 20:46:41.668784531 -0400 42205+++ linux-2.6.32.12/grsecurity/grsec_time.c 2010-04-04 20:46:41.668784531 -0400
41723@@ -0,0 +1,13 @@ 42206@@ -0,0 +1,13 @@
41724+#include <linux/kernel.h> 42207+#include <linux/kernel.h>
41725+#include <linux/sched.h> 42208+#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
41734+#endif 42217+#endif
41735+ return; 42218+ return;
41736+} 42219+}
41737diff -urNp linux-2.6.32.11/grsecurity/grsec_tpe.c linux-2.6.32.11/grsecurity/grsec_tpe.c 42220diff -urNp linux-2.6.32.12/grsecurity/grsec_tpe.c linux-2.6.32.12/grsecurity/grsec_tpe.c
41738--- linux-2.6.32.11/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 42221--- linux-2.6.32.12/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
41739+++ linux-2.6.32.11/grsecurity/grsec_tpe.c 2010-04-04 20:46:41.668784531 -0400 42222+++ linux-2.6.32.12/grsecurity/grsec_tpe.c 2010-04-04 20:46:41.668784531 -0400
41740@@ -0,0 +1,38 @@ 42223@@ -0,0 +1,38 @@
41741+#include <linux/kernel.h> 42224+#include <linux/kernel.h>
41742+#include <linux/sched.h> 42225+#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
41776+#endif 42259+#endif
41777+ return 1; 42260+ return 1;
41778+} 42261+}
41779diff -urNp linux-2.6.32.11/grsecurity/grsum.c linux-2.6.32.11/grsecurity/grsum.c 42262diff -urNp linux-2.6.32.12/grsecurity/grsum.c linux-2.6.32.12/grsecurity/grsum.c
41780--- linux-2.6.32.11/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 42263--- linux-2.6.32.12/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500
41781+++ linux-2.6.32.11/grsecurity/grsum.c 2010-04-04 20:46:41.668784531 -0400 42264+++ linux-2.6.32.12/grsecurity/grsum.c 2010-04-04 20:46:41.668784531 -0400
41782@@ -0,0 +1,59 @@ 42265@@ -0,0 +1,59 @@
41783+#include <linux/err.h> 42266+#include <linux/err.h>
41784+#include <linux/kernel.h> 42267+#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
41839+ 42322+
41840+ return retval; 42323+ return retval;
41841+} 42324+}
41842diff -urNp linux-2.6.32.11/grsecurity/Kconfig linux-2.6.32.11/grsecurity/Kconfig 42325diff -urNp linux-2.6.32.12/grsecurity/Kconfig linux-2.6.32.12/grsecurity/Kconfig
41843--- linux-2.6.32.11/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 42326--- linux-2.6.32.12/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500
41844+++ linux-2.6.32.11/grsecurity/Kconfig 2010-04-04 20:46:41.668784531 -0400 42327+++ linux-2.6.32.12/grsecurity/Kconfig 2010-04-04 20:46:41.668784531 -0400
41845@@ -0,0 +1,965 @@ 42328@@ -0,0 +1,965 @@
41846+# 42329+#
41847+# grecurity configuration 42330+# grecurity configuration
@@ -42808,9 +43291,9 @@ diff -urNp linux-2.6.32.11/grsecurity/Kconfig linux-2.6.32.11/grsecurity/Kconfig
42808+endmenu 43291+endmenu
42809+ 43292+
42810+endmenu 43293+endmenu
42811diff -urNp linux-2.6.32.11/grsecurity/Makefile linux-2.6.32.11/grsecurity/Makefile 43294diff -urNp linux-2.6.32.12/grsecurity/Makefile linux-2.6.32.12/grsecurity/Makefile
42812--- linux-2.6.32.11/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 43295--- linux-2.6.32.12/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500
42813+++ linux-2.6.32.11/grsecurity/Makefile 2010-04-04 20:46:41.668784531 -0400 43296+++ linux-2.6.32.12/grsecurity/Makefile 2010-04-04 20:46:41.668784531 -0400
42814@@ -0,0 +1,29 @@ 43297@@ -0,0 +1,29 @@
42815+# grsecurity's ACL system was originally written in 2001 by Michael Dalton 43298+# grsecurity's ACL system was originally written in 2001 by Michael Dalton
42816+# during 2001-2009 it has been completely redesigned by Brad Spengler 43299+# 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
42841+ @-chmod -f 700 . 43324+ @-chmod -f 700 .
42842+ @echo ' grsec: protected kernel image paths' 43325+ @echo ' grsec: protected kernel image paths'
42843+endif 43326+endif
42844diff -urNp linux-2.6.32.11/include/acpi/acpi_drivers.h linux-2.6.32.11/include/acpi/acpi_drivers.h 43327diff -urNp linux-2.6.32.12/include/acpi/acoutput.h linux-2.6.32.12/include/acpi/acoutput.h
42845--- linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400 43328--- linux-2.6.32.12/include/acpi/acoutput.h 2010-03-15 11:52:04.000000000 -0400
42846+++ linux-2.6.32.11/include/acpi/acpi_drivers.h 2010-04-04 20:46:41.668784531 -0400 43329+++ linux-2.6.32.12/include/acpi/acoutput.h 2010-04-29 17:46:37.297250222 -0400
43330@@ -264,8 +264,8 @@
43331 * leaving no executable debug code!
43332 */
43333 #define ACPI_FUNCTION_NAME(a)
43334-#define ACPI_DEBUG_PRINT(pl)
43335-#define ACPI_DEBUG_PRINT_RAW(pl)
43336+#define ACPI_DEBUG_PRINT(pl) do {} while (0)
43337+#define ACPI_DEBUG_PRINT_RAW(pl) do {} while (0)
43338
43339 #endif /* ACPI_DEBUG_OUTPUT */
43340
43341diff -urNp linux-2.6.32.12/include/acpi/acpi_drivers.h linux-2.6.32.12/include/acpi/acpi_drivers.h
43342--- linux-2.6.32.12/include/acpi/acpi_drivers.h 2010-03-15 11:52:04.000000000 -0400
43343+++ linux-2.6.32.12/include/acpi/acpi_drivers.h 2010-04-04 20:46:41.668784531 -0400
42847@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp 43344@@ -119,8 +119,8 @@ int acpi_processor_set_thermal_limit(acp
42848 Dock Station 43345 Dock Station
42849 -------------------------------------------------------------------------- */ 43346 -------------------------------------------------------------------------- */
@@ -42873,9 +43370,9 @@ diff -urNp linux-2.6.32.11/include/acpi/acpi_drivers.h linux-2.6.32.11/include/a
42873 void *context) 43370 void *context)
42874 { 43371 {
42875 return -ENODEV; 43372 return -ENODEV;
42876diff -urNp linux-2.6.32.11/include/asm-generic/atomic-long.h linux-2.6.32.11/include/asm-generic/atomic-long.h 43373diff -urNp linux-2.6.32.12/include/asm-generic/atomic-long.h linux-2.6.32.12/include/asm-generic/atomic-long.h
42877--- linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400 43374--- linux-2.6.32.12/include/asm-generic/atomic-long.h 2010-03-15 11:52:04.000000000 -0400
42878+++ linux-2.6.32.11/include/asm-generic/atomic-long.h 2010-04-04 20:46:41.668784531 -0400 43375+++ linux-2.6.32.12/include/asm-generic/atomic-long.h 2010-04-04 20:46:41.668784531 -0400
42879@@ -22,6 +22,12 @@ 43376@@ -22,6 +22,12 @@
42880 43377
42881 typedef atomic64_t atomic_long_t; 43378 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
43096+#endif 43593+#endif
43097+ 43594+
43098 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */ 43595 #endif /* _ASM_GENERIC_ATOMIC_LONG_H */
43099diff -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 43596diff -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
43100--- linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400 43597--- linux-2.6.32.12/include/asm-generic/dma-mapping-common.h 2010-03-15 11:52:04.000000000 -0400
43101+++ linux-2.6.32.11/include/asm-generic/dma-mapping-common.h 2010-04-04 20:46:41.673688119 -0400 43598+++ linux-2.6.32.12/include/asm-generic/dma-mapping-common.h 2010-04-04 20:46:41.673688119 -0400
43102@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_ 43599@@ -11,7 +11,7 @@ static inline dma_addr_t dma_map_single_
43103 enum dma_data_direction dir, 43600 enum dma_data_direction dir,
43104 struct dma_attrs *attrs) 43601 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
43207 43704
43208 BUG_ON(!valid_dma_direction(dir)); 43705 BUG_ON(!valid_dma_direction(dir));
43209 if (ops->sync_sg_for_device) 43706 if (ops->sync_sg_for_device)
43210diff -urNp linux-2.6.32.11/include/asm-generic/futex.h linux-2.6.32.11/include/asm-generic/futex.h 43707diff -urNp linux-2.6.32.12/include/asm-generic/futex.h linux-2.6.32.12/include/asm-generic/futex.h
43211--- linux-2.6.32.11/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400 43708--- linux-2.6.32.12/include/asm-generic/futex.h 2010-03-15 11:52:04.000000000 -0400
43212+++ linux-2.6.32.11/include/asm-generic/futex.h 2010-04-04 20:46:41.673688119 -0400 43709+++ linux-2.6.32.12/include/asm-generic/futex.h 2010-04-04 20:46:41.673688119 -0400
43213@@ -6,7 +6,7 @@ 43710@@ -6,7 +6,7 @@
43214 #include <asm/errno.h> 43711 #include <asm/errno.h>
43215 43712
@@ -43228,9 +43725,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/futex.h linux-2.6.32.11/include/a
43228 { 43725 {
43229 return -ENOSYS; 43726 return -ENOSYS;
43230 } 43727 }
43231diff -urNp linux-2.6.32.11/include/asm-generic/int-l64.h linux-2.6.32.11/include/asm-generic/int-l64.h 43728diff -urNp linux-2.6.32.12/include/asm-generic/int-l64.h linux-2.6.32.12/include/asm-generic/int-l64.h
43232--- linux-2.6.32.11/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400 43729--- linux-2.6.32.12/include/asm-generic/int-l64.h 2010-03-15 11:52:04.000000000 -0400
43233+++ linux-2.6.32.11/include/asm-generic/int-l64.h 2010-04-04 20:46:41.673688119 -0400 43730+++ linux-2.6.32.12/include/asm-generic/int-l64.h 2010-04-04 20:46:41.673688119 -0400
43234@@ -46,6 +46,8 @@ typedef unsigned int u32; 43731@@ -46,6 +46,8 @@ typedef unsigned int u32;
43235 typedef signed long s64; 43732 typedef signed long s64;
43236 typedef unsigned long u64; 43733 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
43240 #define S8_C(x) x 43737 #define S8_C(x) x
43241 #define U8_C(x) x ## U 43738 #define U8_C(x) x ## U
43242 #define S16_C(x) x 43739 #define S16_C(x) x
43243diff -urNp linux-2.6.32.11/include/asm-generic/int-ll64.h linux-2.6.32.11/include/asm-generic/int-ll64.h 43740diff -urNp linux-2.6.32.12/include/asm-generic/int-ll64.h linux-2.6.32.12/include/asm-generic/int-ll64.h
43244--- linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400 43741--- linux-2.6.32.12/include/asm-generic/int-ll64.h 2010-03-15 11:52:04.000000000 -0400
43245+++ linux-2.6.32.11/include/asm-generic/int-ll64.h 2010-04-04 20:46:41.673688119 -0400 43742+++ linux-2.6.32.12/include/asm-generic/int-ll64.h 2010-04-04 20:46:41.673688119 -0400
43246@@ -51,6 +51,8 @@ typedef unsigned int u32; 43743@@ -51,6 +51,8 @@ typedef unsigned int u32;
43247 typedef signed long long s64; 43744 typedef signed long long s64;
43248 typedef unsigned long long u64; 43745 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
43252 #define S8_C(x) x 43749 #define S8_C(x) x
43253 #define U8_C(x) x ## U 43750 #define U8_C(x) x ## U
43254 #define S16_C(x) x 43751 #define S16_C(x) x
43255diff -urNp linux-2.6.32.11/include/asm-generic/kmap_types.h linux-2.6.32.11/include/asm-generic/kmap_types.h 43752diff -urNp linux-2.6.32.12/include/asm-generic/kmap_types.h linux-2.6.32.12/include/asm-generic/kmap_types.h
43256--- linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400 43753--- linux-2.6.32.12/include/asm-generic/kmap_types.h 2010-03-15 11:52:04.000000000 -0400
43257+++ linux-2.6.32.11/include/asm-generic/kmap_types.h 2010-04-04 20:46:41.673688119 -0400 43754+++ linux-2.6.32.12/include/asm-generic/kmap_types.h 2010-04-04 20:46:41.673688119 -0400
43258@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY, 43755@@ -28,7 +28,8 @@ KMAP_D(15) KM_UML_USERCOPY,
43259 KMAP_D(16) KM_IRQ_PTE, 43756 KMAP_D(16) KM_IRQ_PTE,
43260 KMAP_D(17) KM_NMI, 43757 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
43265 }; 43762 };
43266 43763
43267 #undef KMAP_D 43764 #undef KMAP_D
43268diff -urNp linux-2.6.32.11/include/asm-generic/pgtable.h linux-2.6.32.11/include/asm-generic/pgtable.h 43765diff -urNp linux-2.6.32.12/include/asm-generic/pgtable.h linux-2.6.32.12/include/asm-generic/pgtable.h
43269--- linux-2.6.32.11/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400 43766--- linux-2.6.32.12/include/asm-generic/pgtable.h 2010-03-15 11:52:04.000000000 -0400
43270+++ linux-2.6.32.11/include/asm-generic/pgtable.h 2010-04-04 20:46:41.673688119 -0400 43767+++ linux-2.6.32.12/include/asm-generic/pgtable.h 2010-04-04 20:46:41.673688119 -0400
43271@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar 43768@@ -344,6 +344,14 @@ extern void untrack_pfn_vma(struct vm_ar
43272 unsigned long size); 43769 unsigned long size);
43273 #endif 43770 #endif
@@ -43283,9 +43780,9 @@ diff -urNp linux-2.6.32.11/include/asm-generic/pgtable.h linux-2.6.32.11/include
43283 #endif /* !__ASSEMBLY__ */ 43780 #endif /* !__ASSEMBLY__ */
43284 43781
43285 #endif /* _ASM_GENERIC_PGTABLE_H */ 43782 #endif /* _ASM_GENERIC_PGTABLE_H */
43286diff -urNp linux-2.6.32.11/include/asm-generic/vmlinux.lds.h linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 43783diff -urNp linux-2.6.32.12/include/asm-generic/vmlinux.lds.h linux-2.6.32.12/include/asm-generic/vmlinux.lds.h
43287--- linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400 43784--- linux-2.6.32.12/include/asm-generic/vmlinux.lds.h 2010-03-15 11:52:04.000000000 -0400
43288+++ linux-2.6.32.11/include/asm-generic/vmlinux.lds.h 2010-04-04 20:46:41.673688119 -0400 43785+++ linux-2.6.32.12/include/asm-generic/vmlinux.lds.h 2010-04-04 20:46:41.673688119 -0400
43289@@ -199,6 +199,7 @@ 43786@@ -199,6 +199,7 @@
43290 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ 43787 .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \
43291 VMLINUX_SYMBOL(__start_rodata) = .; \ 43788 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
43324 43821
43325 /** 43822 /**
43326 * PERCPU - define output section for percpu area, simple version 43823 * PERCPU - define output section for percpu area, simple version
43327diff -urNp linux-2.6.32.11/include/drm/drm_pciids.h linux-2.6.32.11/include/drm/drm_pciids.h 43824diff -urNp linux-2.6.32.12/include/drm/drm_pciids.h linux-2.6.32.12/include/drm/drm_pciids.h
43328--- linux-2.6.32.11/include/drm/drm_pciids.h 2010-03-15 11:52:04.000000000 -0400 43825--- linux-2.6.32.12/include/drm/drm_pciids.h 2010-04-29 17:49:38.529851956 -0400
43329+++ linux-2.6.32.11/include/drm/drm_pciids.h 2010-04-04 20:46:41.673688119 -0400 43826+++ linux-2.6.32.12/include/drm/drm_pciids.h 2010-04-29 18:05:16.209337414 -0400
43330@@ -375,7 +375,7 @@ 43827@@ -377,7 +377,7 @@
43331 {0x1002, 0x9712, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
43332 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 43828 {0x1002, 0x9713, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_IS_MOBILITY|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
43333 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ 43829 {0x1002, 0x9714, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
43830 {0x1002, 0x9715, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS880|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \
43334- {0, 0, 0} 43831- {0, 0, 0}
43335+ {0, 0, 0, 0, 0, 0} 43832+ {0, 0, 0, 0, 0, 0}
43336 43833
43337 #define r128_PCI_IDS \ 43834 #define r128_PCI_IDS \
43338 {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43835 {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43339@@ -415,14 +415,14 @@ 43836@@ -417,14 +417,14 @@
43340 {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43837 {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43341 {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43838 {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43342 {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43839 {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/
43353 43850
43354 #define mach64_PCI_IDS \ 43851 #define mach64_PCI_IDS \
43355 {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43852 {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43356@@ -445,7 +445,7 @@ 43853@@ -447,7 +447,7 @@
43357 {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43854 {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43358 {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43855 {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43359 {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43856 {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/
43362 43859
43363 #define sisdrv_PCI_IDS \ 43860 #define sisdrv_PCI_IDS \
43364 {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43861 {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43365@@ -456,7 +456,7 @@ 43862@@ -458,7 +458,7 @@
43366 {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43863 {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43367 {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ 43864 {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \
43368 {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ 43865 {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/
43371 43868
43372 #define tdfx_PCI_IDS \ 43869 #define tdfx_PCI_IDS \
43373 {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43870 {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43374@@ -465,7 +465,7 @@ 43871@@ -467,7 +467,7 @@
43375 {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43872 {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43376 {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43873 {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43377 {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43874 {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/
43380 43877
43381 #define viadrv_PCI_IDS \ 43878 #define viadrv_PCI_IDS \
43382 {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43879 {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43383@@ -477,14 +477,14 @@ 43880@@ -479,14 +479,14 @@
43384 {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43881 {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43385 {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \ 43882 {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \
43386 {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ 43883 {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/
43397 43894
43398 #define i830_PCI_IDS \ 43895 #define i830_PCI_IDS \
43399 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43896 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43400@@ -492,11 +492,11 @@ 43897@@ -494,11 +494,11 @@
43401 {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43898 {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43402 {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43899 {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \
43403 {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ 43900 {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/
43411 43908
43412 #define savage_PCI_IDS \ 43909 #define savage_PCI_IDS \
43413 {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \ 43910 {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \
43414@@ -522,10 +522,10 @@ 43911@@ -524,10 +524,10 @@
43415 {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \ 43912 {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \
43416 {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ 43913 {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \
43417 {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ 43914 {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/
43424 43921
43425 #define i915_PCI_IDS \ 43922 #define i915_PCI_IDS \
43426 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 43923 {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
43427@@ -558,4 +558,4 @@ 43924@@ -560,4 +560,4 @@
43428 {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 43925 {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
43429 {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 43926 {0x8086, 0x0042, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
43430 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ 43927 {0x8086, 0x0046, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \
43431- {0, 0, 0} 43928- {0, 0, 0}
43432+ {0, 0, 0, 0, 0, 0} 43929+ {0, 0, 0, 0, 0, 0}
43433diff -urNp linux-2.6.32.11/include/drm/drmP.h linux-2.6.32.11/include/drm/drmP.h 43930diff -urNp linux-2.6.32.12/include/drm/drmP.h linux-2.6.32.12/include/drm/drmP.h
43434--- linux-2.6.32.11/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400 43931--- linux-2.6.32.12/include/drm/drmP.h 2010-03-15 11:52:04.000000000 -0400
43435+++ linux-2.6.32.11/include/drm/drmP.h 2010-04-04 20:46:41.673688119 -0400 43932+++ linux-2.6.32.12/include/drm/drmP.h 2010-04-04 20:46:41.673688119 -0400
43436@@ -814,7 +814,7 @@ struct drm_driver { 43933@@ -814,7 +814,7 @@ struct drm_driver {
43437 void (*vgaarb_irq)(struct drm_device *dev, bool state); 43934 void (*vgaarb_irq)(struct drm_device *dev, bool state);
43438 43935
@@ -43460,9 +43957,9 @@ diff -urNp linux-2.6.32.11/include/drm/drmP.h linux-2.6.32.11/include/drm/drmP.h
43460 /*@} */ 43957 /*@} */
43461 43958
43462 struct list_head filelist; 43959 struct list_head filelist;
43463diff -urNp linux-2.6.32.11/include/linux/a.out.h linux-2.6.32.11/include/linux/a.out.h 43960diff -urNp linux-2.6.32.12/include/linux/a.out.h linux-2.6.32.12/include/linux/a.out.h
43464--- linux-2.6.32.11/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400 43961--- linux-2.6.32.12/include/linux/a.out.h 2010-03-15 11:52:04.000000000 -0400
43465+++ linux-2.6.32.11/include/linux/a.out.h 2010-04-04 20:46:41.673688119 -0400 43962+++ linux-2.6.32.12/include/linux/a.out.h 2010-04-04 20:46:41.673688119 -0400
43466@@ -39,6 +39,14 @@ enum machine_type { 43963@@ -39,6 +39,14 @@ enum machine_type {
43467 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ 43964 M_MIPS2 = 152 /* MIPS R6000/R4000 binary */
43468 }; 43965 };
@@ -43478,9 +43975,9 @@ diff -urNp linux-2.6.32.11/include/linux/a.out.h linux-2.6.32.11/include/linux/a
43478 #if !defined (N_MAGIC) 43975 #if !defined (N_MAGIC)
43479 #define N_MAGIC(exec) ((exec).a_info & 0xffff) 43976 #define N_MAGIC(exec) ((exec).a_info & 0xffff)
43480 #endif 43977 #endif
43481diff -urNp linux-2.6.32.11/include/linux/atmdev.h linux-2.6.32.11/include/linux/atmdev.h 43978diff -urNp linux-2.6.32.12/include/linux/atmdev.h linux-2.6.32.12/include/linux/atmdev.h
43482--- linux-2.6.32.11/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400 43979--- linux-2.6.32.12/include/linux/atmdev.h 2010-03-15 11:52:04.000000000 -0400
43483+++ linux-2.6.32.11/include/linux/atmdev.h 2010-04-04 20:46:41.673688119 -0400 43980+++ linux-2.6.32.12/include/linux/atmdev.h 2010-04-04 20:46:41.673688119 -0400
43484@@ -237,7 +237,7 @@ struct compat_atm_iobuf { 43981@@ -237,7 +237,7 @@ struct compat_atm_iobuf {
43485 #endif 43982 #endif
43486 43983
@@ -43490,9 +43987,9 @@ diff -urNp linux-2.6.32.11/include/linux/atmdev.h linux-2.6.32.11/include/linux/
43490 __AAL_STAT_ITEMS 43987 __AAL_STAT_ITEMS
43491 #undef __HANDLE_ITEM 43988 #undef __HANDLE_ITEM
43492 }; 43989 };
43493diff -urNp linux-2.6.32.11/include/linux/backlight.h linux-2.6.32.11/include/linux/backlight.h 43990diff -urNp linux-2.6.32.12/include/linux/backlight.h linux-2.6.32.12/include/linux/backlight.h
43494--- linux-2.6.32.11/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400 43991--- linux-2.6.32.12/include/linux/backlight.h 2010-03-15 11:52:04.000000000 -0400
43495+++ linux-2.6.32.11/include/linux/backlight.h 2010-04-04 20:46:41.673688119 -0400 43992+++ linux-2.6.32.12/include/linux/backlight.h 2010-04-04 20:46:41.673688119 -0400
43496@@ -36,18 +36,18 @@ struct backlight_device; 43993@@ -36,18 +36,18 @@ struct backlight_device;
43497 struct fb_info; 43994 struct fb_info;
43498 43995
@@ -43534,9 +44031,9 @@ diff -urNp linux-2.6.32.11/include/linux/backlight.h linux-2.6.32.11/include/lin
43534 extern void backlight_device_unregister(struct backlight_device *bd); 44031 extern void backlight_device_unregister(struct backlight_device *bd);
43535 extern void backlight_force_update(struct backlight_device *bd, 44032 extern void backlight_force_update(struct backlight_device *bd,
43536 enum backlight_update_reason reason); 44033 enum backlight_update_reason reason);
43537diff -urNp linux-2.6.32.11/include/linux/binfmts.h linux-2.6.32.11/include/linux/binfmts.h 44034diff -urNp linux-2.6.32.12/include/linux/binfmts.h linux-2.6.32.12/include/linux/binfmts.h
43538--- linux-2.6.32.11/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400 44035--- linux-2.6.32.12/include/linux/binfmts.h 2010-03-15 11:52:04.000000000 -0400
43539+++ linux-2.6.32.11/include/linux/binfmts.h 2010-04-04 20:46:41.673688119 -0400 44036+++ linux-2.6.32.12/include/linux/binfmts.h 2010-04-04 20:46:41.673688119 -0400
43540@@ -78,6 +78,7 @@ struct linux_binfmt { 44037@@ -78,6 +78,7 @@ struct linux_binfmt {
43541 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); 44038 int (*load_binary)(struct linux_binprm *, struct pt_regs * regs);
43542 int (*load_shlib)(struct file *); 44039 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
43545 unsigned long min_coredump; /* minimal dump size */ 44042 unsigned long min_coredump; /* minimal dump size */
43546 int hasvdso; 44043 int hasvdso;
43547 }; 44044 };
43548diff -urNp linux-2.6.32.11/include/linux/blkdev.h linux-2.6.32.11/include/linux/blkdev.h 44045diff -urNp linux-2.6.32.12/include/linux/blkdev.h linux-2.6.32.12/include/linux/blkdev.h
43549--- linux-2.6.32.11/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400 44046--- linux-2.6.32.12/include/linux/blkdev.h 2010-03-15 11:52:04.000000000 -0400
43550+++ linux-2.6.32.11/include/linux/blkdev.h 2010-04-04 20:46:41.673688119 -0400 44047+++ linux-2.6.32.12/include/linux/blkdev.h 2010-04-04 20:46:41.673688119 -0400
43551@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc 44048@@ -1262,19 +1262,19 @@ static inline int blk_integrity_rq(struc
43552 #endif /* CONFIG_BLK_DEV_INTEGRITY */ 44049 #endif /* CONFIG_BLK_DEV_INTEGRITY */
43553 44050
@@ -43579,9 +44076,9 @@ diff -urNp linux-2.6.32.11/include/linux/blkdev.h linux-2.6.32.11/include/linux/
43579 }; 44076 };
43580 44077
43581 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int, 44078 extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
43582diff -urNp linux-2.6.32.11/include/linux/cache.h linux-2.6.32.11/include/linux/cache.h 44079diff -urNp linux-2.6.32.12/include/linux/cache.h linux-2.6.32.12/include/linux/cache.h
43583--- linux-2.6.32.11/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400 44080--- linux-2.6.32.12/include/linux/cache.h 2010-03-15 11:52:04.000000000 -0400
43584+++ linux-2.6.32.11/include/linux/cache.h 2010-04-04 20:46:41.673688119 -0400 44081+++ linux-2.6.32.12/include/linux/cache.h 2010-04-04 20:46:41.673688119 -0400
43585@@ -16,6 +16,10 @@ 44082@@ -16,6 +16,10 @@
43586 #define __read_mostly 44083 #define __read_mostly
43587 #endif 44084 #endif
@@ -43593,9 +44090,9 @@ diff -urNp linux-2.6.32.11/include/linux/cache.h linux-2.6.32.11/include/linux/c
43593 #ifndef ____cacheline_aligned 44090 #ifndef ____cacheline_aligned
43594 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) 44091 #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
43595 #endif 44092 #endif
43596diff -urNp linux-2.6.32.11/include/linux/capability.h linux-2.6.32.11/include/linux/capability.h 44093diff -urNp linux-2.6.32.12/include/linux/capability.h linux-2.6.32.12/include/linux/capability.h
43597--- linux-2.6.32.11/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400 44094--- linux-2.6.32.12/include/linux/capability.h 2010-03-15 11:52:04.000000000 -0400
43598+++ linux-2.6.32.11/include/linux/capability.h 2010-04-04 20:46:41.673688119 -0400 44095+++ linux-2.6.32.12/include/linux/capability.h 2010-04-04 20:46:41.673688119 -0400
43599@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff 44096@@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff
43600 (security_real_capable_noaudit((t), (cap)) == 0) 44097 (security_real_capable_noaudit((t), (cap)) == 0)
43601 44098
@@ -43604,9 +44101,9 @@ diff -urNp linux-2.6.32.11/include/linux/capability.h linux-2.6.32.11/include/li
43604 44101
43605 /* audit system wants to get cap info from files as well */ 44102 /* audit system wants to get cap info from files as well */
43606 struct dentry; 44103 struct dentry;
43607diff -urNp linux-2.6.32.11/include/linux/compiler-gcc4.h linux-2.6.32.11/include/linux/compiler-gcc4.h 44104diff -urNp linux-2.6.32.12/include/linux/compiler-gcc4.h linux-2.6.32.12/include/linux/compiler-gcc4.h
43608--- linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400 44105--- linux-2.6.32.12/include/linux/compiler-gcc4.h 2010-03-15 11:52:04.000000000 -0400
43609+++ linux-2.6.32.11/include/linux/compiler-gcc4.h 2010-04-04 20:46:41.673688119 -0400 44106+++ linux-2.6.32.12/include/linux/compiler-gcc4.h 2010-04-04 20:46:41.673688119 -0400
43610@@ -36,4 +36,8 @@ 44107@@ -36,4 +36,8 @@
43611 the kernel context */ 44108 the kernel context */
43612 #define __cold __attribute__((__cold__)) 44109 #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
43616+#define __bos0(ptr) __bos((ptr), 0) 44113+#define __bos0(ptr) __bos((ptr), 0)
43617+#define __bos1(ptr) __bos((ptr), 1) 44114+#define __bos1(ptr) __bos((ptr), 1)
43618 #endif 44115 #endif
43619diff -urNp linux-2.6.32.11/include/linux/compiler.h linux-2.6.32.11/include/linux/compiler.h 44116diff -urNp linux-2.6.32.12/include/linux/compiler.h linux-2.6.32.12/include/linux/compiler.h
43620--- linux-2.6.32.11/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400 44117--- linux-2.6.32.12/include/linux/compiler.h 2010-03-15 11:52:04.000000000 -0400
43621+++ linux-2.6.32.11/include/linux/compiler.h 2010-04-04 20:46:41.673688119 -0400 44118+++ linux-2.6.32.12/include/linux/compiler.h 2010-04-04 20:46:41.673688119 -0400
43622@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_ 44119@@ -256,6 +256,22 @@ void ftrace_likely_update(struct ftrace_
43623 #define __cold 44120 #define __cold
43624 #endif 44121 #endif
@@ -43642,9 +44139,9 @@ diff -urNp linux-2.6.32.11/include/linux/compiler.h linux-2.6.32.11/include/linu
43642 /* Simple shorthand for a section definition */ 44139 /* Simple shorthand for a section definition */
43643 #ifndef __section 44140 #ifndef __section
43644 # define __section(S) __attribute__ ((__section__(#S))) 44141 # define __section(S) __attribute__ ((__section__(#S)))
43645diff -urNp linux-2.6.32.11/include/linux/decompress/mm.h linux-2.6.32.11/include/linux/decompress/mm.h 44142diff -urNp linux-2.6.32.12/include/linux/decompress/mm.h linux-2.6.32.12/include/linux/decompress/mm.h
43646--- linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400 44143--- linux-2.6.32.12/include/linux/decompress/mm.h 2010-04-04 20:41:50.048452804 -0400
43647+++ linux-2.6.32.11/include/linux/decompress/mm.h 2010-04-04 20:46:41.673688119 -0400 44144+++ linux-2.6.32.12/include/linux/decompress/mm.h 2010-04-04 20:46:41.673688119 -0400
43648@@ -78,7 +78,7 @@ static void free(void *where) 44145@@ -78,7 +78,7 @@ static void free(void *where)
43649 * warnings when not needed (indeed large_malloc / large_free are not 44146 * warnings when not needed (indeed large_malloc / large_free are not
43650 * needed by inflate */ 44147 * 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
43654 #define free(a) kfree(a) 44151 #define free(a) kfree(a)
43655 44152
43656 #define large_malloc(a) vmalloc(a) 44153 #define large_malloc(a) vmalloc(a)
43657diff -urNp linux-2.6.32.11/include/linux/dma-mapping.h linux-2.6.32.11/include/linux/dma-mapping.h 44154diff -urNp linux-2.6.32.12/include/linux/dma-mapping.h linux-2.6.32.12/include/linux/dma-mapping.h
43658--- linux-2.6.32.11/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400 44155--- linux-2.6.32.12/include/linux/dma-mapping.h 2010-03-15 11:52:04.000000000 -0400
43659+++ linux-2.6.32.11/include/linux/dma-mapping.h 2010-04-04 20:46:41.673688119 -0400 44156+++ linux-2.6.32.12/include/linux/dma-mapping.h 2010-04-04 20:46:41.673688119 -0400
43660@@ -16,50 +16,50 @@ enum dma_data_direction { 44157@@ -16,50 +16,50 @@ enum dma_data_direction {
43661 }; 44158 };
43662 44159
@@ -43723,9 +44220,9 @@ diff -urNp linux-2.6.32.11/include/linux/dma-mapping.h linux-2.6.32.11/include/l
43723 }; 44220 };
43724 44221
43725 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1)) 44222 #define DMA_BIT_MASK(n) (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
43726diff -urNp linux-2.6.32.11/include/linux/dst.h linux-2.6.32.11/include/linux/dst.h 44223diff -urNp linux-2.6.32.12/include/linux/dst.h linux-2.6.32.12/include/linux/dst.h
43727--- linux-2.6.32.11/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400 44224--- linux-2.6.32.12/include/linux/dst.h 2010-03-15 11:52:04.000000000 -0400
43728+++ linux-2.6.32.11/include/linux/dst.h 2010-04-04 20:46:41.673688119 -0400 44225+++ linux-2.6.32.12/include/linux/dst.h 2010-04-04 20:46:41.673688119 -0400
43729@@ -380,7 +380,7 @@ struct dst_node 44226@@ -380,7 +380,7 @@ struct dst_node
43730 struct thread_pool *pool; 44227 struct thread_pool *pool;
43731 44228
@@ -43735,9 +44232,9 @@ diff -urNp linux-2.6.32.11/include/linux/dst.h linux-2.6.32.11/include/linux/dst
43735 44232
43736 /* 44233 /*
43737 * How frequently and how many times transaction 44234 * How frequently and how many times transaction
43738diff -urNp linux-2.6.32.11/include/linux/elf.h linux-2.6.32.11/include/linux/elf.h 44235diff -urNp linux-2.6.32.12/include/linux/elf.h linux-2.6.32.12/include/linux/elf.h
43739--- linux-2.6.32.11/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400 44236--- linux-2.6.32.12/include/linux/elf.h 2010-03-15 11:52:04.000000000 -0400
43740+++ linux-2.6.32.11/include/linux/elf.h 2010-04-04 20:46:41.673688119 -0400 44237+++ linux-2.6.32.12/include/linux/elf.h 2010-04-04 20:46:41.673688119 -0400
43741@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; 44238@@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword;
43742 #define PT_GNU_EH_FRAME 0x6474e550 44239 #define PT_GNU_EH_FRAME 0x6474e550
43743 44240
@@ -43810,9 +44307,9 @@ diff -urNp linux-2.6.32.11/include/linux/elf.h linux-2.6.32.11/include/linux/elf
43810 44307
43811 #endif 44308 #endif
43812 44309
43813diff -urNp linux-2.6.32.11/include/linux/fs.h linux-2.6.32.11/include/linux/fs.h 44310diff -urNp linux-2.6.32.12/include/linux/fs.h linux-2.6.32.12/include/linux/fs.h
43814--- linux-2.6.32.11/include/linux/fs.h 2010-03-15 11:52:04.000000000 -0400 44311--- linux-2.6.32.12/include/linux/fs.h 2010-04-29 17:49:38.529851956 -0400
43815+++ linux-2.6.32.11/include/linux/fs.h 2010-04-04 20:46:41.677383221 -0400 44312+++ linux-2.6.32.12/include/linux/fs.h 2010-04-29 17:49:58.621028174 -0400
43816@@ -90,6 +90,11 @@ struct inodes_stat_t { 44313@@ -90,6 +90,11 @@ struct inodes_stat_t {
43817 /* Expect random access pattern */ 44314 /* Expect random access pattern */
43818 #define FMODE_RANDOM ((__force fmode_t)4096) 44315 #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
43974 }; 44471 };
43975 44472
43976 /* 44473 /*
43977diff -urNp linux-2.6.32.11/include/linux/fs_struct.h linux-2.6.32.11/include/linux/fs_struct.h 44474diff -urNp linux-2.6.32.12/include/linux/fs_struct.h linux-2.6.32.12/include/linux/fs_struct.h
43978--- linux-2.6.32.11/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400 44475--- linux-2.6.32.12/include/linux/fs_struct.h 2010-03-15 11:52:04.000000000 -0400
43979+++ linux-2.6.32.11/include/linux/fs_struct.h 2010-04-04 20:46:41.677383221 -0400 44476+++ linux-2.6.32.12/include/linux/fs_struct.h 2010-04-04 20:46:41.677383221 -0400
43980@@ -4,7 +4,7 @@ 44477@@ -4,7 +4,7 @@
43981 #include <linux/path.h> 44478 #include <linux/path.h>
43982 44479
@@ -43986,9 +44483,9 @@ diff -urNp linux-2.6.32.11/include/linux/fs_struct.h linux-2.6.32.11/include/lin
43986 rwlock_t lock; 44483 rwlock_t lock;
43987 int umask; 44484 int umask;
43988 int in_exec; 44485 int in_exec;
43989diff -urNp linux-2.6.32.11/include/linux/genhd.h linux-2.6.32.11/include/linux/genhd.h 44486diff -urNp linux-2.6.32.12/include/linux/genhd.h linux-2.6.32.12/include/linux/genhd.h
43990--- linux-2.6.32.11/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400 44487--- linux-2.6.32.12/include/linux/genhd.h 2010-03-15 11:52:04.000000000 -0400
43991+++ linux-2.6.32.11/include/linux/genhd.h 2010-04-04 20:46:41.677383221 -0400 44488+++ linux-2.6.32.12/include/linux/genhd.h 2010-04-04 20:46:41.677383221 -0400
43992@@ -161,7 +161,7 @@ struct gendisk { 44489@@ -161,7 +161,7 @@ struct gendisk {
43993 44490
43994 struct timer_rand_state *random; 44491 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
43998 struct work_struct async_notify; 44495 struct work_struct async_notify;
43999 #ifdef CONFIG_BLK_DEV_INTEGRITY 44496 #ifdef CONFIG_BLK_DEV_INTEGRITY
44000 struct blk_integrity *integrity; 44497 struct blk_integrity *integrity;
44001diff -urNp linux-2.6.32.11/include/linux/gracl.h linux-2.6.32.11/include/linux/gracl.h 44498diff -urNp linux-2.6.32.12/include/linux/gracl.h linux-2.6.32.12/include/linux/gracl.h
44002--- linux-2.6.32.11/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 44499--- linux-2.6.32.12/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500
44003+++ linux-2.6.32.11/include/linux/gracl.h 2010-04-04 20:46:41.677383221 -0400 44500+++ linux-2.6.32.12/include/linux/gracl.h 2010-04-04 20:46:41.677383221 -0400
44004@@ -0,0 +1,309 @@ 44501@@ -0,0 +1,309 @@
44005+#ifndef GR_ACL_H 44502+#ifndef GR_ACL_H
44006+#define GR_ACL_H 44503+#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
44311+ 44808+
44312+#endif 44809+#endif
44313+ 44810+
44314diff -urNp linux-2.6.32.11/include/linux/gralloc.h linux-2.6.32.11/include/linux/gralloc.h 44811diff -urNp linux-2.6.32.12/include/linux/gralloc.h linux-2.6.32.12/include/linux/gralloc.h
44315--- linux-2.6.32.11/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 44812--- linux-2.6.32.12/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500
44316+++ linux-2.6.32.11/include/linux/gralloc.h 2010-04-04 20:46:41.677383221 -0400 44813+++ linux-2.6.32.12/include/linux/gralloc.h 2010-04-04 20:46:41.677383221 -0400
44317@@ -0,0 +1,9 @@ 44814@@ -0,0 +1,9 @@
44318+#ifndef __GRALLOC_H 44815+#ifndef __GRALLOC_H
44319+#define __GRALLOC_H 44816+#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
44324+void *acl_alloc_num(unsigned long num, unsigned long len); 44821+void *acl_alloc_num(unsigned long num, unsigned long len);
44325+ 44822+
44326+#endif 44823+#endif
44327diff -urNp linux-2.6.32.11/include/linux/grdefs.h linux-2.6.32.11/include/linux/grdefs.h 44824diff -urNp linux-2.6.32.12/include/linux/grdefs.h linux-2.6.32.12/include/linux/grdefs.h
44328--- linux-2.6.32.11/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 44825--- linux-2.6.32.12/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
44329+++ linux-2.6.32.11/include/linux/grdefs.h 2010-04-04 20:46:41.677383221 -0400 44826+++ linux-2.6.32.12/include/linux/grdefs.h 2010-04-04 20:46:41.677383221 -0400
44330@@ -0,0 +1,136 @@ 44827@@ -0,0 +1,136 @@
44331+#ifndef GRDEFS_H 44828+#ifndef GRDEFS_H
44332+#define GRDEFS_H 44829+#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/
44464+}; 44961+};
44465+ 44962+
44466+#endif 44963+#endif
44467diff -urNp linux-2.6.32.11/include/linux/grinternal.h linux-2.6.32.11/include/linux/grinternal.h 44964diff -urNp linux-2.6.32.12/include/linux/grinternal.h linux-2.6.32.12/include/linux/grinternal.h
44468--- linux-2.6.32.11/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 44965--- linux-2.6.32.12/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500
44469+++ linux-2.6.32.11/include/linux/grinternal.h 2010-04-04 20:46:41.677383221 -0400 44966+++ linux-2.6.32.12/include/linux/grinternal.h 2010-04-04 20:46:41.677383221 -0400
44470@@ -0,0 +1,215 @@ 44967@@ -0,0 +1,215 @@
44471+#ifndef __GRINTERNAL_H 44968+#ifndef __GRINTERNAL_H
44472+#define __GRINTERNAL_H 44969+#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
44683+#endif 45180+#endif
44684+ 45181+
44685+#endif 45182+#endif
44686diff -urNp linux-2.6.32.11/include/linux/grmsg.h linux-2.6.32.11/include/linux/grmsg.h 45183diff -urNp linux-2.6.32.12/include/linux/grmsg.h linux-2.6.32.12/include/linux/grmsg.h
44687--- linux-2.6.32.11/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 45184--- linux-2.6.32.12/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500
44688+++ linux-2.6.32.11/include/linux/grmsg.h 2010-04-04 20:46:41.677383221 -0400 45185+++ linux-2.6.32.12/include/linux/grmsg.h 2010-04-04 20:46:41.677383221 -0400
44689@@ -0,0 +1,107 @@ 45186@@ -0,0 +1,107 @@
44690+#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" 45187+#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"
44691+#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" 45188+#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
44794+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by " 45291+#define GR_NONROOT_MODLOAD_MSG "denied kernel module auto-load of %.64s by "
44795+#define GR_VM86_MSG "denied use of vm86 by " 45292+#define GR_VM86_MSG "denied use of vm86 by "
44796+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by " 45293+#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
44797diff -urNp linux-2.6.32.11/include/linux/grsecurity.h linux-2.6.32.11/include/linux/grsecurity.h 45294diff -urNp linux-2.6.32.12/include/linux/grsecurity.h linux-2.6.32.12/include/linux/grsecurity.h
44798--- linux-2.6.32.11/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 45295--- linux-2.6.32.12/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500
44799+++ linux-2.6.32.11/include/linux/grsecurity.h 2010-04-04 20:46:41.677383221 -0400 45296+++ linux-2.6.32.12/include/linux/grsecurity.h 2010-04-04 20:46:41.677383221 -0400
44800@@ -0,0 +1,199 @@ 45297@@ -0,0 +1,199 @@
44801+#ifndef GR_SECURITY_H 45298+#ifndef GR_SECURITY_H
44802+#define GR_SECURITY_H 45299+#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
44997+#endif 45494+#endif
44998+ 45495+
44999+#endif 45496+#endif
45000diff -urNp linux-2.6.32.11/include/linux/hdpu_features.h linux-2.6.32.11/include/linux/hdpu_features.h 45497diff -urNp linux-2.6.32.12/include/linux/hdpu_features.h linux-2.6.32.12/include/linux/hdpu_features.h
45001--- linux-2.6.32.11/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400 45498--- linux-2.6.32.12/include/linux/hdpu_features.h 2010-03-15 11:52:04.000000000 -0400
45002+++ linux-2.6.32.11/include/linux/hdpu_features.h 2010-04-04 20:46:41.677383221 -0400 45499+++ linux-2.6.32.12/include/linux/hdpu_features.h 2010-04-04 20:46:41.677383221 -0400
45003@@ -3,7 +3,7 @@ 45500@@ -3,7 +3,7 @@
45004 struct cpustate_t { 45501 struct cpustate_t {
45005 spinlock_t lock; 45502 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
45009 unsigned char cached_val; 45506 unsigned char cached_val;
45010 int inited; 45507 int inited;
45011 unsigned long *set_addr; 45508 unsigned long *set_addr;
45012diff -urNp linux-2.6.32.11/include/linux/highmem.h linux-2.6.32.11/include/linux/highmem.h 45509diff -urNp linux-2.6.32.12/include/linux/highmem.h linux-2.6.32.12/include/linux/highmem.h
45013--- linux-2.6.32.11/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400 45510--- linux-2.6.32.12/include/linux/highmem.h 2010-03-15 11:52:04.000000000 -0400
45014+++ linux-2.6.32.11/include/linux/highmem.h 2010-04-04 20:46:41.677383221 -0400 45511+++ linux-2.6.32.12/include/linux/highmem.h 2010-04-04 20:46:41.677383221 -0400
45015@@ -137,6 +137,18 @@ static inline void clear_highpage(struct 45512@@ -137,6 +137,18 @@ static inline void clear_highpage(struct
45016 kunmap_atomic(kaddr, KM_USER0); 45513 kunmap_atomic(kaddr, KM_USER0);
45017 } 45514 }
@@ -45031,9 +45528,9 @@ diff -urNp linux-2.6.32.11/include/linux/highmem.h linux-2.6.32.11/include/linux
45031 static inline void zero_user_segments(struct page *page, 45528 static inline void zero_user_segments(struct page *page,
45032 unsigned start1, unsigned end1, 45529 unsigned start1, unsigned end1,
45033 unsigned start2, unsigned end2) 45530 unsigned start2, unsigned end2)
45034diff -urNp linux-2.6.32.11/include/linux/init_task.h linux-2.6.32.11/include/linux/init_task.h 45531diff -urNp linux-2.6.32.12/include/linux/init_task.h linux-2.6.32.12/include/linux/init_task.h
45035--- linux-2.6.32.11/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400 45532--- linux-2.6.32.12/include/linux/init_task.h 2010-03-15 11:52:04.000000000 -0400
45036+++ linux-2.6.32.11/include/linux/init_task.h 2010-04-04 20:46:41.677383221 -0400 45533+++ linux-2.6.32.12/include/linux/init_task.h 2010-04-04 20:46:41.677383221 -0400
45037@@ -115,6 +115,13 @@ extern struct cred init_cred; 45534@@ -115,6 +115,13 @@ extern struct cred init_cred;
45038 # define INIT_PERF_EVENTS(tsk) 45535 # define INIT_PERF_EVENTS(tsk)
45039 #endif 45536 #endif
@@ -45056,9 +45553,9 @@ diff -urNp linux-2.6.32.11/include/linux/init_task.h linux-2.6.32.11/include/lin
45056 } 45553 }
45057 45554
45058 45555
45059diff -urNp linux-2.6.32.11/include/linux/interrupt.h linux-2.6.32.11/include/linux/interrupt.h 45556diff -urNp linux-2.6.32.12/include/linux/interrupt.h linux-2.6.32.12/include/linux/interrupt.h
45060--- linux-2.6.32.11/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400 45557--- linux-2.6.32.12/include/linux/interrupt.h 2010-03-15 11:52:04.000000000 -0400
45061+++ linux-2.6.32.11/include/linux/interrupt.h 2010-04-04 20:46:41.677383221 -0400 45558+++ linux-2.6.32.12/include/linux/interrupt.h 2010-04-04 20:46:41.677383221 -0400
45062@@ -357,7 +357,7 @@ enum 45559@@ -357,7 +357,7 @@ enum
45063 /* map softirq index to softirq name. update 'softirq_to_name' in 45560 /* map softirq index to softirq name. update 'softirq_to_name' in
45064 * kernel/softirq.c when adding a new softirq. 45561 * 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
45083 extern void softirq_init(void); 45580 extern void softirq_init(void);
45084 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0) 45581 #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
45085 extern void raise_softirq_irqoff(unsigned int nr); 45582 extern void raise_softirq_irqoff(unsigned int nr);
45086diff -urNp linux-2.6.32.11/include/linux/jbd2.h linux-2.6.32.11/include/linux/jbd2.h 45583diff -urNp linux-2.6.32.12/include/linux/jbd2.h linux-2.6.32.12/include/linux/jbd2.h
45087--- linux-2.6.32.11/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400 45584--- linux-2.6.32.12/include/linux/jbd2.h 2010-03-15 11:52:04.000000000 -0400
45088+++ linux-2.6.32.11/include/linux/jbd2.h 2010-04-04 20:46:41.677383221 -0400 45585+++ linux-2.6.32.12/include/linux/jbd2.h 2010-04-04 20:46:41.677383221 -0400
45089@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; 45586@@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug;
45090 } \ 45587 } \
45091 } while (0) 45588 } 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
45095 #endif 45592 #endif
45096 45593
45097 static inline void *jbd2_alloc(size_t size, gfp_t flags) 45594 static inline void *jbd2_alloc(size_t size, gfp_t flags)
45098diff -urNp linux-2.6.32.11/include/linux/jbd.h linux-2.6.32.11/include/linux/jbd.h 45595diff -urNp linux-2.6.32.12/include/linux/jbd.h linux-2.6.32.12/include/linux/jbd.h
45099--- linux-2.6.32.11/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400 45596--- linux-2.6.32.12/include/linux/jbd.h 2010-03-15 11:52:04.000000000 -0400
45100+++ linux-2.6.32.11/include/linux/jbd.h 2010-04-04 20:46:41.677383221 -0400 45597+++ linux-2.6.32.12/include/linux/jbd.h 2010-04-04 20:46:41.677383221 -0400
45101@@ -66,7 +66,7 @@ extern u8 journal_enable_debug; 45598@@ -66,7 +66,7 @@ extern u8 journal_enable_debug;
45102 } \ 45599 } \
45103 } while (0) 45600 } 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
45107 #endif 45604 #endif
45108 45605
45109 static inline void *jbd_alloc(size_t size, gfp_t flags) 45606 static inline void *jbd_alloc(size_t size, gfp_t flags)
45110diff -urNp linux-2.6.32.11/include/linux/kallsyms.h linux-2.6.32.11/include/linux/kallsyms.h 45607diff -urNp linux-2.6.32.12/include/linux/kallsyms.h linux-2.6.32.12/include/linux/kallsyms.h
45111--- linux-2.6.32.11/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400 45608--- linux-2.6.32.12/include/linux/kallsyms.h 2010-03-15 11:52:04.000000000 -0400
45112+++ linux-2.6.32.11/include/linux/kallsyms.h 2010-04-04 20:46:41.677383221 -0400 45609+++ linux-2.6.32.12/include/linux/kallsyms.h 2010-04-04 20:46:41.677383221 -0400
45113@@ -15,7 +15,8 @@ 45610@@ -15,7 +15,8 @@
45114 45611
45115 struct module; 45612 struct module;
@@ -45130,9 +45627,9 @@ diff -urNp linux-2.6.32.11/include/linux/kallsyms.h linux-2.6.32.11/include/linu
45130 45627
45131 /* This macro allows us to keep printk typechecking */ 45628 /* This macro allows us to keep printk typechecking */
45132 static void __check_printsym_format(const char *fmt, ...) 45629 static void __check_printsym_format(const char *fmt, ...)
45133diff -urNp linux-2.6.32.11/include/linux/kgdb.h linux-2.6.32.11/include/linux/kgdb.h 45630diff -urNp linux-2.6.32.12/include/linux/kgdb.h linux-2.6.32.12/include/linux/kgdb.h
45134--- linux-2.6.32.11/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400 45631--- linux-2.6.32.12/include/linux/kgdb.h 2010-03-15 11:52:04.000000000 -0400
45135+++ linux-2.6.32.11/include/linux/kgdb.h 2010-04-04 20:46:41.677383221 -0400 45632+++ linux-2.6.32.12/include/linux/kgdb.h 2010-04-04 20:46:41.677383221 -0400
45136@@ -251,20 +251,20 @@ struct kgdb_arch { 45633@@ -251,20 +251,20 @@ struct kgdb_arch {
45137 */ 45634 */
45138 struct kgdb_io { 45635 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
45163 45660
45164 extern int kgdb_hex2long(char **ptr, unsigned long *long_val); 45661 extern int kgdb_hex2long(char **ptr, unsigned long *long_val);
45165 extern int kgdb_mem2hex(char *mem, char *buf, int count); 45662 extern int kgdb_mem2hex(char *mem, char *buf, int count);
45166diff -urNp linux-2.6.32.11/include/linux/kobject.h linux-2.6.32.11/include/linux/kobject.h 45663diff -urNp linux-2.6.32.12/include/linux/kobject.h linux-2.6.32.12/include/linux/kobject.h
45167--- linux-2.6.32.11/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400 45664--- linux-2.6.32.12/include/linux/kobject.h 2010-03-15 11:52:04.000000000 -0400
45168+++ linux-2.6.32.11/include/linux/kobject.h 2010-04-04 20:46:41.677383221 -0400 45665+++ linux-2.6.32.12/include/linux/kobject.h 2010-04-04 20:46:41.677383221 -0400
45169@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob 45666@@ -106,7 +106,7 @@ extern char *kobject_get_path(struct kob
45170 45667
45171 struct kobj_type { 45668 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
45214 struct kobject *parent_kobj); 45711 struct kobject *parent_kobj);
45215 45712
45216 static inline struct kset *to_kset(struct kobject *kobj) 45713 static inline struct kset *to_kset(struct kobject *kobj)
45217diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linux/kvm_host.h 45714diff -urNp linux-2.6.32.12/include/linux/kvm_host.h linux-2.6.32.12/include/linux/kvm_host.h
45218--- linux-2.6.32.11/include/linux/kvm_host.h 2010-03-15 11:52:04.000000000 -0400 45715--- linux-2.6.32.12/include/linux/kvm_host.h 2010-04-29 17:49:38.529851956 -0400
45219+++ linux-2.6.32.11/include/linux/kvm_host.h 2010-04-04 20:46:41.677383221 -0400 45716+++ linux-2.6.32.12/include/linux/kvm_host.h 2010-04-29 17:49:58.621028174 -0400
45220@@ -205,7 +205,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc 45717@@ -210,7 +210,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
45221 void vcpu_load(struct kvm_vcpu *vcpu); 45718 void vcpu_load(struct kvm_vcpu *vcpu);
45222 void vcpu_put(struct kvm_vcpu *vcpu); 45719 void vcpu_put(struct kvm_vcpu *vcpu);
45223 45720
@@ -45226,7 +45723,7 @@ diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linu
45226 struct module *module); 45723 struct module *module);
45227 void kvm_exit(void); 45724 void kvm_exit(void);
45228 45725
45229@@ -311,7 +311,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug( 45726@@ -316,7 +316,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(
45230 struct kvm_guest_debug *dbg); 45727 struct kvm_guest_debug *dbg);
45231 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run); 45728 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run);
45232 45729
@@ -45235,9 +45732,9 @@ diff -urNp linux-2.6.32.11/include/linux/kvm_host.h linux-2.6.32.11/include/linu
45235 void kvm_arch_exit(void); 45732 void kvm_arch_exit(void);
45236 45733
45237 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); 45734 int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
45238diff -urNp linux-2.6.32.11/include/linux/libata.h linux-2.6.32.11/include/linux/libata.h 45735diff -urNp linux-2.6.32.12/include/linux/libata.h linux-2.6.32.12/include/linux/libata.h
45239--- linux-2.6.32.11/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400 45736--- linux-2.6.32.12/include/linux/libata.h 2010-03-15 11:52:04.000000000 -0400
45240+++ linux-2.6.32.11/include/linux/libata.h 2010-04-04 20:46:41.677383221 -0400 45737+++ linux-2.6.32.12/include/linux/libata.h 2010-04-04 20:46:41.677383221 -0400
45241@@ -64,11 +64,11 @@ 45738@@ -64,11 +64,11 @@
45242 #ifdef ATA_VERBOSE_DEBUG 45739 #ifdef ATA_VERBOSE_DEBUG
45243 #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) 45740 #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/
45303 extern int ata_scsi_detect(struct scsi_host_template *sht); 45800 extern int ata_scsi_detect(struct scsi_host_template *sht);
45304 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg); 45801 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
45305 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *)); 45802 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
45306diff -urNp linux-2.6.32.11/include/linux/lockd/bind.h linux-2.6.32.11/include/linux/lockd/bind.h 45803diff -urNp linux-2.6.32.12/include/linux/lockd/bind.h linux-2.6.32.12/include/linux/lockd/bind.h
45307--- linux-2.6.32.11/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400 45804--- linux-2.6.32.12/include/linux/lockd/bind.h 2010-03-15 11:52:04.000000000 -0400
45308+++ linux-2.6.32.11/include/linux/lockd/bind.h 2010-04-04 20:46:41.681061354 -0400 45805+++ linux-2.6.32.12/include/linux/lockd/bind.h 2010-04-04 20:46:41.681061354 -0400
45309@@ -23,13 +23,13 @@ struct svc_rqst; 45806@@ -23,13 +23,13 @@ struct svc_rqst;
45310 * This is the set of functions for lockd->nfsd communication 45807 * This is the set of functions for lockd->nfsd communication
45311 */ 45808 */
@@ -45323,9 +45820,9 @@ diff -urNp linux-2.6.32.11/include/linux/lockd/bind.h linux-2.6.32.11/include/li
45323 45820
45324 /* 45821 /*
45325 * Similar to nfs_client_initdata, but without the NFS-specific 45822 * Similar to nfs_client_initdata, but without the NFS-specific
45326diff -urNp linux-2.6.32.11/include/linux/mm.h linux-2.6.32.11/include/linux/mm.h 45823diff -urNp linux-2.6.32.12/include/linux/mm.h linux-2.6.32.12/include/linux/mm.h
45327--- linux-2.6.32.11/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400 45824--- linux-2.6.32.12/include/linux/mm.h 2010-03-15 11:52:04.000000000 -0400
45328+++ linux-2.6.32.11/include/linux/mm.h 2010-04-04 20:46:41.681061354 -0400 45825+++ linux-2.6.32.12/include/linux/mm.h 2010-04-04 20:46:41.681061354 -0400
45329@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void 45826@@ -106,6 +106,10 @@ extern unsigned int kobjsize(const void
45330 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ 45827 #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */
45331 #define VM_MERGEABLE 0x80000000 /* KSM may merge identical pages */ 45828 #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
45388 45885
45389 #endif /* __KERNEL__ */ 45886 #endif /* __KERNEL__ */
45390 #endif /* _LINUX_MM_H */ 45887 #endif /* _LINUX_MM_H */
45391diff -urNp linux-2.6.32.11/include/linux/mm_types.h linux-2.6.32.11/include/linux/mm_types.h 45888diff -urNp linux-2.6.32.12/include/linux/mm_types.h linux-2.6.32.12/include/linux/mm_types.h
45392--- linux-2.6.32.11/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400 45889--- linux-2.6.32.12/include/linux/mm_types.h 2010-03-15 11:52:04.000000000 -0400
45393+++ linux-2.6.32.11/include/linux/mm_types.h 2010-04-04 20:46:41.681061354 -0400 45890+++ linux-2.6.32.12/include/linux/mm_types.h 2010-04-04 20:46:41.681061354 -0400
45394@@ -186,6 +186,8 @@ struct vm_area_struct { 45891@@ -186,6 +186,8 @@ struct vm_area_struct {
45395 #ifdef CONFIG_NUMA 45892 #ifdef CONFIG_NUMA
45396 struct mempolicy *vm_policy; /* NUMA policy for the VMA */ 45893 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
45425 }; 45922 };
45426 45923
45427 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ 45924 /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */
45428diff -urNp linux-2.6.32.11/include/linux/mmu_notifier.h linux-2.6.32.11/include/linux/mmu_notifier.h 45925diff -urNp linux-2.6.32.12/include/linux/mmu_notifier.h linux-2.6.32.12/include/linux/mmu_notifier.h
45429--- linux-2.6.32.11/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400 45926--- linux-2.6.32.12/include/linux/mmu_notifier.h 2010-03-15 11:52:04.000000000 -0400
45430+++ linux-2.6.32.11/include/linux/mmu_notifier.h 2010-04-04 20:46:41.681061354 -0400 45927+++ linux-2.6.32.12/include/linux/mmu_notifier.h 2010-04-04 20:46:41.681061354 -0400
45431@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr 45928@@ -235,12 +235,12 @@ static inline void mmu_notifier_mm_destr
45432 */ 45929 */
45433 #define ptep_clear_flush_notify(__vma, __address, __ptep) \ 45930 #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/
45444 }) 45941 })
45445 45942
45446 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \ 45943 #define ptep_clear_flush_young_notify(__vma, __address, __ptep) \
45447diff -urNp linux-2.6.32.11/include/linux/mod_devicetable.h linux-2.6.32.11/include/linux/mod_devicetable.h 45944diff -urNp linux-2.6.32.12/include/linux/mod_devicetable.h linux-2.6.32.12/include/linux/mod_devicetable.h
45448--- linux-2.6.32.11/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400 45945--- linux-2.6.32.12/include/linux/mod_devicetable.h 2010-03-15 11:52:04.000000000 -0400
45449+++ linux-2.6.32.11/include/linux/mod_devicetable.h 2010-04-04 20:46:41.681061354 -0400 45946+++ linux-2.6.32.12/include/linux/mod_devicetable.h 2010-04-04 20:46:41.681061354 -0400
45450@@ -12,7 +12,7 @@ 45947@@ -12,7 +12,7 @@
45451 typedef unsigned long kernel_ulong_t; 45948 typedef unsigned long kernel_ulong_t;
45452 #endif 45949 #endif
@@ -45465,9 +45962,9 @@ diff -urNp linux-2.6.32.11/include/linux/mod_devicetable.h linux-2.6.32.11/inclu
45465 45962
45466 struct hid_device_id { 45963 struct hid_device_id {
45467 __u16 bus; 45964 __u16 bus;
45468diff -urNp linux-2.6.32.11/include/linux/module.h linux-2.6.32.11/include/linux/module.h 45965diff -urNp linux-2.6.32.12/include/linux/module.h linux-2.6.32.12/include/linux/module.h
45469--- linux-2.6.32.11/include/linux/module.h 2010-03-15 11:52:04.000000000 -0400 45966--- linux-2.6.32.12/include/linux/module.h 2010-04-29 17:49:38.529851956 -0400
45470+++ linux-2.6.32.11/include/linux/module.h 2010-04-04 20:46:41.681061354 -0400 45967+++ linux-2.6.32.12/include/linux/module.h 2010-04-29 17:49:58.621028174 -0400
45471@@ -287,16 +287,16 @@ struct module 45968@@ -287,16 +287,16 @@ struct module
45472 int (*init)(void); 45969 int (*init)(void);
45473 45970
@@ -45540,9 +46037,9 @@ diff -urNp linux-2.6.32.11/include/linux/module.h linux-2.6.32.11/include/linux/
45540 } 46037 }
45541 46038
45542 /* Search for module by name: must hold module_mutex. */ 46039 /* Search for module by name: must hold module_mutex. */
45543diff -urNp linux-2.6.32.11/include/linux/moduleloader.h linux-2.6.32.11/include/linux/moduleloader.h 46040diff -urNp linux-2.6.32.12/include/linux/moduleloader.h linux-2.6.32.12/include/linux/moduleloader.h
45544--- linux-2.6.32.11/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400 46041--- linux-2.6.32.12/include/linux/moduleloader.h 2010-03-15 11:52:04.000000000 -0400
45545+++ linux-2.6.32.11/include/linux/moduleloader.h 2010-04-04 20:46:41.681061354 -0400 46042+++ linux-2.6.32.12/include/linux/moduleloader.h 2010-04-04 20:46:41.681061354 -0400
45546@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st 46043@@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
45547 sections. Returns NULL on failure. */ 46044 sections. Returns NULL on failure. */
45548 void *module_alloc(unsigned long size); 46045 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/
45565 /* Apply the given relocation to the (simplified) ELF. Return -error 46062 /* Apply the given relocation to the (simplified) ELF. Return -error
45566 or 0. */ 46063 or 0. */
45567 int apply_relocate(Elf_Shdr *sechdrs, 46064 int apply_relocate(Elf_Shdr *sechdrs,
45568diff -urNp linux-2.6.32.11/include/linux/namei.h linux-2.6.32.11/include/linux/namei.h 46065diff -urNp linux-2.6.32.12/include/linux/namei.h linux-2.6.32.12/include/linux/namei.h
45569--- linux-2.6.32.11/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400 46066--- linux-2.6.32.12/include/linux/namei.h 2010-03-15 11:52:04.000000000 -0400
45570+++ linux-2.6.32.11/include/linux/namei.h 2010-04-04 20:46:41.681061354 -0400 46067+++ linux-2.6.32.12/include/linux/namei.h 2010-04-04 20:46:41.681061354 -0400
45571@@ -22,7 +22,7 @@ struct nameidata { 46068@@ -22,7 +22,7 @@ struct nameidata {
45572 unsigned int flags; 46069 unsigned int flags;
45573 int last_type; 46070 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
45592 { 46089 {
45593 return nd->saved_names[nd->depth]; 46090 return nd->saved_names[nd->depth];
45594 } 46091 }
45595diff -urNp linux-2.6.32.11/include/linux/nodemask.h linux-2.6.32.11/include/linux/nodemask.h 46092diff -urNp linux-2.6.32.12/include/linux/nodemask.h linux-2.6.32.12/include/linux/nodemask.h
45596--- linux-2.6.32.11/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400 46093--- linux-2.6.32.12/include/linux/nodemask.h 2010-03-15 11:52:04.000000000 -0400
45597+++ linux-2.6.32.11/include/linux/nodemask.h 2010-04-04 20:46:41.681061354 -0400 46094+++ linux-2.6.32.12/include/linux/nodemask.h 2010-04-04 20:46:41.681061354 -0400
45598@@ -464,11 +464,11 @@ static inline int num_node_state(enum no 46095@@ -464,11 +464,11 @@ static inline int num_node_state(enum no
45599 46096
45600 #define any_online_node(mask) \ 46097 #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
45611 }) 46108 })
45612 46109
45613 #define num_online_nodes() num_node_state(N_ONLINE) 46110 #define num_online_nodes() num_node_state(N_ONLINE)
45614diff -urNp linux-2.6.32.11/include/linux/oprofile.h linux-2.6.32.11/include/linux/oprofile.h 46111diff -urNp linux-2.6.32.12/include/linux/oprofile.h linux-2.6.32.12/include/linux/oprofile.h
45615--- linux-2.6.32.11/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400 46112--- linux-2.6.32.12/include/linux/oprofile.h 2010-03-15 11:52:04.000000000 -0400
45616+++ linux-2.6.32.11/include/linux/oprofile.h 2010-04-04 20:46:41.681061354 -0400 46113+++ linux-2.6.32.12/include/linux/oprofile.h 2010-04-04 20:46:41.681061354 -0400
45617@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super 46114@@ -129,9 +129,9 @@ int oprofilefs_create_ulong(struct super
45618 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root, 46115 int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
45619 char const * name, ulong * val); 46116 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
45626 46123
45627 /** create a directory */ 46124 /** create a directory */
45628 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, 46125 struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
45629diff -urNp linux-2.6.32.11/include/linux/pipe_fs_i.h linux-2.6.32.11/include/linux/pipe_fs_i.h 46126diff -urNp linux-2.6.32.12/include/linux/pipe_fs_i.h linux-2.6.32.12/include/linux/pipe_fs_i.h
45630--- linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400 46127--- linux-2.6.32.12/include/linux/pipe_fs_i.h 2010-03-15 11:52:04.000000000 -0400
45631+++ linux-2.6.32.11/include/linux/pipe_fs_i.h 2010-04-04 20:46:41.681061354 -0400 46128+++ linux-2.6.32.12/include/linux/pipe_fs_i.h 2010-04-04 20:46:41.681061354 -0400
45632@@ -46,9 +46,9 @@ struct pipe_inode_info { 46129@@ -46,9 +46,9 @@ struct pipe_inode_info {
45633 wait_queue_head_t wait; 46130 wait_queue_head_t wait;
45634 unsigned int nrbufs, curbuf; 46131 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
45642 unsigned int r_counter; 46139 unsigned int r_counter;
45643 unsigned int w_counter; 46140 unsigned int w_counter;
45644 struct fasync_struct *fasync_readers; 46141 struct fasync_struct *fasync_readers;
45645diff -urNp linux-2.6.32.11/include/linux/poison.h linux-2.6.32.11/include/linux/poison.h 46142diff -urNp linux-2.6.32.12/include/linux/poison.h linux-2.6.32.12/include/linux/poison.h
45646--- linux-2.6.32.11/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400 46143--- linux-2.6.32.12/include/linux/poison.h 2010-03-15 11:52:04.000000000 -0400
45647+++ linux-2.6.32.11/include/linux/poison.h 2010-04-04 20:46:41.681061354 -0400 46144+++ linux-2.6.32.12/include/linux/poison.h 2010-04-04 20:46:41.681061354 -0400
45648@@ -7,8 +7,8 @@ 46145@@ -7,8 +7,8 @@
45649 * under normal circumstances, used to verify that nobody uses 46146 * under normal circumstances, used to verify that nobody uses
45650 * non-initialized list entries. 46147 * 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/
45656 46153
45657 /********** include/linux/timer.h **********/ 46154 /********** include/linux/timer.h **********/
45658 /* 46155 /*
45659diff -urNp linux-2.6.32.11/include/linux/proc_fs.h linux-2.6.32.11/include/linux/proc_fs.h 46156diff -urNp linux-2.6.32.12/include/linux/proc_fs.h linux-2.6.32.12/include/linux/proc_fs.h
45660--- linux-2.6.32.11/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400 46157--- linux-2.6.32.12/include/linux/proc_fs.h 2010-03-15 11:52:04.000000000 -0400
45661+++ linux-2.6.32.11/include/linux/proc_fs.h 2010-04-04 20:46:41.681061354 -0400 46158+++ linux-2.6.32.12/include/linux/proc_fs.h 2010-04-04 20:46:41.681061354 -0400
45662@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro 46159@@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
45663 return proc_create_data(name, mode, parent, proc_fops, NULL); 46160 return proc_create_data(name, mode, parent, proc_fops, NULL);
45664 } 46161 }
@@ -45679,9 +46176,9 @@ diff -urNp linux-2.6.32.11/include/linux/proc_fs.h linux-2.6.32.11/include/linux
45679 static inline struct proc_dir_entry *create_proc_read_entry(const char *name, 46176 static inline struct proc_dir_entry *create_proc_read_entry(const char *name,
45680 mode_t mode, struct proc_dir_entry *base, 46177 mode_t mode, struct proc_dir_entry *base,
45681 read_proc_t *read_proc, void * data) 46178 read_proc_t *read_proc, void * data)
45682diff -urNp linux-2.6.32.11/include/linux/random.h linux-2.6.32.11/include/linux/random.h 46179diff -urNp linux-2.6.32.12/include/linux/random.h linux-2.6.32.12/include/linux/random.h
45683--- linux-2.6.32.11/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400 46180--- linux-2.6.32.12/include/linux/random.h 2010-03-15 11:52:04.000000000 -0400
45684+++ linux-2.6.32.11/include/linux/random.h 2010-04-04 20:46:41.681061354 -0400 46181+++ linux-2.6.32.12/include/linux/random.h 2010-04-04 20:46:41.681061354 -0400
45685@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l 46182@@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l
45686 u32 random32(void); 46183 u32 random32(void);
45687 void srandom32(u32 seed); 46184 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/
45694 #endif /* __KERNEL___ */ 46191 #endif /* __KERNEL___ */
45695 46192
45696 #endif /* _LINUX_RANDOM_H */ 46193 #endif /* _LINUX_RANDOM_H */
45697diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs.h linux-2.6.32.11/include/linux/reiserfs_fs.h 46194diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs.h linux-2.6.32.12/include/linux/reiserfs_fs.h
45698--- linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400 46195--- linux-2.6.32.12/include/linux/reiserfs_fs.h 2010-03-15 11:52:04.000000000 -0400
45699+++ linux-2.6.32.11/include/linux/reiserfs_fs.h 2010-04-04 20:46:41.681061354 -0400 46196+++ linux-2.6.32.12/include/linux/reiserfs_fs.h 2010-04-04 20:46:41.681061354 -0400
45700@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset 46197@@ -1326,7 +1326,7 @@ static inline loff_t max_reiserfs_offset
45701 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */ 46198 #define REISERFS_USER_MEM 1 /* reiserfs user memory mode */
45702 46199
@@ -45743,9 +46240,9 @@ diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs.h linux-2.6.32.11/include/l
45743 46240
45744 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize) 46241 #define op_bytes_number(ih,bsize) item_ops[le_ih_k_type (ih)]->bytes_number (ih, bsize)
45745 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize) 46242 #define op_is_left_mergeable(key,bsize) item_ops[le_key_k_type (le_key_version (key), key)]->is_left_mergeable (key, bsize)
45746diff -urNp linux-2.6.32.11/include/linux/reiserfs_fs_sb.h linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 46243diff -urNp linux-2.6.32.12/include/linux/reiserfs_fs_sb.h linux-2.6.32.12/include/linux/reiserfs_fs_sb.h
45747--- linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400 46244--- linux-2.6.32.12/include/linux/reiserfs_fs_sb.h 2010-03-15 11:52:04.000000000 -0400
45748+++ linux-2.6.32.11/include/linux/reiserfs_fs_sb.h 2010-04-04 20:46:41.681061354 -0400 46245+++ linux-2.6.32.12/include/linux/reiserfs_fs_sb.h 2010-04-04 20:46:41.681061354 -0400
45749@@ -377,7 +377,7 @@ struct reiserfs_sb_info { 46246@@ -377,7 +377,7 @@ struct reiserfs_sb_info {
45750 /* Comment? -Hans */ 46247 /* Comment? -Hans */
45751 wait_queue_head_t s_wait; 46248 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
45755 // tree gets re-balanced 46252 // tree gets re-balanced
45756 unsigned long s_properties; /* File system properties. Currently holds 46253 unsigned long s_properties; /* File system properties. Currently holds
45757 on-disk FS format */ 46254 on-disk FS format */
45758diff -urNp linux-2.6.32.11/include/linux/sched.h linux-2.6.32.11/include/linux/sched.h 46255diff -urNp linux-2.6.32.12/include/linux/sched.h linux-2.6.32.12/include/linux/sched.h
45759--- linux-2.6.32.11/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400 46256--- linux-2.6.32.12/include/linux/sched.h 2010-03-15 11:52:04.000000000 -0400
45760+++ linux-2.6.32.11/include/linux/sched.h 2010-04-04 20:46:41.681061354 -0400 46257+++ linux-2.6.32.12/include/linux/sched.h 2010-04-04 20:46:41.681061354 -0400
45761@@ -101,6 +101,7 @@ struct bio; 46258@@ -101,6 +101,7 @@ struct bio;
45762 struct fs_struct; 46259 struct fs_struct;
45763 struct bts_context; 46260 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
46006 extern void thread_info_cache_init(void); 46503 extern void thread_info_cache_init(void);
46007 46504
46008 #ifdef CONFIG_DEBUG_STACK_USAGE 46505 #ifdef CONFIG_DEBUG_STACK_USAGE
46009diff -urNp linux-2.6.32.11/include/linux/screen_info.h linux-2.6.32.11/include/linux/screen_info.h 46506diff -urNp linux-2.6.32.12/include/linux/screen_info.h linux-2.6.32.12/include/linux/screen_info.h
46010--- linux-2.6.32.11/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400 46507--- linux-2.6.32.12/include/linux/screen_info.h 2010-03-15 11:52:04.000000000 -0400
46011+++ linux-2.6.32.11/include/linux/screen_info.h 2010-04-04 20:46:41.681061354 -0400 46508+++ linux-2.6.32.12/include/linux/screen_info.h 2010-04-04 20:46:41.681061354 -0400
46012@@ -42,7 +42,8 @@ struct screen_info { 46509@@ -42,7 +42,8 @@ struct screen_info {
46013 __u16 pages; /* 0x32 */ 46510 __u16 pages; /* 0x32 */
46014 __u16 vesa_attributes; /* 0x34 */ 46511 __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
46019 } __attribute__((packed)); 46516 } __attribute__((packed));
46020 46517
46021 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ 46518 #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */
46022diff -urNp linux-2.6.32.11/include/linux/security.h linux-2.6.32.11/include/linux/security.h 46519diff -urNp linux-2.6.32.12/include/linux/security.h linux-2.6.32.12/include/linux/security.h
46023--- linux-2.6.32.11/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400 46520--- linux-2.6.32.12/include/linux/security.h 2010-03-15 11:52:04.000000000 -0400
46024+++ linux-2.6.32.11/include/linux/security.h 2010-04-04 20:46:41.681061354 -0400 46521+++ linux-2.6.32.12/include/linux/security.h 2010-04-04 20:46:41.681061354 -0400
46025@@ -34,6 +34,7 @@ 46522@@ -34,6 +34,7 @@
46026 #include <linux/key.h> 46523 #include <linux/key.h>
46027 #include <linux/xfrm.h> 46524 #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
46030 #include <net/flow.h> 46527 #include <net/flow.h>
46031 46528
46032 /* Maximum number of letters for an LSM name string */ 46529 /* Maximum number of letters for an LSM name string */
46033diff -urNp linux-2.6.32.11/include/linux/shm.h linux-2.6.32.11/include/linux/shm.h 46530diff -urNp linux-2.6.32.12/include/linux/shm.h linux-2.6.32.12/include/linux/shm.h
46034--- linux-2.6.32.11/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400 46531--- linux-2.6.32.12/include/linux/shm.h 2010-03-15 11:52:04.000000000 -0400
46035+++ linux-2.6.32.11/include/linux/shm.h 2010-04-04 20:46:41.681061354 -0400 46532+++ linux-2.6.32.12/include/linux/shm.h 2010-04-04 20:46:41.681061354 -0400
46036@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke 46533@@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
46037 pid_t shm_cprid; 46534 pid_t shm_cprid;
46038 pid_t shm_lprid; 46535 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
46044 }; 46541 };
46045 46542
46046 /* shm_mode upper byte flags */ 46543 /* shm_mode upper byte flags */
46047diff -urNp linux-2.6.32.11/include/linux/slab.h linux-2.6.32.11/include/linux/slab.h 46544diff -urNp linux-2.6.32.12/include/linux/slab.h linux-2.6.32.12/include/linux/slab.h
46048--- linux-2.6.32.11/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400 46545--- linux-2.6.32.12/include/linux/slab.h 2010-03-15 11:52:04.000000000 -0400
46049+++ linux-2.6.32.11/include/linux/slab.h 2010-04-04 20:47:28.956670452 -0400 46546+++ linux-2.6.32.12/include/linux/slab.h 2010-04-04 20:47:28.956670452 -0400
46050@@ -11,6 +11,7 @@ 46547@@ -11,6 +11,7 @@
46051 46548
46052 #include <linux/gfp.h> 46549 #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
46118+}) 46615+})
46119+ 46616+
46120 #endif /* _LINUX_SLAB_H */ 46617 #endif /* _LINUX_SLAB_H */
46121diff -urNp linux-2.6.32.11/include/linux/slub_def.h linux-2.6.32.11/include/linux/slub_def.h 46618diff -urNp linux-2.6.32.12/include/linux/slub_def.h linux-2.6.32.12/include/linux/slub_def.h
46122--- linux-2.6.32.11/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400 46619--- linux-2.6.32.12/include/linux/slub_def.h 2010-03-15 11:52:04.000000000 -0400
46123+++ linux-2.6.32.11/include/linux/slub_def.h 2010-04-04 20:46:41.685762250 -0400 46620+++ linux-2.6.32.12/include/linux/slub_def.h 2010-04-04 20:46:41.685762250 -0400
46124@@ -86,7 +86,7 @@ struct kmem_cache { 46621@@ -86,7 +86,7 @@ struct kmem_cache {
46125 struct kmem_cache_order_objects max; 46622 struct kmem_cache_order_objects max;
46126 struct kmem_cache_order_objects min; 46623 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
46130 void (*ctor)(void *); 46627 void (*ctor)(void *);
46131 int inuse; /* Offset to metadata */ 46628 int inuse; /* Offset to metadata */
46132 int align; /* Alignment */ 46629 int align; /* Alignment */
46133diff -urNp linux-2.6.32.11/include/linux/sonet.h linux-2.6.32.11/include/linux/sonet.h 46630diff -urNp linux-2.6.32.12/include/linux/sonet.h linux-2.6.32.12/include/linux/sonet.h
46134--- linux-2.6.32.11/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400 46631--- linux-2.6.32.12/include/linux/sonet.h 2010-03-15 11:52:04.000000000 -0400
46135+++ linux-2.6.32.11/include/linux/sonet.h 2010-04-04 20:46:41.685762250 -0400 46632+++ linux-2.6.32.12/include/linux/sonet.h 2010-04-04 20:46:41.685762250 -0400
46136@@ -61,7 +61,7 @@ struct sonet_stats { 46633@@ -61,7 +61,7 @@ struct sonet_stats {
46137 #include <asm/atomic.h> 46634 #include <asm/atomic.h>
46138 46635
@@ -46142,9 +46639,9 @@ diff -urNp linux-2.6.32.11/include/linux/sonet.h linux-2.6.32.11/include/linux/s
46142 __SONET_ITEMS 46639 __SONET_ITEMS
46143 #undef __HANDLE_ITEM 46640 #undef __HANDLE_ITEM
46144 }; 46641 };
46145diff -urNp linux-2.6.32.11/include/linux/suspend.h linux-2.6.32.11/include/linux/suspend.h 46642diff -urNp linux-2.6.32.12/include/linux/suspend.h linux-2.6.32.12/include/linux/suspend.h
46146--- linux-2.6.32.11/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400 46643--- linux-2.6.32.12/include/linux/suspend.h 2010-03-15 11:52:04.000000000 -0400
46147+++ linux-2.6.32.11/include/linux/suspend.h 2010-04-04 20:46:41.685762250 -0400 46644+++ linux-2.6.32.12/include/linux/suspend.h 2010-04-04 20:46:41.685762250 -0400
46148@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t; 46645@@ -104,15 +104,15 @@ typedef int __bitwise suspend_state_t;
46149 * which require special recovery actions in that situation. 46646 * which require special recovery actions in that situation.
46150 */ 46647 */
@@ -46233,9 +46730,9 @@ diff -urNp linux-2.6.32.11/include/linux/suspend.h linux-2.6.32.11/include/linux
46233 static inline int hibernate(void) { return -ENOSYS; } 46730 static inline int hibernate(void) { return -ENOSYS; }
46234 static inline bool system_entering_hibernation(void) { return false; } 46731 static inline bool system_entering_hibernation(void) { return false; }
46235 #endif /* CONFIG_HIBERNATION */ 46732 #endif /* CONFIG_HIBERNATION */
46236diff -urNp linux-2.6.32.11/include/linux/sysctl.h linux-2.6.32.11/include/linux/sysctl.h 46733diff -urNp linux-2.6.32.12/include/linux/sysctl.h linux-2.6.32.12/include/linux/sysctl.h
46237--- linux-2.6.32.11/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400 46734--- linux-2.6.32.12/include/linux/sysctl.h 2010-03-15 11:52:04.000000000 -0400
46238+++ linux-2.6.32.11/include/linux/sysctl.h 2010-04-04 20:46:41.685762250 -0400 46735+++ linux-2.6.32.12/include/linux/sysctl.h 2010-04-04 20:46:41.685762250 -0400
46239@@ -164,7 +164,11 @@ enum 46736@@ -164,7 +164,11 @@ enum
46240 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ 46737 KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
46241 }; 46738 };
@@ -46249,9 +46746,9 @@ diff -urNp linux-2.6.32.11/include/linux/sysctl.h linux-2.6.32.11/include/linux/
46249 46746
46250 /* CTL_VM names: */ 46747 /* CTL_VM names: */
46251 enum 46748 enum
46252diff -urNp linux-2.6.32.11/include/linux/sysfs.h linux-2.6.32.11/include/linux/sysfs.h 46749diff -urNp linux-2.6.32.12/include/linux/sysfs.h linux-2.6.32.12/include/linux/sysfs.h
46253--- linux-2.6.32.11/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400 46750--- linux-2.6.32.12/include/linux/sysfs.h 2010-03-15 11:52:04.000000000 -0400
46254+++ linux-2.6.32.11/include/linux/sysfs.h 2010-04-04 20:46:41.685762250 -0400 46751+++ linux-2.6.32.12/include/linux/sysfs.h 2010-04-04 20:46:41.685762250 -0400
46255@@ -75,8 +75,8 @@ struct bin_attribute { 46752@@ -75,8 +75,8 @@ struct bin_attribute {
46256 }; 46753 };
46257 46754
@@ -46263,9 +46760,9 @@ diff -urNp linux-2.6.32.11/include/linux/sysfs.h linux-2.6.32.11/include/linux/s
46263 }; 46760 };
46264 46761
46265 struct sysfs_dirent; 46762 struct sysfs_dirent;
46266diff -urNp linux-2.6.32.11/include/linux/thread_info.h linux-2.6.32.11/include/linux/thread_info.h 46763diff -urNp linux-2.6.32.12/include/linux/thread_info.h linux-2.6.32.12/include/linux/thread_info.h
46267--- linux-2.6.32.11/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400 46764--- linux-2.6.32.12/include/linux/thread_info.h 2010-03-15 11:52:04.000000000 -0400
46268+++ linux-2.6.32.11/include/linux/thread_info.h 2010-04-04 20:46:41.685762250 -0400 46765+++ linux-2.6.32.12/include/linux/thread_info.h 2010-04-04 20:46:41.685762250 -0400
46269@@ -23,7 +23,7 @@ struct restart_block { 46766@@ -23,7 +23,7 @@ struct restart_block {
46270 }; 46767 };
46271 /* For futex_wait and futex_wait_requeue_pi */ 46768 /* 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
46275 u32 val; 46772 u32 val;
46276 u32 flags; 46773 u32 flags;
46277 u32 bitset; 46774 u32 bitset;
46278diff -urNp linux-2.6.32.11/include/linux/tty.h linux-2.6.32.11/include/linux/tty.h 46775diff -urNp linux-2.6.32.12/include/linux/tty.h linux-2.6.32.12/include/linux/tty.h
46279--- linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400 46776--- linux-2.6.32.12/include/linux/tty.h 2010-04-04 20:41:50.060586306 -0400
46280+++ linux-2.6.32.11/include/linux/tty.h 2010-04-04 20:46:41.685762250 -0400 46777+++ linux-2.6.32.12/include/linux/tty.h 2010-04-04 20:46:41.685762250 -0400
46281@@ -13,6 +13,7 @@ 46778@@ -13,6 +13,7 @@
46282 #include <linux/tty_driver.h> 46779 #include <linux/tty_driver.h>
46283 #include <linux/tty_ldisc.h> 46780 #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
46313 46810
46314 /* n_tty.c */ 46811 /* n_tty.c */
46315 extern struct tty_ldisc_ops tty_ldisc_N_TTY; 46812 extern struct tty_ldisc_ops tty_ldisc_N_TTY;
46316diff -urNp linux-2.6.32.11/include/linux/tty_ldisc.h linux-2.6.32.11/include/linux/tty_ldisc.h 46813diff -urNp linux-2.6.32.12/include/linux/tty_ldisc.h linux-2.6.32.12/include/linux/tty_ldisc.h
46317--- linux-2.6.32.11/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400 46814--- linux-2.6.32.12/include/linux/tty_ldisc.h 2010-03-15 11:52:04.000000000 -0400
46318+++ linux-2.6.32.11/include/linux/tty_ldisc.h 2010-04-04 20:46:41.685762250 -0400 46815+++ linux-2.6.32.12/include/linux/tty_ldisc.h 2010-04-04 20:46:41.685762250 -0400
46319@@ -139,7 +139,7 @@ struct tty_ldisc_ops { 46816@@ -139,7 +139,7 @@ struct tty_ldisc_ops {
46320 46817
46321 struct module *owner; 46818 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
46325 }; 46822 };
46326 46823
46327 struct tty_ldisc { 46824 struct tty_ldisc {
46328diff -urNp linux-2.6.32.11/include/linux/types.h linux-2.6.32.11/include/linux/types.h 46825diff -urNp linux-2.6.32.12/include/linux/types.h linux-2.6.32.12/include/linux/types.h
46329--- linux-2.6.32.11/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400 46826--- linux-2.6.32.12/include/linux/types.h 2010-03-15 11:52:04.000000000 -0400
46330+++ linux-2.6.32.11/include/linux/types.h 2010-04-04 20:46:41.685762250 -0400 46827+++ linux-2.6.32.12/include/linux/types.h 2010-04-04 20:46:41.685762250 -0400
46331@@ -191,10 +191,26 @@ typedef struct { 46828@@ -191,10 +191,26 @@ typedef struct {
46332 volatile int counter; 46829 volatile int counter;
46333 } atomic_t; 46830 } 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
46355 #endif 46852 #endif
46356 46853
46357 struct ustat { 46854 struct ustat {
46358diff -urNp linux-2.6.32.11/include/linux/uaccess.h linux-2.6.32.11/include/linux/uaccess.h 46855diff -urNp linux-2.6.32.12/include/linux/uaccess.h linux-2.6.32.12/include/linux/uaccess.h
46359--- linux-2.6.32.11/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400 46856--- linux-2.6.32.12/include/linux/uaccess.h 2010-03-15 11:52:04.000000000 -0400
46360+++ linux-2.6.32.11/include/linux/uaccess.h 2010-04-04 20:46:41.685762250 -0400 46857+++ linux-2.6.32.12/include/linux/uaccess.h 2010-04-04 20:46:41.685762250 -0400
46361@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ 46858@@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
46362 long ret; \ 46859 long ret; \
46363 mm_segment_t old_fs = get_fs(); \ 46860 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
46389+extern long probe_kernel_write(void *dst, const void *src, size_t size); 46886+extern long probe_kernel_write(void *dst, const void *src, size_t size);
46390 46887
46391 #endif /* __LINUX_UACCESS_H__ */ 46888 #endif /* __LINUX_UACCESS_H__ */
46392diff -urNp linux-2.6.32.11/include/linux/vmalloc.h linux-2.6.32.11/include/linux/vmalloc.h 46889diff -urNp linux-2.6.32.12/include/linux/vmalloc.h linux-2.6.32.12/include/linux/vmalloc.h
46393--- linux-2.6.32.11/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400 46890--- linux-2.6.32.12/include/linux/vmalloc.h 2010-03-15 11:52:04.000000000 -0400
46394+++ linux-2.6.32.11/include/linux/vmalloc.h 2010-04-04 20:46:41.685762250 -0400 46891+++ linux-2.6.32.12/include/linux/vmalloc.h 2010-04-04 20:46:41.685762250 -0400
46395@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining 46892@@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining
46396 #define VM_MAP 0x00000004 /* vmap()ed pages */ 46893 #define VM_MAP 0x00000004 /* vmap()ed pages */
46397 #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ 46894 #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
46486+}) 46983+})
46487+ 46984+
46488 #endif /* _LINUX_VMALLOC_H */ 46985 #endif /* _LINUX_VMALLOC_H */
46489diff -urNp linux-2.6.32.11/include/net/irda/ircomm_tty.h linux-2.6.32.11/include/net/irda/ircomm_tty.h 46986diff -urNp linux-2.6.32.12/include/net/irda/ircomm_tty.h linux-2.6.32.12/include/net/irda/ircomm_tty.h
46490--- linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400 46987--- linux-2.6.32.12/include/net/irda/ircomm_tty.h 2010-03-15 11:52:04.000000000 -0400
46491+++ linux-2.6.32.11/include/net/irda/ircomm_tty.h 2010-04-04 20:46:41.685762250 -0400 46988+++ linux-2.6.32.12/include/net/irda/ircomm_tty.h 2010-04-04 20:46:41.685762250 -0400
46492@@ -105,8 +105,8 @@ struct ircomm_tty_cb { 46989@@ -105,8 +105,8 @@ struct ircomm_tty_cb {
46493 unsigned short close_delay; 46990 unsigned short close_delay;
46494 unsigned short closing_wait; /* time to wait before closing */ 46991 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
46500 46997
46501 /* Protect concurent access to : 46998 /* Protect concurent access to :
46502 * o self->open_count 46999 * o self->open_count
46503diff -urNp linux-2.6.32.11/include/net/neighbour.h linux-2.6.32.11/include/net/neighbour.h 47000diff -urNp linux-2.6.32.12/include/net/neighbour.h linux-2.6.32.12/include/net/neighbour.h
46504--- linux-2.6.32.11/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400 47001--- linux-2.6.32.12/include/net/neighbour.h 2010-03-15 11:52:04.000000000 -0400
46505+++ linux-2.6.32.11/include/net/neighbour.h 2010-04-04 20:46:41.685762250 -0400 47002+++ linux-2.6.32.12/include/net/neighbour.h 2010-04-04 20:46:41.685762250 -0400
46506@@ -125,12 +125,12 @@ struct neighbour 47003@@ -125,12 +125,12 @@ struct neighbour
46507 struct neigh_ops 47004 struct neigh_ops
46508 { 47005 {
@@ -46522,9 +47019,9 @@ diff -urNp linux-2.6.32.11/include/net/neighbour.h linux-2.6.32.11/include/net/n
46522 }; 47019 };
46523 47020
46524 struct pneigh_entry 47021 struct pneigh_entry
46525diff -urNp linux-2.6.32.11/include/net/sctp/sctp.h linux-2.6.32.11/include/net/sctp/sctp.h 47022diff -urNp linux-2.6.32.12/include/net/sctp/sctp.h linux-2.6.32.12/include/net/sctp/sctp.h
46526--- linux-2.6.32.11/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400 47023--- linux-2.6.32.12/include/net/sctp/sctp.h 2010-03-15 11:52:04.000000000 -0400
46527+++ linux-2.6.32.11/include/net/sctp/sctp.h 2010-04-04 20:46:41.685762250 -0400 47024+++ linux-2.6.32.12/include/net/sctp/sctp.h 2010-04-04 20:46:41.685762250 -0400
46528@@ -305,8 +305,8 @@ extern int sctp_debug_flag; 47025@@ -305,8 +305,8 @@ extern int sctp_debug_flag;
46529 47026
46530 #else /* SCTP_DEBUG */ 47027 #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
46536 #define SCTP_ENABLE_DEBUG 47033 #define SCTP_ENABLE_DEBUG
46537 #define SCTP_DISABLE_DEBUG 47034 #define SCTP_DISABLE_DEBUG
46538 #define SCTP_ASSERT(expr, str, func) 47035 #define SCTP_ASSERT(expr, str, func)
46539diff -urNp linux-2.6.32.11/include/net/tcp.h linux-2.6.32.11/include/net/tcp.h 47036diff -urNp linux-2.6.32.12/include/net/tcp.h linux-2.6.32.12/include/net/tcp.h
46540--- linux-2.6.32.11/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400 47037--- linux-2.6.32.12/include/net/tcp.h 2010-03-15 11:52:04.000000000 -0400
46541+++ linux-2.6.32.11/include/net/tcp.h 2010-04-04 20:46:41.685762250 -0400 47038+++ linux-2.6.32.12/include/net/tcp.h 2010-04-04 20:46:41.685762250 -0400
46542@@ -1420,6 +1420,7 @@ enum tcp_seq_states { 47039@@ -1420,6 +1420,7 @@ enum tcp_seq_states {
46543 struct tcp_seq_afinfo { 47040 struct tcp_seq_afinfo {
46544 char *name; 47041 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
46547 struct file_operations seq_fops; 47044 struct file_operations seq_fops;
46548 struct seq_operations seq_ops; 47045 struct seq_operations seq_ops;
46549 }; 47046 };
46550diff -urNp linux-2.6.32.11/include/net/udp.h linux-2.6.32.11/include/net/udp.h 47047diff -urNp linux-2.6.32.12/include/net/udp.h linux-2.6.32.12/include/net/udp.h
46551--- linux-2.6.32.11/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400 47048--- linux-2.6.32.12/include/net/udp.h 2010-03-15 11:52:04.000000000 -0400
46552+++ linux-2.6.32.11/include/net/udp.h 2010-04-04 20:46:41.685762250 -0400 47049+++ linux-2.6.32.12/include/net/udp.h 2010-04-04 20:46:41.685762250 -0400
46553@@ -187,6 +187,7 @@ struct udp_seq_afinfo { 47050@@ -187,6 +187,7 @@ struct udp_seq_afinfo {
46554 char *name; 47051 char *name;
46555 sa_family_t family; 47052 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
46558 struct file_operations seq_fops; 47055 struct file_operations seq_fops;
46559 struct seq_operations seq_ops; 47056 struct seq_operations seq_ops;
46560 }; 47057 };
46561diff -urNp linux-2.6.32.11/include/sound/ac97_codec.h linux-2.6.32.11/include/sound/ac97_codec.h 47058diff -urNp linux-2.6.32.12/include/sound/ac97_codec.h linux-2.6.32.12/include/sound/ac97_codec.h
46562--- linux-2.6.32.11/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400 47059--- linux-2.6.32.12/include/sound/ac97_codec.h 2010-03-15 11:52:04.000000000 -0400
46563+++ linux-2.6.32.11/include/sound/ac97_codec.h 2010-04-04 20:46:41.685762250 -0400 47060+++ linux-2.6.32.12/include/sound/ac97_codec.h 2010-04-04 20:46:41.685762250 -0400
46564@@ -419,15 +419,15 @@ 47061@@ -419,15 +419,15 @@
46565 struct snd_ac97; 47062 struct snd_ac97;
46566 47063
@@ -46593,9 +47090,9 @@ diff -urNp linux-2.6.32.11/include/sound/ac97_codec.h linux-2.6.32.11/include/so
46593 void *private_data; 47090 void *private_data;
46594 void (*private_free) (struct snd_ac97 *ac97); 47091 void (*private_free) (struct snd_ac97 *ac97);
46595 /* --- */ 47092 /* --- */
46596diff -urNp linux-2.6.32.11/include/trace/events/irq.h linux-2.6.32.11/include/trace/events/irq.h 47093diff -urNp linux-2.6.32.12/include/trace/events/irq.h linux-2.6.32.12/include/trace/events/irq.h
46597--- linux-2.6.32.11/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400 47094--- linux-2.6.32.12/include/trace/events/irq.h 2010-03-15 11:52:04.000000000 -0400
46598+++ linux-2.6.32.11/include/trace/events/irq.h 2010-04-04 20:46:41.685762250 -0400 47095+++ linux-2.6.32.12/include/trace/events/irq.h 2010-04-04 20:46:41.685762250 -0400
46599@@ -34,7 +34,7 @@ 47096@@ -34,7 +34,7 @@
46600 */ 47097 */
46601 TRACE_EVENT(irq_handler_entry, 47098 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
46632 47129
46633 TP_ARGS(h, vec), 47130 TP_ARGS(h, vec),
46634 47131
46635diff -urNp linux-2.6.32.11/include/video/uvesafb.h linux-2.6.32.11/include/video/uvesafb.h 47132diff -urNp linux-2.6.32.12/include/video/uvesafb.h linux-2.6.32.12/include/video/uvesafb.h
46636--- linux-2.6.32.11/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400 47133--- linux-2.6.32.12/include/video/uvesafb.h 2010-03-15 11:52:04.000000000 -0400
46637+++ linux-2.6.32.11/include/video/uvesafb.h 2010-04-04 20:46:41.685762250 -0400 47134+++ linux-2.6.32.12/include/video/uvesafb.h 2010-04-04 20:46:41.685762250 -0400
46638@@ -177,6 +177,7 @@ struct uvesafb_par { 47135@@ -177,6 +177,7 @@ struct uvesafb_par {
46639 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ 47136 u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */
46640 u8 pmi_setpal; /* PMI for palette changes */ 47137 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
46643 void *pmi_start; 47140 void *pmi_start;
46644 void *pmi_pal; 47141 void *pmi_pal;
46645 u8 *vbe_state_orig; /* 47142 u8 *vbe_state_orig; /*
46646diff -urNp linux-2.6.32.11/init/do_mounts.c linux-2.6.32.11/init/do_mounts.c 47143diff -urNp linux-2.6.32.12/init/do_mounts.c linux-2.6.32.12/init/do_mounts.c
46647--- linux-2.6.32.11/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400 47144--- linux-2.6.32.12/init/do_mounts.c 2010-03-15 11:52:04.000000000 -0400
46648+++ linux-2.6.32.11/init/do_mounts.c 2010-04-04 20:46:41.685762250 -0400 47145+++ linux-2.6.32.12/init/do_mounts.c 2010-04-04 20:46:41.685762250 -0400
46649@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa 47146@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa
46650 47147
46651 static int __init do_mount_root(char *name, char *fs, int flags, void *data) 47148 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
46691+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL); 47188+ sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
46692+ sys_chroot((__force char __user *)"."); 47189+ sys_chroot((__force char __user *)".");
46693 } 47190 }
46694diff -urNp linux-2.6.32.11/init/do_mounts.h linux-2.6.32.11/init/do_mounts.h 47191diff -urNp linux-2.6.32.12/init/do_mounts.h linux-2.6.32.12/init/do_mounts.h
46695--- linux-2.6.32.11/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400 47192--- linux-2.6.32.12/init/do_mounts.h 2010-03-15 11:52:04.000000000 -0400
46696+++ linux-2.6.32.11/init/do_mounts.h 2010-04-04 20:46:41.685762250 -0400 47193+++ linux-2.6.32.12/init/do_mounts.h 2010-04-04 20:46:41.685762250 -0400
46697@@ -15,15 +15,15 @@ extern int root_mountflags; 47194@@ -15,15 +15,15 @@ extern int root_mountflags;
46698 47195
46699 static inline int create_dev(char *name, dev_t dev) 47196 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
46713 return 0; 47210 return 0;
46714 if (!S_ISBLK(stat.st_mode)) 47211 if (!S_ISBLK(stat.st_mode))
46715 return 0; 47212 return 0;
46716diff -urNp linux-2.6.32.11/init/do_mounts_initrd.c linux-2.6.32.11/init/do_mounts_initrd.c 47213diff -urNp linux-2.6.32.12/init/do_mounts_initrd.c linux-2.6.32.12/init/do_mounts_initrd.c
46717--- linux-2.6.32.11/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400 47214--- linux-2.6.32.12/init/do_mounts_initrd.c 2010-03-15 11:52:04.000000000 -0400
46718+++ linux-2.6.32.11/init/do_mounts_initrd.c 2010-04-04 20:46:41.685762250 -0400 47215+++ linux-2.6.32.12/init/do_mounts_initrd.c 2010-04-04 20:46:41.685762250 -0400
46719@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel 47216@@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel
46720 sys_close(old_fd);sys_close(root_fd); 47217 sys_close(old_fd);sys_close(root_fd);
46721 sys_close(0);sys_close(1);sys_close(2); 47218 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
46799+ sys_unlink((__force const char __user *)"/initrd.image"); 47296+ sys_unlink((__force const char __user *)"/initrd.image");
46800 return 0; 47297 return 0;
46801 } 47298 }
46802diff -urNp linux-2.6.32.11/init/do_mounts_md.c linux-2.6.32.11/init/do_mounts_md.c 47299diff -urNp linux-2.6.32.12/init/do_mounts_md.c linux-2.6.32.12/init/do_mounts_md.c
46803--- linux-2.6.32.11/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400 47300--- linux-2.6.32.12/init/do_mounts_md.c 2010-03-15 11:52:04.000000000 -0400
46804+++ linux-2.6.32.11/init/do_mounts_md.c 2010-04-04 20:46:41.689696132 -0400 47301+++ linux-2.6.32.12/init/do_mounts_md.c 2010-04-04 20:46:41.689696132 -0400
46805@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) 47302@@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
46806 partitioned ? "_d" : "", minor, 47303 partitioned ? "_d" : "", minor,
46807 md_setup_args[ent].device_names); 47304 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
46829 if (fd >= 0) { 47326 if (fd >= 0) {
46830 sys_ioctl(fd, RAID_AUTORUN, raid_autopart); 47327 sys_ioctl(fd, RAID_AUTORUN, raid_autopart);
46831 sys_close(fd); 47328 sys_close(fd);
46832diff -urNp linux-2.6.32.11/init/initramfs.c linux-2.6.32.11/init/initramfs.c 47329diff -urNp linux-2.6.32.12/init/initramfs.c linux-2.6.32.12/init/initramfs.c
46833--- linux-2.6.32.11/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400 47330--- linux-2.6.32.12/init/initramfs.c 2010-03-15 11:52:04.000000000 -0400
46834+++ linux-2.6.32.11/init/initramfs.c 2010-04-04 20:46:41.689696132 -0400 47331+++ linux-2.6.32.12/init/initramfs.c 2010-04-04 20:46:41.689696132 -0400
46835@@ -74,7 +74,7 @@ static void __init free_hash(void) 47332@@ -74,7 +74,7 @@ static void __init free_hash(void)
46836 } 47333 }
46837 } 47334 }
@@ -46940,9 +47437,9 @@ diff -urNp linux-2.6.32.11/init/initramfs.c linux-2.6.32.11/init/initramfs.c
46940 state = SkipIt; 47437 state = SkipIt;
46941 next_state = Reset; 47438 next_state = Reset;
46942 return 0; 47439 return 0;
46943diff -urNp linux-2.6.32.11/init/Kconfig linux-2.6.32.11/init/Kconfig 47440diff -urNp linux-2.6.32.12/init/Kconfig linux-2.6.32.12/init/Kconfig
46944--- linux-2.6.32.11/init/Kconfig 2010-03-15 11:52:04.000000000 -0400 47441--- linux-2.6.32.12/init/Kconfig 2010-03-15 11:52:04.000000000 -0400
46945+++ linux-2.6.32.11/init/Kconfig 2010-04-04 20:46:41.689696132 -0400 47442+++ linux-2.6.32.12/init/Kconfig 2010-04-04 20:46:41.689696132 -0400
46946@@ -1026,7 +1026,7 @@ config SLUB_DEBUG 47443@@ -1026,7 +1026,7 @@ config SLUB_DEBUG
46947 47444
46948 config COMPAT_BRK 47445 config COMPAT_BRK
@@ -46964,9 +47461,9 @@ diff -urNp linux-2.6.32.11/init/Kconfig linux-2.6.32.11/init/Kconfig
46964 47461
46965 config RT_MUTEXES 47462 config RT_MUTEXES
46966 boolean 47463 boolean
46967diff -urNp linux-2.6.32.11/init/main.c linux-2.6.32.11/init/main.c 47464diff -urNp linux-2.6.32.12/init/main.c linux-2.6.32.12/init/main.c
46968--- linux-2.6.32.11/init/main.c 2010-04-04 20:41:50.060586306 -0400 47465--- linux-2.6.32.12/init/main.c 2010-04-04 20:41:50.060586306 -0400
46969+++ linux-2.6.32.11/init/main.c 2010-04-04 20:58:33.225084964 -0400 47466+++ linux-2.6.32.12/init/main.c 2010-04-04 20:58:33.225084964 -0400
46970@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void) 47467@@ -97,6 +97,7 @@ static inline void mark_rodata_ro(void)
46971 #ifdef CONFIG_TC 47468 #ifdef CONFIG_TC
46972 extern void tc_init(void); 47469 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
47111 /* 47608 /*
47112 * Ok, we have completed the initial bootup, and 47609 * Ok, we have completed the initial bootup, and
47113 * we're essentially up and running. Get rid of the 47610 * we're essentially up and running. Get rid of the
47114diff -urNp linux-2.6.32.11/init/noinitramfs.c linux-2.6.32.11/init/noinitramfs.c 47611diff -urNp linux-2.6.32.12/init/noinitramfs.c linux-2.6.32.12/init/noinitramfs.c
47115--- linux-2.6.32.11/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400 47612--- linux-2.6.32.12/init/noinitramfs.c 2010-03-15 11:52:04.000000000 -0400
47116+++ linux-2.6.32.11/init/noinitramfs.c 2010-04-04 20:46:41.689696132 -0400 47613+++ linux-2.6.32.12/init/noinitramfs.c 2010-04-04 20:46:41.689696132 -0400
47117@@ -29,7 +29,7 @@ static int __init default_rootfs(void) 47614@@ -29,7 +29,7 @@ static int __init default_rootfs(void)
47118 { 47615 {
47119 int err; 47616 int err;
@@ -47132,9 +47629,9 @@ diff -urNp linux-2.6.32.11/init/noinitramfs.c linux-2.6.32.11/init/noinitramfs.c
47132 if (err < 0) 47629 if (err < 0)
47133 goto out; 47630 goto out;
47134 47631
47135diff -urNp linux-2.6.32.11/ipc/ipc_sysctl.c linux-2.6.32.11/ipc/ipc_sysctl.c 47632diff -urNp linux-2.6.32.12/ipc/ipc_sysctl.c linux-2.6.32.12/ipc/ipc_sysctl.c
47136--- linux-2.6.32.11/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400 47633--- linux-2.6.32.12/ipc/ipc_sysctl.c 2010-03-15 11:52:04.000000000 -0400
47137+++ linux-2.6.32.11/ipc/ipc_sysctl.c 2010-04-04 20:46:41.689696132 -0400 47634+++ linux-2.6.32.12/ipc/ipc_sysctl.c 2010-04-04 20:46:41.689696132 -0400
47138@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] 47635@@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[]
47139 .extra1 = &zero, 47636 .extra1 = &zero,
47140 .extra2 = &one, 47637 .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
47153 }; 47650 };
47154 47651
47155 static int __init ipc_sysctl_init(void) 47652 static int __init ipc_sysctl_init(void)
47156diff -urNp linux-2.6.32.11/ipc/mqueue.c linux-2.6.32.11/ipc/mqueue.c 47653diff -urNp linux-2.6.32.12/ipc/mqueue.c linux-2.6.32.12/ipc/mqueue.c
47157--- linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400 47654--- linux-2.6.32.12/ipc/mqueue.c 2010-04-04 20:41:50.060586306 -0400
47158+++ linux-2.6.32.11/ipc/mqueue.c 2010-04-04 20:46:41.689696132 -0400 47655+++ linux-2.6.32.12/ipc/mqueue.c 2010-04-04 20:46:41.689696132 -0400
47159@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st 47656@@ -150,6 +150,7 @@ static struct inode *mqueue_get_inode(st
47160 mq_bytes = (mq_msg_tblsz + 47657 mq_bytes = (mq_msg_tblsz +
47161 (info->attr.mq_maxmsg * info->attr.mq_msgsize)); 47658 (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
47164 spin_lock(&mq_lock); 47661 spin_lock(&mq_lock);
47165 if (u->mq_bytes + mq_bytes < u->mq_bytes || 47662 if (u->mq_bytes + mq_bytes < u->mq_bytes ||
47166 u->mq_bytes + mq_bytes > 47663 u->mq_bytes + mq_bytes >
47167diff -urNp linux-2.6.32.11/ipc/shm.c linux-2.6.32.11/ipc/shm.c 47664diff -urNp linux-2.6.32.12/ipc/shm.c linux-2.6.32.12/ipc/shm.c
47168--- linux-2.6.32.11/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400 47665--- linux-2.6.32.12/ipc/shm.c 2010-03-15 11:52:04.000000000 -0400
47169+++ linux-2.6.32.11/ipc/shm.c 2010-04-04 20:46:41.689696132 -0400 47666+++ linux-2.6.32.12/ipc/shm.c 2010-04-04 20:46:41.689696132 -0400
47170@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name 47667@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name
47171 static int sysvipc_shm_proc_show(struct seq_file *s, void *it); 47668 static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
47172 #endif 47669 #endif
@@ -47219,9 +47716,9 @@ diff -urNp linux-2.6.32.11/ipc/shm.c linux-2.6.32.11/ipc/shm.c
47219 size = i_size_read(path.dentry->d_inode); 47716 size = i_size_read(path.dentry->d_inode);
47220 shm_unlock(shp); 47717 shm_unlock(shp);
47221 47718
47222diff -urNp linux-2.6.32.11/kernel/acct.c linux-2.6.32.11/kernel/acct.c 47719diff -urNp linux-2.6.32.12/kernel/acct.c linux-2.6.32.12/kernel/acct.c
47223--- linux-2.6.32.11/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400 47720--- linux-2.6.32.12/kernel/acct.c 2010-03-15 11:52:04.000000000 -0400
47224+++ linux-2.6.32.11/kernel/acct.c 2010-04-04 20:46:41.689696132 -0400 47721+++ linux-2.6.32.12/kernel/acct.c 2010-04-04 20:46:41.689696132 -0400
47225@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a 47722@@ -579,7 +579,7 @@ static void do_acct_process(struct bsd_a
47226 */ 47723 */
47227 flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; 47724 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
47231 sizeof(acct_t), &file->f_pos); 47728 sizeof(acct_t), &file->f_pos);
47232 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; 47729 current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
47233 set_fs(fs); 47730 set_fs(fs);
47234diff -urNp linux-2.6.32.11/kernel/capability.c linux-2.6.32.11/kernel/capability.c 47731diff -urNp linux-2.6.32.12/kernel/capability.c linux-2.6.32.12/kernel/capability.c
47235--- linux-2.6.32.11/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400 47732--- linux-2.6.32.12/kernel/capability.c 2010-03-15 11:52:04.000000000 -0400
47236+++ linux-2.6.32.11/kernel/capability.c 2010-04-04 20:46:41.689696132 -0400 47733+++ linux-2.6.32.12/kernel/capability.c 2010-04-04 20:46:41.689696132 -0400
47237@@ -306,10 +306,21 @@ int capable(int cap) 47734@@ -306,10 +306,21 @@ int capable(int cap)
47238 BUG(); 47735 BUG();
47239 } 47736 }
@@ -47257,9 +47754,9 @@ diff -urNp linux-2.6.32.11/kernel/capability.c linux-2.6.32.11/kernel/capability
47257+ 47754+
47258 EXPORT_SYMBOL(capable); 47755 EXPORT_SYMBOL(capable);
47259+EXPORT_SYMBOL(capable_nolog); 47756+EXPORT_SYMBOL(capable_nolog);
47260diff -urNp linux-2.6.32.11/kernel/configs.c linux-2.6.32.11/kernel/configs.c 47757diff -urNp linux-2.6.32.12/kernel/configs.c linux-2.6.32.12/kernel/configs.c
47261--- linux-2.6.32.11/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400 47758--- linux-2.6.32.12/kernel/configs.c 2010-03-15 11:52:04.000000000 -0400
47262+++ linux-2.6.32.11/kernel/configs.c 2010-04-04 20:46:41.689696132 -0400 47759+++ linux-2.6.32.12/kernel/configs.c 2010-04-04 20:46:41.689696132 -0400
47263@@ -73,8 +73,19 @@ static int __init ikconfig_init(void) 47760@@ -73,8 +73,19 @@ static int __init ikconfig_init(void)
47264 struct proc_dir_entry *entry; 47761 struct proc_dir_entry *entry;
47265 47762
@@ -47280,9 +47777,9 @@ diff -urNp linux-2.6.32.11/kernel/configs.c linux-2.6.32.11/kernel/configs.c
47280 if (!entry) 47777 if (!entry)
47281 return -ENOMEM; 47778 return -ENOMEM;
47282 47779
47283diff -urNp linux-2.6.32.11/kernel/cpu.c linux-2.6.32.11/kernel/cpu.c 47780diff -urNp linux-2.6.32.12/kernel/cpu.c linux-2.6.32.12/kernel/cpu.c
47284--- linux-2.6.32.11/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400 47781--- linux-2.6.32.12/kernel/cpu.c 2010-03-15 11:52:04.000000000 -0400
47285+++ linux-2.6.32.11/kernel/cpu.c 2010-04-04 20:46:41.689696132 -0400 47782+++ linux-2.6.32.12/kernel/cpu.c 2010-04-04 20:46:41.689696132 -0400
47286@@ -19,7 +19,7 @@ 47783@@ -19,7 +19,7 @@
47287 /* Serializes the updates to cpu_online_mask, cpu_present_mask */ 47784 /* Serializes the updates to cpu_online_mask, cpu_present_mask */
47288 static DEFINE_MUTEX(cpu_add_remove_lock); 47785 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
47292 47789
47293 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. 47790 /* If set, cpu_up and cpu_down will return -EBUSY and do nothing.
47294 * Should always be manipulated under cpu_add_remove_lock 47791 * Should always be manipulated under cpu_add_remove_lock
47295diff -urNp linux-2.6.32.11/kernel/cred.c linux-2.6.32.11/kernel/cred.c 47792diff -urNp linux-2.6.32.12/kernel/cred.c linux-2.6.32.12/kernel/cred.c
47296--- linux-2.6.32.11/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400 47793--- linux-2.6.32.12/kernel/cred.c 2010-03-15 11:52:04.000000000 -0400
47297+++ linux-2.6.32.11/kernel/cred.c 2010-04-04 20:46:41.689696132 -0400 47794+++ linux-2.6.32.12/kernel/cred.c 2010-04-04 20:46:41.689696132 -0400
47298@@ -520,6 +520,8 @@ int commit_creds(struct cred *new) 47795@@ -520,6 +520,8 @@ int commit_creds(struct cred *new)
47299 47796
47300 get_cred(new); /* we will require a ref for the subj creds too */ 47797 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
47304 /* dumpability changes */ 47801 /* dumpability changes */
47305 if (old->euid != new->euid || 47802 if (old->euid != new->euid ||
47306 old->egid != new->egid || 47803 old->egid != new->egid ||
47307diff -urNp linux-2.6.32.11/kernel/exit.c linux-2.6.32.11/kernel/exit.c 47804diff -urNp linux-2.6.32.12/kernel/exit.c linux-2.6.32.12/kernel/exit.c
47308--- linux-2.6.32.11/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400 47805--- linux-2.6.32.12/kernel/exit.c 2010-03-15 11:52:04.000000000 -0400
47309+++ linux-2.6.32.11/kernel/exit.c 2010-04-04 20:46:41.689696132 -0400 47806+++ linux-2.6.32.12/kernel/exit.c 2010-04-04 20:46:41.689696132 -0400
47310@@ -56,6 +56,10 @@ 47807@@ -56,6 +56,10 @@
47311 #include <asm/mmu_context.h> 47808 #include <asm/mmu_context.h>
47312 #include "cred-internals.h" 47809 #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
47396 47893
47397 get_task_struct(p); 47894 get_task_struct(p);
47398 read_unlock(&tasklist_lock); 47895 read_unlock(&tasklist_lock);
47399diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c 47896diff -urNp linux-2.6.32.12/kernel/fork.c linux-2.6.32.12/kernel/fork.c
47400--- linux-2.6.32.11/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400 47897--- linux-2.6.32.12/kernel/fork.c 2010-03-15 11:52:04.000000000 -0400
47401+++ linux-2.6.32.11/kernel/fork.c 2010-04-04 20:46:41.689696132 -0400 47898+++ linux-2.6.32.12/kernel/fork.c 2010-04-04 20:46:41.689696132 -0400
47402@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru 47899@@ -253,7 +253,7 @@ static struct task_struct *dup_task_stru
47403 *stackend = STACK_END_MAGIC; /* for overflow detection */ 47900 *stackend = STACK_END_MAGIC; /* for overflow detection */
47404 47901
@@ -47551,9 +48048,9 @@ diff -urNp linux-2.6.32.11/kernel/fork.c linux-2.6.32.11/kernel/fork.c
47551 } 48048 }
47552 48049
47553 if (new_mm) { 48050 if (new_mm) {
47554diff -urNp linux-2.6.32.11/kernel/futex.c linux-2.6.32.11/kernel/futex.c 48051diff -urNp linux-2.6.32.12/kernel/futex.c linux-2.6.32.12/kernel/futex.c
47555--- linux-2.6.32.11/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400 48052--- linux-2.6.32.12/kernel/futex.c 2010-03-15 11:52:04.000000000 -0400
47556+++ linux-2.6.32.11/kernel/futex.c 2010-04-04 20:46:41.689696132 -0400 48053+++ linux-2.6.32.12/kernel/futex.c 2010-04-04 20:46:41.689696132 -0400
47557@@ -54,6 +54,7 @@ 48054@@ -54,6 +54,7 @@
47558 #include <linux/mount.h> 48055 #include <linux/mount.h>
47559 #include <linux/pagemap.h> 48056 #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
47621 { 48118 {
47622 unsigned long uentry; 48119 unsigned long uentry;
47623 48120
47624diff -urNp linux-2.6.32.11/kernel/futex_compat.c linux-2.6.32.11/kernel/futex_compat.c 48121diff -urNp linux-2.6.32.12/kernel/futex_compat.c linux-2.6.32.12/kernel/futex_compat.c
47625--- linux-2.6.32.11/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400 48122--- linux-2.6.32.12/kernel/futex_compat.c 2010-03-15 11:52:04.000000000 -0400
47626+++ linux-2.6.32.11/kernel/futex_compat.c 2010-04-04 20:46:41.693491350 -0400 48123+++ linux-2.6.32.12/kernel/futex_compat.c 2010-04-04 20:46:41.693491350 -0400
47627@@ -10,6 +10,7 @@ 48124@@ -10,6 +10,7 @@
47628 #include <linux/compat.h> 48125 #include <linux/compat.h>
47629 #include <linux/nsproxy.h> 48126 #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
47661 head = p->compat_robust_list; 48158 head = p->compat_robust_list;
47662 read_unlock(&tasklist_lock); 48159 read_unlock(&tasklist_lock);
47663 } 48160 }
47664diff -urNp linux-2.6.32.11/kernel/gcov/base.c linux-2.6.32.11/kernel/gcov/base.c 48161diff -urNp linux-2.6.32.12/kernel/gcov/base.c linux-2.6.32.12/kernel/gcov/base.c
47665--- linux-2.6.32.11/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400 48162--- linux-2.6.32.12/kernel/gcov/base.c 2010-03-15 11:52:04.000000000 -0400
47666+++ linux-2.6.32.11/kernel/gcov/base.c 2010-04-04 20:46:41.693491350 -0400 48163+++ linux-2.6.32.12/kernel/gcov/base.c 2010-04-04 20:46:41.693491350 -0400
47667@@ -102,11 +102,6 @@ void gcov_enable_events(void) 48164@@ -102,11 +102,6 @@ void gcov_enable_events(void)
47668 } 48165 }
47669 48166
@@ -47685,9 +48182,9 @@ diff -urNp linux-2.6.32.11/kernel/gcov/base.c linux-2.6.32.11/kernel/gcov/base.c
47685 if (prev) 48182 if (prev)
47686 prev->next = info->next; 48183 prev->next = info->next;
47687 else 48184 else
47688diff -urNp linux-2.6.32.11/kernel/hrtimer.c linux-2.6.32.11/kernel/hrtimer.c 48185diff -urNp linux-2.6.32.12/kernel/hrtimer.c linux-2.6.32.12/kernel/hrtimer.c
47689--- linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400 48186--- linux-2.6.32.12/kernel/hrtimer.c 2010-04-04 20:41:50.064534828 -0400
47690+++ linux-2.6.32.11/kernel/hrtimer.c 2010-04-04 20:46:41.693491350 -0400 48187+++ linux-2.6.32.12/kernel/hrtimer.c 2010-04-04 20:46:41.693491350 -0400
47691@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void) 48188@@ -1382,7 +1382,7 @@ void hrtimer_peek_ahead_timers(void)
47692 local_irq_restore(flags); 48189 local_irq_restore(flags);
47693 } 48190 }
@@ -47697,9 +48194,9 @@ diff -urNp linux-2.6.32.11/kernel/hrtimer.c linux-2.6.32.11/kernel/hrtimer.c
47697 { 48194 {
47698 hrtimer_peek_ahead_timers(); 48195 hrtimer_peek_ahead_timers();
47699 } 48196 }
47700diff -urNp linux-2.6.32.11/kernel/kallsyms.c linux-2.6.32.11/kernel/kallsyms.c 48197diff -urNp linux-2.6.32.12/kernel/kallsyms.c linux-2.6.32.12/kernel/kallsyms.c
47701--- linux-2.6.32.11/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 48198--- linux-2.6.32.12/kernel/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
47702+++ linux-2.6.32.11/kernel/kallsyms.c 2010-04-06 22:21:53.692294722 -0400 48199+++ linux-2.6.32.12/kernel/kallsyms.c 2010-04-06 22:21:53.692294722 -0400
47703@@ -11,6 +11,9 @@ 48200@@ -11,6 +11,9 @@
47704 * Changed the compression method from stem compression to "table lookup" 48201 * Changed the compression method from stem compression to "table lookup"
47705 * compression (see scripts/kallsyms.c for a more complete description) 48202 * 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
47776 if (!iter) 48273 if (!iter)
47777 return -ENOMEM; 48274 return -ENOMEM;
47778 reset_iter(iter, 0); 48275 reset_iter(iter, 0);
47779diff -urNp linux-2.6.32.11/kernel/kgdb.c linux-2.6.32.11/kernel/kgdb.c 48276diff -urNp linux-2.6.32.12/kernel/kgdb.c linux-2.6.32.12/kernel/kgdb.c
47780--- linux-2.6.32.11/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400 48277--- linux-2.6.32.12/kernel/kgdb.c 2010-03-15 11:52:04.000000000 -0400
47781+++ linux-2.6.32.11/kernel/kgdb.c 2010-04-04 20:46:41.693491350 -0400 48278+++ linux-2.6.32.12/kernel/kgdb.c 2010-04-04 20:46:41.693491350 -0400
47782@@ -86,7 +86,7 @@ static int kgdb_io_module_registered; 48279@@ -86,7 +86,7 @@ static int kgdb_io_module_registered;
47783 /* Guard for recursive entry */ 48280 /* Guard for recursive entry */
47784 static int exception_level; 48281 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
47806 { 48303 {
47807 BUG_ON(kgdb_connected); 48304 BUG_ON(kgdb_connected);
47808 48305
47809diff -urNp linux-2.6.32.11/kernel/kmod.c linux-2.6.32.11/kernel/kmod.c 48306diff -urNp linux-2.6.32.12/kernel/kmod.c linux-2.6.32.12/kernel/kmod.c
47810--- linux-2.6.32.11/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400 48307--- linux-2.6.32.12/kernel/kmod.c 2010-03-15 11:52:04.000000000 -0400
47811+++ linux-2.6.32.11/kernel/kmod.c 2010-04-04 20:46:41.693491350 -0400 48308+++ linux-2.6.32.12/kernel/kmod.c 2010-04-04 20:46:41.693491350 -0400
47812@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch 48309@@ -90,6 +90,18 @@ int __request_module(bool wait, const ch
47813 if (ret >= MODULE_NAME_LEN) 48310 if (ret >= MODULE_NAME_LEN)
47814 return -ENAMETOOLONG; 48311 return -ENAMETOOLONG;
@@ -47828,9 +48325,9 @@ diff -urNp linux-2.6.32.11/kernel/kmod.c linux-2.6.32.11/kernel/kmod.c
47828 /* If modprobe needs a service that is in a module, we get a recursive 48325 /* If modprobe needs a service that is in a module, we get a recursive
47829 * loop. Limit the number of running kmod threads to max_threads/2 or 48326 * loop. Limit the number of running kmod threads to max_threads/2 or
47830 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method 48327 * MAX_KMOD_CONCURRENT, whichever is the smaller. A cleaner method
47831diff -urNp linux-2.6.32.11/kernel/kprobes.c linux-2.6.32.11/kernel/kprobes.c 48328diff -urNp linux-2.6.32.12/kernel/kprobes.c linux-2.6.32.12/kernel/kprobes.c
47832--- linux-2.6.32.11/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400 48329--- linux-2.6.32.12/kernel/kprobes.c 2010-03-15 11:52:04.000000000 -0400
47833+++ linux-2.6.32.11/kernel/kprobes.c 2010-04-04 20:46:41.693491350 -0400 48330+++ linux-2.6.32.12/kernel/kprobes.c 2010-04-29 17:46:36.959467563 -0400
47834@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ 48331@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_
47835 * kernel image and loaded module images reside. This is required 48332 * kernel image and loaded module images reside. This is required
47836 * so x86_64 can correctly handle the %rip-relative fixups. 48333 * 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
47849 kfree(kip); 48346 kfree(kip);
47850 } 48347 }
47851 return 1; 48348 return 1;
47852diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c 48349@@ -1189,7 +1189,7 @@ static int __init init_kprobes(void)
47853--- linux-2.6.32.11/kernel/lockdep.c 2010-03-15 11:52:04.000000000 -0400 48350 {
47854+++ linux-2.6.32.11/kernel/lockdep.c 2010-04-04 20:46:41.693491350 -0400 48351 int i, err = 0;
48352 unsigned long offset = 0, size = 0;
48353- char *modname, namebuf[128];
48354+ char *modname, namebuf[KSYM_NAME_LEN];
48355 const char *symbol_name;
48356 void *addr;
48357 struct kprobe_blackpoint *kb;
48358@@ -1304,7 +1304,7 @@ static int __kprobes show_kprobe_addr(st
48359 const char *sym = NULL;
48360 unsigned int i = *(loff_t *) v;
48361 unsigned long offset = 0;
48362- char *modname, namebuf[128];
48363+ char *modname, namebuf[KSYM_NAME_LEN];
48364
48365 head = &kprobe_table[i];
48366 preempt_disable();
48367diff -urNp linux-2.6.32.12/kernel/lockdep.c linux-2.6.32.12/kernel/lockdep.c
48368--- linux-2.6.32.12/kernel/lockdep.c 2010-04-29 17:49:38.578001941 -0400
48369+++ linux-2.6.32.12/kernel/lockdep.c 2010-04-29 18:02:39.221319476 -0400
47855@@ -577,6 +577,10 @@ static int static_obj(void *obj) 48370@@ -577,6 +577,10 @@ static int static_obj(void *obj)
47856 int i; 48371 int i;
47857 #endif 48372 #endif
@@ -47866,9 +48381,9 @@ diff -urNp linux-2.6.32.11/kernel/lockdep.c linux-2.6.32.11/kernel/lockdep.c
47866@@ -592,8 +596,7 @@ static int static_obj(void *obj) 48381@@ -592,8 +596,7 @@ static int static_obj(void *obj)
47867 */ 48382 */
47868 for_each_possible_cpu(i) { 48383 for_each_possible_cpu(i) {
47869 start = (unsigned long) &__per_cpu_start + per_cpu_offset(i); 48384 start = (unsigned long) per_cpu_ptr(&__per_cpu_start, i);
47870- end = (unsigned long) &__per_cpu_start + PERCPU_ENOUGH_ROOM 48385- end = (unsigned long) per_cpu_ptr(&__per_cpu_start, i)
47871- + per_cpu_offset(i); 48386- + PERCPU_ENOUGH_ROOM;
47872+ end = start + PERCPU_ENOUGH_ROOM; 48387+ end = start + PERCPU_ENOUGH_ROOM;
47873 48388
47874 if ((addr >= start) && (addr < end)) 48389 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
47881 printk("the code is fine but needs lockdep annotation.\n"); 48396 printk("the code is fine but needs lockdep annotation.\n");
47882 printk("turning off the locking correctness validator.\n"); 48397 printk("turning off the locking correctness validator.\n");
47883 dump_stack(); 48398 dump_stack();
47884diff -urNp linux-2.6.32.11/kernel/module.c linux-2.6.32.11/kernel/module.c 48399diff -urNp linux-2.6.32.12/kernel/lockdep_proc.c linux-2.6.32.12/kernel/lockdep_proc.c
47885--- linux-2.6.32.11/kernel/module.c 2010-03-15 11:52:04.000000000 -0400 48400--- linux-2.6.32.12/kernel/lockdep_proc.c 2010-03-15 11:52:04.000000000 -0400
47886+++ linux-2.6.32.11/kernel/module.c 2010-04-04 20:46:41.693491350 -0400 48401+++ linux-2.6.32.12/kernel/lockdep_proc.c 2010-04-29 17:46:37.305259446 -0400
48402@@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
48403
48404 static void print_name(struct seq_file *m, struct lock_class *class)
48405 {
48406- char str[128];
48407+ char str[KSYM_NAME_LEN];
48408 const char *name = class->name;
48409
48410 if (!name) {
48411diff -urNp linux-2.6.32.12/kernel/module.c linux-2.6.32.12/kernel/module.c
48412--- linux-2.6.32.12/kernel/module.c 2010-04-29 17:49:38.586002480 -0400
48413+++ linux-2.6.32.12/kernel/module.c 2010-04-29 17:49:58.693515313 -0400
47887@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq 48414@@ -89,7 +89,8 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq
47888 static BLOCKING_NOTIFIER_HEAD(module_notify_list); 48415 static BLOCKING_NOTIFIER_HEAD(module_notify_list);
47889 48416
@@ -48423,9 +48950,9 @@ diff -urNp linux-2.6.32.11/kernel/module.c linux-2.6.32.11/kernel/module.c
48423 mod = NULL; 48950 mod = NULL;
48424 } 48951 }
48425 return mod; 48952 return mod;
48426diff -urNp linux-2.6.32.11/kernel/panic.c linux-2.6.32.11/kernel/panic.c 48953diff -urNp linux-2.6.32.12/kernel/panic.c linux-2.6.32.12/kernel/panic.c
48427--- linux-2.6.32.11/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400 48954--- linux-2.6.32.12/kernel/panic.c 2010-03-15 11:52:04.000000000 -0400
48428+++ linux-2.6.32.11/kernel/panic.c 2010-04-04 20:46:41.693491350 -0400 48955+++ linux-2.6.32.12/kernel/panic.c 2010-04-04 20:46:41.693491350 -0400
48429@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null); 48956@@ -392,7 +392,8 @@ EXPORT_SYMBOL(warn_slowpath_null);
48430 */ 48957 */
48431 void __stack_chk_fail(void) 48958 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
48436 __builtin_return_address(0)); 48963 __builtin_return_address(0));
48437 } 48964 }
48438 EXPORT_SYMBOL(__stack_chk_fail); 48965 EXPORT_SYMBOL(__stack_chk_fail);
48439diff -urNp linux-2.6.32.11/kernel/params.c linux-2.6.32.11/kernel/params.c 48966diff -urNp linux-2.6.32.12/kernel/params.c linux-2.6.32.12/kernel/params.c
48440--- linux-2.6.32.11/kernel/params.c 2010-03-15 11:52:04.000000000 -0400 48967--- linux-2.6.32.12/kernel/params.c 2010-03-15 11:52:04.000000000 -0400
48441+++ linux-2.6.32.11/kernel/params.c 2010-04-04 20:46:41.693491350 -0400 48968+++ linux-2.6.32.12/kernel/params.c 2010-04-04 20:46:41.693491350 -0400
48442@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct 48969@@ -725,7 +725,7 @@ static ssize_t module_attr_store(struct
48443 return ret; 48970 return ret;
48444 } 48971 }
@@ -48457,9 +48984,9 @@ diff -urNp linux-2.6.32.11/kernel/params.c linux-2.6.32.11/kernel/params.c
48457 .filter = uevent_filter, 48984 .filter = uevent_filter,
48458 }; 48985 };
48459 48986
48460diff -urNp linux-2.6.32.11/kernel/pid.c linux-2.6.32.11/kernel/pid.c 48987diff -urNp linux-2.6.32.12/kernel/pid.c linux-2.6.32.12/kernel/pid.c
48461--- linux-2.6.32.11/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400 48988--- linux-2.6.32.12/kernel/pid.c 2010-03-15 11:52:04.000000000 -0400
48462+++ linux-2.6.32.11/kernel/pid.c 2010-04-04 20:46:41.693491350 -0400 48989+++ linux-2.6.32.12/kernel/pid.c 2010-04-04 20:46:41.693491350 -0400
48463@@ -33,6 +33,7 @@ 48990@@ -33,6 +33,7 @@
48464 #include <linux/rculist.h> 48991 #include <linux/rculist.h>
48465 #include <linux/bootmem.h> 48992 #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
48493 } 49020 }
48494 49021
48495 struct task_struct *find_task_by_vpid(pid_t vnr) 49022 struct task_struct *find_task_by_vpid(pid_t vnr)
48496diff -urNp linux-2.6.32.11/kernel/posix-cpu-timers.c linux-2.6.32.11/kernel/posix-cpu-timers.c 49023diff -urNp linux-2.6.32.12/kernel/posix-cpu-timers.c linux-2.6.32.12/kernel/posix-cpu-timers.c
48497--- linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400 49024--- linux-2.6.32.12/kernel/posix-cpu-timers.c 2010-03-15 11:52:04.000000000 -0400
48498+++ linux-2.6.32.11/kernel/posix-cpu-timers.c 2010-04-04 20:46:41.697788265 -0400 49025+++ linux-2.6.32.12/kernel/posix-cpu-timers.c 2010-04-04 20:46:41.697788265 -0400
48499@@ -6,6 +6,7 @@ 49026@@ -6,6 +6,7 @@
48500 #include <linux/posix-timers.h> 49027 #include <linux/posix-timers.h>
48501 #include <linux/errno.h> 49028 #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
48520 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { 49047 if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) {
48521 /* 49048 /*
48522 * At the soft limit, send a SIGXCPU every second. 49049 * At the soft limit, send a SIGXCPU every second.
48523diff -urNp linux-2.6.32.11/kernel/power/hibernate.c linux-2.6.32.11/kernel/power/hibernate.c 49050diff -urNp linux-2.6.32.12/kernel/power/hibernate.c linux-2.6.32.12/kernel/power/hibernate.c
48524--- linux-2.6.32.11/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400 49051--- linux-2.6.32.12/kernel/power/hibernate.c 2010-03-15 11:52:04.000000000 -0400
48525+++ linux-2.6.32.11/kernel/power/hibernate.c 2010-04-04 20:46:41.697788265 -0400 49052+++ linux-2.6.32.12/kernel/power/hibernate.c 2010-04-04 20:46:41.697788265 -0400
48526@@ -48,14 +48,14 @@ enum { 49053@@ -48,14 +48,14 @@ enum {
48527 49054
48528 static int hibernation_mode = HIBERNATION_SHUTDOWN; 49055 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
48540 { 49067 {
48541 if (ops && !(ops->begin && ops->end && ops->pre_snapshot 49068 if (ops && !(ops->begin && ops->end && ops->pre_snapshot
48542 && ops->prepare && ops->finish && ops->enter && ops->pre_restore 49069 && ops->prepare && ops->finish && ops->enter && ops->pre_restore
48543diff -urNp linux-2.6.32.11/kernel/power/poweroff.c linux-2.6.32.11/kernel/power/poweroff.c 49070diff -urNp linux-2.6.32.12/kernel/power/poweroff.c linux-2.6.32.12/kernel/power/poweroff.c
48544--- linux-2.6.32.11/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400 49071--- linux-2.6.32.12/kernel/power/poweroff.c 2010-03-15 11:52:04.000000000 -0400
48545+++ linux-2.6.32.11/kernel/power/poweroff.c 2010-04-04 20:46:41.697788265 -0400 49072+++ linux-2.6.32.12/kernel/power/poweroff.c 2010-04-04 20:46:41.697788265 -0400
48546@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof 49073@@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof
48547 .enable_mask = SYSRQ_ENABLE_BOOT, 49074 .enable_mask = SYSRQ_ENABLE_BOOT,
48548 }; 49075 };
@@ -48552,9 +49079,9 @@ diff -urNp linux-2.6.32.11/kernel/power/poweroff.c linux-2.6.32.11/kernel/power/
48552 { 49079 {
48553 register_sysrq_key('o', &sysrq_poweroff_op); 49080 register_sysrq_key('o', &sysrq_poweroff_op);
48554 return 0; 49081 return 0;
48555diff -urNp linux-2.6.32.11/kernel/power/process.c linux-2.6.32.11/kernel/power/process.c 49082diff -urNp linux-2.6.32.12/kernel/power/process.c linux-2.6.32.12/kernel/power/process.c
48556--- linux-2.6.32.11/kernel/power/process.c 2010-03-15 11:52:04.000000000 -0400 49083--- linux-2.6.32.12/kernel/power/process.c 2010-04-29 17:49:38.590000225 -0400
48557+++ linux-2.6.32.11/kernel/power/process.c 2010-04-04 20:46:41.697788265 -0400 49084+++ linux-2.6.32.12/kernel/power/process.c 2010-04-29 17:49:58.697130575 -0400
48558@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_ 49085@@ -37,12 +37,15 @@ static int try_to_freeze_tasks(bool sig_
48559 struct timeval start, end; 49086 struct timeval start, end;
48560 u64 elapsed_csecs64; 49087 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
48594 49121
48595 do_gettimeofday(&end); 49122 do_gettimeofday(&end);
48596 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start); 49123 elapsed_csecs64 = timeval_to_ns(&end) - timeval_to_ns(&start);
48597diff -urNp linux-2.6.32.11/kernel/power/suspend.c linux-2.6.32.11/kernel/power/suspend.c 49124diff -urNp linux-2.6.32.12/kernel/power/suspend.c linux-2.6.32.12/kernel/power/suspend.c
48598--- linux-2.6.32.11/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400 49125--- linux-2.6.32.12/kernel/power/suspend.c 2010-03-15 11:52:04.000000000 -0400
48599+++ linux-2.6.32.11/kernel/power/suspend.c 2010-04-04 20:46:41.697788265 -0400 49126+++ linux-2.6.32.12/kernel/power/suspend.c 2010-04-04 20:46:41.697788265 -0400
48600@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M 49127@@ -23,13 +23,13 @@ const char *const pm_states[PM_SUSPEND_M
48601 [PM_SUSPEND_MEM] = "mem", 49128 [PM_SUSPEND_MEM] = "mem",
48602 }; 49129 };
@@ -48613,9 +49140,9 @@ diff -urNp linux-2.6.32.11/kernel/power/suspend.c linux-2.6.32.11/kernel/power/s
48613 { 49140 {
48614 mutex_lock(&pm_mutex); 49141 mutex_lock(&pm_mutex);
48615 suspend_ops = ops; 49142 suspend_ops = ops;
48616diff -urNp linux-2.6.32.11/kernel/printk.c linux-2.6.32.11/kernel/printk.c 49143diff -urNp linux-2.6.32.12/kernel/printk.c linux-2.6.32.12/kernel/printk.c
48617--- linux-2.6.32.11/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400 49144--- linux-2.6.32.12/kernel/printk.c 2010-03-15 11:52:04.000000000 -0400
48618+++ linux-2.6.32.11/kernel/printk.c 2010-04-04 20:46:41.697788265 -0400 49145+++ linux-2.6.32.12/kernel/printk.c 2010-04-04 20:46:41.697788265 -0400
48619@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf 49146@@ -278,6 +278,11 @@ int do_syslog(int type, char __user *buf
48620 char c; 49147 char c;
48621 int error = 0; 49148 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
48628 error = security_syslog(type); 49155 error = security_syslog(type);
48629 if (error) 49156 if (error)
48630 return error; 49157 return error;
48631diff -urNp linux-2.6.32.11/kernel/ptrace.c linux-2.6.32.11/kernel/ptrace.c 49158diff -urNp linux-2.6.32.12/kernel/ptrace.c linux-2.6.32.12/kernel/ptrace.c
48632--- linux-2.6.32.11/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400 49159--- linux-2.6.32.12/kernel/ptrace.c 2010-03-15 11:52:04.000000000 -0400
48633+++ linux-2.6.32.11/kernel/ptrace.c 2010-04-04 20:46:41.697788265 -0400 49160+++ linux-2.6.32.12/kernel/ptrace.c 2010-04-04 20:46:41.697788265 -0400
48634@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru 49161@@ -141,7 +141,7 @@ int __ptrace_may_access(struct task_stru
48635 cred->gid != tcred->egid || 49162 cred->gid != tcred->egid ||
48636 cred->gid != tcred->sgid || 49163 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
48712 } 49239 }
48713 49240
48714 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data) 49241 int generic_ptrace_pokedata(struct task_struct *tsk, long addr, long data)
48715diff -urNp linux-2.6.32.11/kernel/rcutree.c linux-2.6.32.11/kernel/rcutree.c 49242diff -urNp linux-2.6.32.12/kernel/rcutree.c linux-2.6.32.12/kernel/rcutree.c
48716--- linux-2.6.32.11/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400 49243--- linux-2.6.32.12/kernel/rcutree.c 2010-03-15 11:52:04.000000000 -0400
48717+++ linux-2.6.32.11/kernel/rcutree.c 2010-04-04 20:46:41.697788265 -0400 49244+++ linux-2.6.32.12/kernel/rcutree.c 2010-04-04 20:46:41.697788265 -0400
48718@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state 49245@@ -1303,7 +1303,7 @@ __rcu_process_callbacks(struct rcu_state
48719 /* 49246 /*
48720 * Do softirq processing for the current CPU. 49247 * 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
48724 { 49251 {
48725 /* 49252 /*
48726 * Memory references from any prior RCU read-side critical sections 49253 * Memory references from any prior RCU read-side critical sections
48727diff -urNp linux-2.6.32.11/kernel/relay.c linux-2.6.32.11/kernel/relay.c 49254diff -urNp linux-2.6.32.12/kernel/relay.c linux-2.6.32.12/kernel/relay.c
48728--- linux-2.6.32.11/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400 49255--- linux-2.6.32.12/kernel/relay.c 2010-03-15 11:52:04.000000000 -0400
48729+++ linux-2.6.32.11/kernel/relay.c 2010-04-04 20:46:41.697788265 -0400 49256+++ linux-2.6.32.12/kernel/relay.c 2010-04-04 20:46:41.697788265 -0400
48730@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi 49257@@ -1292,7 +1292,7 @@ static int subbuf_splice_actor(struct fi
48731 return 0; 49258 return 0;
48732 49259
@@ -48736,9 +49263,9 @@ diff -urNp linux-2.6.32.11/kernel/relay.c linux-2.6.32.11/kernel/relay.c
48736 return ret; 49263 return ret;
48737 49264
48738 if (read_start + ret == nonpad_end) 49265 if (read_start + ret == nonpad_end)
48739diff -urNp linux-2.6.32.11/kernel/resource.c linux-2.6.32.11/kernel/resource.c 49266diff -urNp linux-2.6.32.12/kernel/resource.c linux-2.6.32.12/kernel/resource.c
48740--- linux-2.6.32.11/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400 49267--- linux-2.6.32.12/kernel/resource.c 2010-03-15 11:52:04.000000000 -0400
48741+++ linux-2.6.32.11/kernel/resource.c 2010-04-04 20:46:41.697788265 -0400 49268+++ linux-2.6.32.12/kernel/resource.c 2010-04-04 20:46:41.697788265 -0400
48742@@ -132,8 +132,18 @@ static const struct file_operations proc 49269@@ -132,8 +132,18 @@ static const struct file_operations proc
48743 49270
48744 static int __init ioresources_init(void) 49271 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
48758 return 0; 49285 return 0;
48759 } 49286 }
48760 __initcall(ioresources_init); 49287 __initcall(ioresources_init);
48761diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c 49288diff -urNp linux-2.6.32.12/kernel/sched.c linux-2.6.32.12/kernel/sched.c
48762--- linux-2.6.32.11/kernel/sched.c 2010-04-04 20:41:50.068477203 -0400 49289--- linux-2.6.32.12/kernel/sched.c 2010-04-29 17:49:38.609495328 -0400
48763+++ linux-2.6.32.11/kernel/sched.c 2010-04-04 20:46:41.697788265 -0400 49290+++ linux-2.6.32.12/kernel/sched.c 2010-04-29 17:49:58.717524885 -0400
48764@@ -4843,7 +4843,7 @@ out: 49291@@ -4841,7 +4841,7 @@ out:
48765 * In CONFIG_NO_HZ case, the idle load balance owner will do the 49292 * In CONFIG_NO_HZ case, the idle load balance owner will do the
48766 * rebalancing for all the cpus for whom scheduler ticks are stopped. 49293 * rebalancing for all the cpus for whom scheduler ticks are stopped.
48767 */ 49294 */
@@ -48770,7 +49297,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
48770 { 49297 {
48771 int this_cpu = smp_processor_id(); 49298 int this_cpu = smp_processor_id();
48772 struct rq *this_rq = cpu_rq(this_cpu); 49299 struct rq *this_rq = cpu_rq(this_cpu);
48773@@ -6112,6 +6112,8 @@ int can_nice(const struct task_struct *p 49300@@ -6110,6 +6110,8 @@ int can_nice(const struct task_struct *p
48774 /* convert nice value [19,-20] to rlimit style value [1,40] */ 49301 /* convert nice value [19,-20] to rlimit style value [1,40] */
48775 int nice_rlim = 20 - nice; 49302 int nice_rlim = 20 - nice;
48776 49303
@@ -48779,7 +49306,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
48779 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || 49306 return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur ||
48780 capable(CAP_SYS_NICE)); 49307 capable(CAP_SYS_NICE));
48781 } 49308 }
48782@@ -6145,7 +6147,8 @@ SYSCALL_DEFINE1(nice, int, increment) 49309@@ -6143,7 +6145,8 @@ SYSCALL_DEFINE1(nice, int, increment)
48783 if (nice > 19) 49310 if (nice > 19)
48784 nice = 19; 49311 nice = 19;
48785 49312
@@ -48789,7 +49316,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
48789 return -EPERM; 49316 return -EPERM;
48790 49317
48791 retval = security_task_setnice(current, nice); 49318 retval = security_task_setnice(current, nice);
48792@@ -6295,6 +6298,8 @@ recheck: 49319@@ -6293,6 +6296,8 @@ recheck:
48793 if (rt_policy(policy)) { 49320 if (rt_policy(policy)) {
48794 unsigned long rlim_rtprio; 49321 unsigned long rlim_rtprio;
48795 49322
@@ -48798,7 +49325,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
48798 if (!lock_task_sighand(p, &flags)) 49325 if (!lock_task_sighand(p, &flags))
48799 return -ESRCH; 49326 return -ESRCH;
48800 rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; 49327 rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur;
48801@@ -7447,7 +7452,7 @@ static struct ctl_table sd_ctl_dir[] = { 49328@@ -7452,7 +7457,7 @@ static struct ctl_table sd_ctl_dir[] = {
48802 .procname = "sched_domain", 49329 .procname = "sched_domain",
48803 .mode = 0555, 49330 .mode = 0555,
48804 }, 49331 },
@@ -48807,7 +49334,7 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
48807 }; 49334 };
48808 49335
48809 static struct ctl_table sd_ctl_root[] = { 49336 static struct ctl_table sd_ctl_root[] = {
48810@@ -7457,7 +7462,7 @@ static struct ctl_table sd_ctl_root[] = 49337@@ -7462,7 +7467,7 @@ static struct ctl_table sd_ctl_root[] =
48811 .mode = 0555, 49338 .mode = 0555,
48812 .child = sd_ctl_dir, 49339 .child = sd_ctl_dir,
48813 }, 49340 },
@@ -48816,9 +49343,33 @@ diff -urNp linux-2.6.32.11/kernel/sched.c linux-2.6.32.11/kernel/sched.c
48816 }; 49343 };
48817 49344
48818 static struct ctl_table *sd_alloc_ctl_entry(int n) 49345 static struct ctl_table *sd_alloc_ctl_entry(int n)
48819diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c 49346diff -urNp linux-2.6.32.12/kernel/signal.c linux-2.6.32.12/kernel/signal.c
48820--- linux-2.6.32.11/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400 49347--- linux-2.6.32.12/kernel/signal.c 2010-03-15 11:52:04.000000000 -0400
48821+++ linux-2.6.32.11/kernel/signal.c 2010-04-04 20:46:41.701624986 -0400 49348+++ linux-2.6.32.12/kernel/signal.c 2010-04-29 17:46:37.333938325 -0400
49349@@ -41,12 +41,12 @@
49350
49351 static struct kmem_cache *sigqueue_cachep;
49352
49353-static void __user *sig_handler(struct task_struct *t, int sig)
49354+static __sighandler_t sig_handler(struct task_struct *t, int sig)
49355 {
49356 return t->sighand->action[sig - 1].sa.sa_handler;
49357 }
49358
49359-static int sig_handler_ignored(void __user *handler, int sig)
49360+static int sig_handler_ignored(__sighandler_t handler, int sig)
49361 {
49362 /* Is it explicitly or implicitly ignored? */
49363 return handler == SIG_IGN ||
49364@@ -56,7 +56,7 @@ static int sig_handler_ignored(void __us
49365 static int sig_task_ignored(struct task_struct *t, int sig,
49366 int from_ancestor_ns)
49367 {
49368- void __user *handler;
49369+ __sighandler_t handler;
49370
49371 handler = sig_handler(t, sig);
49372
48822@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc 49373@@ -207,6 +207,9 @@ static struct sigqueue *__sigqueue_alloc
48823 */ 49374 */
48824 user = get_uid(__task_cred(t)->user); 49375 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
48829 if (override_rlimit || 49380 if (override_rlimit ||
48830 atomic_read(&user->sigpending) <= 49381 atomic_read(&user->sigpending) <=
48831 t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur) 49382 t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur)
49383@@ -327,7 +330,7 @@ flush_signal_handlers(struct task_struct
49384
49385 int unhandled_signal(struct task_struct *tsk, int sig)
49386 {
49387- void __user *handler = tsk->sighand->action[sig-1].sa.sa_handler;
49388+ __sighandler_t handler = tsk->sighand->action[sig-1].sa.sa_handler;
49389 if (is_global_init(tsk))
49390 return 1;
49391 if (handler != SIG_IGN && handler != SIG_DFL)
48832@@ -625,6 +628,9 @@ static int check_kill_permission(int sig 49392@@ -625,6 +628,9 @@ static int check_kill_permission(int sig
48833 } 49393 }
48834 } 49394 }
@@ -48871,9 +49431,9 @@ diff -urNp linux-2.6.32.11/kernel/signal.c linux-2.6.32.11/kernel/signal.c
48871 49431
48872 return ret; 49432 return ret;
48873 } 49433 }
48874diff -urNp linux-2.6.32.11/kernel/smp.c linux-2.6.32.11/kernel/smp.c 49434diff -urNp linux-2.6.32.12/kernel/smp.c linux-2.6.32.12/kernel/smp.c
48875--- linux-2.6.32.11/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400 49435--- linux-2.6.32.12/kernel/smp.c 2010-03-15 11:52:04.000000000 -0400
48876+++ linux-2.6.32.11/kernel/smp.c 2010-04-04 20:46:41.701624986 -0400 49436+++ linux-2.6.32.12/kernel/smp.c 2010-04-04 20:46:41.701624986 -0400
48877@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void 49437@@ -459,22 +459,22 @@ int smp_call_function(void (*func)(void
48878 } 49438 }
48879 EXPORT_SYMBOL(smp_call_function); 49439 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
48901 { 49461 {
48902 spin_unlock_irq(&call_function.lock); 49462 spin_unlock_irq(&call_function.lock);
48903 } 49463 }
48904diff -urNp linux-2.6.32.11/kernel/softirq.c linux-2.6.32.11/kernel/softirq.c 49464diff -urNp linux-2.6.32.12/kernel/softirq.c linux-2.6.32.12/kernel/softirq.c
48905--- linux-2.6.32.11/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400 49465--- linux-2.6.32.12/kernel/softirq.c 2010-03-15 11:52:04.000000000 -0400
48906+++ linux-2.6.32.11/kernel/softirq.c 2010-04-04 20:46:41.701624986 -0400 49466+++ linux-2.6.32.12/kernel/softirq.c 2010-04-04 20:46:41.701624986 -0400
48907@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec 49467@@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
48908 49468
48909 static DEFINE_PER_CPU(struct task_struct *, ksoftirqd); 49469 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
48958 { 49518 {
48959 struct tasklet_struct *list; 49519 struct tasklet_struct *list;
48960 49520
48961diff -urNp linux-2.6.32.11/kernel/sys.c linux-2.6.32.11/kernel/sys.c 49521diff -urNp linux-2.6.32.12/kernel/sys.c linux-2.6.32.12/kernel/sys.c
48962--- linux-2.6.32.11/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400 49522--- linux-2.6.32.12/kernel/sys.c 2010-03-15 11:52:04.000000000 -0400
48963+++ linux-2.6.32.11/kernel/sys.c 2010-04-04 20:46:41.701624986 -0400 49523+++ linux-2.6.32.12/kernel/sys.c 2010-04-04 20:46:41.701624986 -0400
48964@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru 49524@@ -133,6 +133,12 @@ static int set_one_prio(struct task_stru
48965 error = -EACCES; 49525 error = -EACCES;
48966 goto out; 49526 goto out;
@@ -49096,9 +49656,9 @@ diff -urNp linux-2.6.32.11/kernel/sys.c linux-2.6.32.11/kernel/sys.c
49096 error = -EINVAL; 49656 error = -EINVAL;
49097 break; 49657 break;
49098 } 49658 }
49099diff -urNp linux-2.6.32.11/kernel/sysctl.c linux-2.6.32.11/kernel/sysctl.c 49659diff -urNp linux-2.6.32.12/kernel/sysctl.c linux-2.6.32.12/kernel/sysctl.c
49100--- linux-2.6.32.11/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400 49660--- linux-2.6.32.12/kernel/sysctl.c 2010-03-15 11:52:04.000000000 -0400
49101+++ linux-2.6.32.11/kernel/sysctl.c 2010-04-04 20:46:41.701624986 -0400 49661+++ linux-2.6.32.12/kernel/sysctl.c 2010-04-04 20:46:41.701624986 -0400
49102@@ -63,6 +63,13 @@ 49662@@ -63,6 +63,13 @@
49103 static int deprecated_sysctl_warning(struct __sysctl_args *args); 49663 static int deprecated_sysctl_warning(struct __sysctl_args *args);
49104 49664
@@ -49220,9 +49780,9 @@ diff -urNp linux-2.6.32.11/kernel/sysctl.c linux-2.6.32.11/kernel/sysctl.c
49220 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); 49780 error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC));
49221 if (error) 49781 if (error)
49222 return error; 49782 return error;
49223diff -urNp linux-2.6.32.11/kernel/taskstats.c linux-2.6.32.11/kernel/taskstats.c 49783diff -urNp linux-2.6.32.12/kernel/taskstats.c linux-2.6.32.12/kernel/taskstats.c
49224--- linux-2.6.32.11/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400 49784--- linux-2.6.32.12/kernel/taskstats.c 2010-03-15 11:52:04.000000000 -0400
49225+++ linux-2.6.32.11/kernel/taskstats.c 2010-04-04 20:46:41.701624986 -0400 49785+++ linux-2.6.32.12/kernel/taskstats.c 2010-04-04 20:46:41.701624986 -0400
49226@@ -26,9 +26,12 @@ 49786@@ -26,9 +26,12 @@
49227 #include <linux/cgroup.h> 49787 #include <linux/cgroup.h>
49228 #include <linux/fs.h> 49788 #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
49246 if (!alloc_cpumask_var(&mask, GFP_KERNEL)) 49806 if (!alloc_cpumask_var(&mask, GFP_KERNEL))
49247 return -ENOMEM; 49807 return -ENOMEM;
49248 49808
49249diff -urNp linux-2.6.32.11/kernel/time/tick-broadcast.c linux-2.6.32.11/kernel/time/tick-broadcast.c 49809diff -urNp linux-2.6.32.12/kernel/time/tick-broadcast.c linux-2.6.32.12/kernel/time/tick-broadcast.c
49250--- linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400 49810--- linux-2.6.32.12/kernel/time/tick-broadcast.c 2010-03-15 11:52:04.000000000 -0400
49251+++ linux-2.6.32.11/kernel/time/tick-broadcast.c 2010-04-04 20:46:41.701624986 -0400 49811+++ linux-2.6.32.12/kernel/time/tick-broadcast.c 2010-04-04 20:46:41.701624986 -0400
49252@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl 49812@@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl
49253 * then clear the broadcast bit. 49813 * then clear the broadcast bit.
49254 */ 49814 */
@@ -49258,9 +49818,9 @@ diff -urNp linux-2.6.32.11/kernel/time/tick-broadcast.c linux-2.6.32.11/kernel/t
49258 49818
49259 cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); 49819 cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
49260 tick_broadcast_clear_oneshot(cpu); 49820 tick_broadcast_clear_oneshot(cpu);
49261diff -urNp linux-2.6.32.11/kernel/time.c linux-2.6.32.11/kernel/time.c 49821diff -urNp linux-2.6.32.12/kernel/time.c linux-2.6.32.12/kernel/time.c
49262--- linux-2.6.32.11/kernel/time.c 2010-03-15 11:52:04.000000000 -0400 49822--- linux-2.6.32.12/kernel/time.c 2010-03-15 11:52:04.000000000 -0400
49263+++ linux-2.6.32.11/kernel/time.c 2010-04-04 20:46:41.701624986 -0400 49823+++ linux-2.6.32.12/kernel/time.c 2010-04-04 20:46:41.701624986 -0400
49264@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, 49824@@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *,
49265 return err; 49825 return err;
49266 49826
@@ -49298,9 +49858,9 @@ diff -urNp linux-2.6.32.11/kernel/time.c linux-2.6.32.11/kernel/time.c
49298 { 49858 {
49299 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) 49859 #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ)
49300 return (USEC_PER_SEC / HZ) * j; 49860 return (USEC_PER_SEC / HZ) * j;
49301diff -urNp linux-2.6.32.11/kernel/timer.c linux-2.6.32.11/kernel/timer.c 49861diff -urNp linux-2.6.32.12/kernel/timer.c linux-2.6.32.12/kernel/timer.c
49302--- linux-2.6.32.11/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400 49862--- linux-2.6.32.12/kernel/timer.c 2010-03-15 11:52:04.000000000 -0400
49303+++ linux-2.6.32.11/kernel/timer.c 2010-04-04 20:46:41.701624986 -0400 49863+++ linux-2.6.32.12/kernel/timer.c 2010-04-04 20:46:41.701624986 -0400
49304@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick) 49864@@ -1207,7 +1207,7 @@ void update_process_times(int user_tick)
49305 /* 49865 /*
49306 * This function runs timers and the timer-tq in bottom half context. 49866 * 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
49310 { 49870 {
49311 struct tvec_base *base = __get_cpu_var(tvec_bases); 49871 struct tvec_base *base = __get_cpu_var(tvec_bases);
49312 49872
49313diff -urNp linux-2.6.32.11/kernel/trace/ftrace.c linux-2.6.32.11/kernel/trace/ftrace.c 49873diff -urNp linux-2.6.32.12/kernel/trace/ftrace.c linux-2.6.32.12/kernel/trace/ftrace.c
49314--- linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400 49874--- linux-2.6.32.12/kernel/trace/ftrace.c 2010-04-04 20:41:50.068477203 -0400
49315+++ linux-2.6.32.11/kernel/trace/ftrace.c 2010-04-04 20:46:41.701624986 -0400 49875+++ linux-2.6.32.12/kernel/trace/ftrace.c 2010-04-04 20:46:41.701624986 -0400
49316@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod, 49876@@ -1093,13 +1093,18 @@ ftrace_code_disable(struct module *mod,
49317 49877
49318 ip = rec->ip; 49878 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
49334 } 49894 }
49335 49895
49336 /* 49896 /*
49337diff -urNp linux-2.6.32.11/kernel/trace/Kconfig linux-2.6.32.11/kernel/trace/Kconfig 49897diff -urNp linux-2.6.32.12/kernel/trace/Kconfig linux-2.6.32.12/kernel/trace/Kconfig
49338--- linux-2.6.32.11/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400 49898--- linux-2.6.32.12/kernel/trace/Kconfig 2010-03-15 11:52:04.000000000 -0400
49339+++ linux-2.6.32.11/kernel/trace/Kconfig 2010-04-04 20:46:41.701624986 -0400 49899+++ linux-2.6.32.12/kernel/trace/Kconfig 2010-04-04 20:46:41.701624986 -0400
49340@@ -126,6 +126,7 @@ if FTRACE 49900@@ -126,6 +126,7 @@ if FTRACE
49341 config FUNCTION_TRACER 49901 config FUNCTION_TRACER
49342 bool "Kernel Function Tracer" 49902 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
49353 select FUNCTION_TRACER 49913 select FUNCTION_TRACER
49354 select STACKTRACE 49914 select STACKTRACE
49355 select KALLSYMS 49915 select KALLSYMS
49356diff -urNp linux-2.6.32.11/kernel/trace/trace.c linux-2.6.32.11/kernel/trace/trace.c 49916diff -urNp linux-2.6.32.12/kernel/trace/ring_buffer.c linux-2.6.32.12/kernel/trace/ring_buffer.c
49357--- linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400 49917--- linux-2.6.32.12/kernel/trace/ring_buffer.c 2010-04-04 20:41:50.072525146 -0400
49358+++ linux-2.6.32.11/kernel/trace/trace.c 2010-04-04 20:46:41.705142860 -0400 49918+++ linux-2.6.32.12/kernel/trace/ring_buffer.c 2010-04-29 17:46:37.362529614 -0400
49919@@ -606,7 +606,7 @@ static struct list_head *rb_list_head(st
49920 * the reader page). But if the next page is a header page,
49921 * its flags will be non zero.
49922 */
49923-static int inline
49924+static inline int
49925 rb_is_head_page(struct ring_buffer_per_cpu *cpu_buffer,
49926 struct buffer_page *page, struct list_head *list)
49927 {
49928diff -urNp linux-2.6.32.12/kernel/trace/trace.c linux-2.6.32.12/kernel/trace/trace.c
49929--- linux-2.6.32.12/kernel/trace/trace.c 2010-04-04 20:41:50.072525146 -0400
49930+++ linux-2.6.32.12/kernel/trace/trace.c 2010-04-04 20:46:41.705142860 -0400
49359@@ -3808,10 +3808,9 @@ static const struct file_operations trac 49931@@ -3808,10 +3808,9 @@ static const struct file_operations trac
49360 }; 49932 };
49361 #endif 49933 #endif
@@ -49380,9 +49952,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace.c linux-2.6.32.11/kernel/trace/tra
49380 static int once; 49952 static int once;
49381 struct dentry *d_tracer; 49953 struct dentry *d_tracer;
49382 49954
49383diff -urNp linux-2.6.32.11/kernel/trace/trace_events.c linux-2.6.32.11/kernel/trace/trace_events.c 49955diff -urNp linux-2.6.32.12/kernel/trace/trace_events.c linux-2.6.32.12/kernel/trace/trace_events.c
49384--- linux-2.6.32.11/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400 49956--- linux-2.6.32.12/kernel/trace/trace_events.c 2010-03-15 11:52:04.000000000 -0400
49385+++ linux-2.6.32.11/kernel/trace/trace_events.c 2010-04-04 20:46:41.705142860 -0400 49957+++ linux-2.6.32.12/kernel/trace/trace_events.c 2010-04-04 20:46:41.705142860 -0400
49386@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list 49958@@ -951,6 +951,8 @@ static LIST_HEAD(ftrace_module_file_list
49387 * Modules must own their file_operations to keep up with 49959 * Modules must own their file_operations to keep up with
49388 * reference counting. 49960 * 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
49392 struct ftrace_module_file_ops { 49964 struct ftrace_module_file_ops {
49393 struct list_head list; 49965 struct list_head list;
49394 struct module *mod; 49966 struct module *mod;
49395diff -urNp linux-2.6.32.11/kernel/trace/trace_output.c linux-2.6.32.11/kernel/trace/trace_output.c 49967diff -urNp linux-2.6.32.12/kernel/trace/trace_output.c linux-2.6.32.12/kernel/trace/trace_output.c
49396--- linux-2.6.32.11/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400 49968--- linux-2.6.32.12/kernel/trace/trace_output.c 2010-03-15 11:52:04.000000000 -0400
49397+++ linux-2.6.32.11/kernel/trace/trace_output.c 2010-04-04 20:46:41.705142860 -0400 49969+++ linux-2.6.32.12/kernel/trace/trace_output.c 2010-04-04 20:46:41.705142860 -0400
49398@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s, 49970@@ -237,7 +237,7 @@ int trace_seq_path(struct trace_seq *s,
49399 return 0; 49971 return 0;
49400 p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); 49972 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
49404 if (p) { 49976 if (p) {
49405 s->len = p - s->buffer; 49977 s->len = p - s->buffer;
49406 return 1; 49978 return 1;
49407diff -urNp linux-2.6.32.11/kernel/trace/trace_stack.c linux-2.6.32.11/kernel/trace/trace_stack.c 49979diff -urNp linux-2.6.32.12/kernel/trace/trace_stack.c linux-2.6.32.12/kernel/trace/trace_stack.c
49408--- linux-2.6.32.11/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400 49980--- linux-2.6.32.12/kernel/trace/trace_stack.c 2010-03-15 11:52:04.000000000 -0400
49409+++ linux-2.6.32.11/kernel/trace/trace_stack.c 2010-04-04 20:46:41.705142860 -0400 49981+++ linux-2.6.32.12/kernel/trace/trace_stack.c 2010-04-04 20:46:41.705142860 -0400
49410@@ -50,7 +50,7 @@ static inline void check_stack(void) 49982@@ -50,7 +50,7 @@ static inline void check_stack(void)
49411 return; 49983 return;
49412 49984
@@ -49416,9 +49988,9 @@ diff -urNp linux-2.6.32.11/kernel/trace/trace_stack.c linux-2.6.32.11/kernel/tra
49416 return; 49988 return;
49417 49989
49418 local_irq_save(flags); 49990 local_irq_save(flags);
49419diff -urNp linux-2.6.32.11/kernel/utsname_sysctl.c linux-2.6.32.11/kernel/utsname_sysctl.c 49991diff -urNp linux-2.6.32.12/kernel/utsname_sysctl.c linux-2.6.32.12/kernel/utsname_sysctl.c
49420--- linux-2.6.32.11/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400 49992--- linux-2.6.32.12/kernel/utsname_sysctl.c 2010-03-15 11:52:04.000000000 -0400
49421+++ linux-2.6.32.11/kernel/utsname_sysctl.c 2010-04-04 20:46:41.705142860 -0400 49993+++ linux-2.6.32.12/kernel/utsname_sysctl.c 2010-04-04 20:46:41.705142860 -0400
49422@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] 49994@@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[]
49423 .proc_handler = proc_do_uts_string, 49995 .proc_handler = proc_do_uts_string,
49424 .strategy = sysctl_uts_string, 49996 .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
49437 }; 50009 };
49438 50010
49439 static int __init utsname_sysctl_init(void) 50011 static int __init utsname_sysctl_init(void)
49440diff -urNp linux-2.6.32.11/lib/bug.c linux-2.6.32.11/lib/bug.c 50012diff -urNp linux-2.6.32.12/lib/bug.c linux-2.6.32.12/lib/bug.c
49441--- linux-2.6.32.11/lib/bug.c 2010-03-15 11:52:04.000000000 -0400 50013--- linux-2.6.32.12/lib/bug.c 2010-03-15 11:52:04.000000000 -0400
49442+++ linux-2.6.32.11/lib/bug.c 2010-04-04 20:46:41.705142860 -0400 50014+++ linux-2.6.32.12/lib/bug.c 2010-04-04 20:46:41.705142860 -0400
49443@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l 50015@@ -135,6 +135,8 @@ enum bug_trap_type report_bug(unsigned l
49444 return BUG_TRAP_TYPE_NONE; 50016 return BUG_TRAP_TYPE_NONE;
49445 50017
@@ -49449,9 +50021,9 @@ diff -urNp linux-2.6.32.11/lib/bug.c linux-2.6.32.11/lib/bug.c
49449 50021
49450 printk(KERN_EMERG "------------[ cut here ]------------\n"); 50022 printk(KERN_EMERG "------------[ cut here ]------------\n");
49451 50023
49452diff -urNp linux-2.6.32.11/lib/debugobjects.c linux-2.6.32.11/lib/debugobjects.c 50024diff -urNp linux-2.6.32.12/lib/debugobjects.c linux-2.6.32.12/lib/debugobjects.c
49453--- linux-2.6.32.11/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400 50025--- linux-2.6.32.12/lib/debugobjects.c 2010-03-15 11:52:04.000000000 -0400
49454+++ linux-2.6.32.11/lib/debugobjects.c 2010-04-04 20:46:41.705142860 -0400 50026+++ linux-2.6.32.12/lib/debugobjects.c 2010-04-04 20:46:41.705142860 -0400
49455@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi 50027@@ -277,7 +277,7 @@ static void debug_object_is_on_stack(voi
49456 if (limit > 4) 50028 if (limit > 4)
49457 return; 50029 return;
@@ -49461,9 +50033,9 @@ diff -urNp linux-2.6.32.11/lib/debugobjects.c linux-2.6.32.11/lib/debugobjects.c
49461 if (is_on_stack == onstack) 50033 if (is_on_stack == onstack)
49462 return; 50034 return;
49463 50035
49464diff -urNp linux-2.6.32.11/lib/dma-debug.c linux-2.6.32.11/lib/dma-debug.c 50036diff -urNp linux-2.6.32.12/lib/dma-debug.c linux-2.6.32.12/lib/dma-debug.c
49465--- linux-2.6.32.11/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400 50037--- linux-2.6.32.12/lib/dma-debug.c 2010-03-15 11:52:04.000000000 -0400
49466+++ linux-2.6.32.11/lib/dma-debug.c 2010-04-04 20:46:41.705142860 -0400 50038+++ linux-2.6.32.12/lib/dma-debug.c 2010-04-04 20:46:41.705142860 -0400
49467@@ -861,7 +861,7 @@ out: 50039@@ -861,7 +861,7 @@ out:
49468 50040
49469 static void check_for_stack(struct device *dev, void *addr) 50041 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
49473 err_printk(dev, NULL, "DMA-API: device driver maps memory from" 50045 err_printk(dev, NULL, "DMA-API: device driver maps memory from"
49474 "stack [addr=%p]\n", addr); 50046 "stack [addr=%p]\n", addr);
49475 } 50047 }
49476diff -urNp linux-2.6.32.11/lib/idr.c linux-2.6.32.11/lib/idr.c 50048diff -urNp linux-2.6.32.12/lib/idr.c linux-2.6.32.12/lib/idr.c
49477--- linux-2.6.32.11/lib/idr.c 2010-03-15 11:52:04.000000000 -0400 50049--- linux-2.6.32.12/lib/idr.c 2010-03-15 11:52:04.000000000 -0400
49478+++ linux-2.6.32.11/lib/idr.c 2010-04-04 20:46:41.705142860 -0400 50050+++ linux-2.6.32.12/lib/idr.c 2010-04-04 20:46:41.705142860 -0400
49479@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in 50051@@ -156,7 +156,7 @@ static int sub_alloc(struct idr *idp, in
49480 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1; 50052 id = (id | ((1 << (IDR_BITS * l)) - 1)) + 1;
49481 50053
@@ -49485,9 +50057,9 @@ diff -urNp linux-2.6.32.11/lib/idr.c linux-2.6.32.11/lib/idr.c
49485 *starting_id = id; 50057 *starting_id = id;
49486 return IDR_NEED_TO_GROW; 50058 return IDR_NEED_TO_GROW;
49487 } 50059 }
49488diff -urNp linux-2.6.32.11/lib/inflate.c linux-2.6.32.11/lib/inflate.c 50060diff -urNp linux-2.6.32.12/lib/inflate.c linux-2.6.32.12/lib/inflate.c
49489--- linux-2.6.32.11/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400 50061--- linux-2.6.32.12/lib/inflate.c 2010-03-15 11:52:04.000000000 -0400
49490+++ linux-2.6.32.11/lib/inflate.c 2010-04-04 20:46:41.705142860 -0400 50062+++ linux-2.6.32.12/lib/inflate.c 2010-04-04 20:46:41.705142860 -0400
49491@@ -266,7 +266,7 @@ static void free(void *where) 50063@@ -266,7 +266,7 @@ static void free(void *where)
49492 malloc_ptr = free_mem_ptr; 50064 malloc_ptr = free_mem_ptr;
49493 } 50065 }
@@ -49497,9 +50069,9 @@ diff -urNp linux-2.6.32.11/lib/inflate.c linux-2.6.32.11/lib/inflate.c
49497 #define free(a) kfree(a) 50069 #define free(a) kfree(a)
49498 #endif 50070 #endif
49499 50071
49500diff -urNp linux-2.6.32.11/lib/Kconfig.debug linux-2.6.32.11/lib/Kconfig.debug 50072diff -urNp linux-2.6.32.12/lib/Kconfig.debug linux-2.6.32.12/lib/Kconfig.debug
49501--- linux-2.6.32.11/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400 50073--- linux-2.6.32.12/lib/Kconfig.debug 2010-03-15 11:52:04.000000000 -0400
49502+++ linux-2.6.32.11/lib/Kconfig.debug 2010-04-04 20:46:41.705142860 -0400 50074+++ linux-2.6.32.12/lib/Kconfig.debug 2010-04-04 20:46:41.705142860 -0400
49503@@ -905,7 +905,7 @@ config LATENCYTOP 50075@@ -905,7 +905,7 @@ config LATENCYTOP
49504 select STACKTRACE 50076 select STACKTRACE
49505 select SCHEDSTATS 50077 select SCHEDSTATS
@@ -49509,9 +50081,9 @@ diff -urNp linux-2.6.32.11/lib/Kconfig.debug linux-2.6.32.11/lib/Kconfig.debug
49509 help 50081 help
49510 Enable this option if you want to use the LatencyTOP tool 50082 Enable this option if you want to use the LatencyTOP tool
49511 to find out which userspace is blocking on what kernel operations. 50083 to find out which userspace is blocking on what kernel operations.
49512diff -urNp linux-2.6.32.11/lib/kobject.c linux-2.6.32.11/lib/kobject.c 50084diff -urNp linux-2.6.32.12/lib/kobject.c linux-2.6.32.12/lib/kobject.c
49513--- linux-2.6.32.11/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400 50085--- linux-2.6.32.12/lib/kobject.c 2010-03-15 11:52:04.000000000 -0400
49514+++ linux-2.6.32.11/lib/kobject.c 2010-04-04 20:46:41.705142860 -0400 50086+++ linux-2.6.32.12/lib/kobject.c 2010-04-04 20:46:41.705142860 -0400
49515@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko 50087@@ -700,7 +700,7 @@ static ssize_t kobj_attr_store(struct ko
49516 return ret; 50088 return ret;
49517 } 50089 }
@@ -49539,9 +50111,9 @@ diff -urNp linux-2.6.32.11/lib/kobject.c linux-2.6.32.11/lib/kobject.c
49539 struct kobject *parent_kobj) 50111 struct kobject *parent_kobj)
49540 { 50112 {
49541 struct kset *kset; 50113 struct kset *kset;
49542diff -urNp linux-2.6.32.11/lib/kobject_uevent.c linux-2.6.32.11/lib/kobject_uevent.c 50114diff -urNp linux-2.6.32.12/lib/kobject_uevent.c linux-2.6.32.12/lib/kobject_uevent.c
49543--- linux-2.6.32.11/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400 50115--- linux-2.6.32.12/lib/kobject_uevent.c 2010-03-15 11:52:04.000000000 -0400
49544+++ linux-2.6.32.11/lib/kobject_uevent.c 2010-04-04 20:46:41.705142860 -0400 50116+++ linux-2.6.32.12/lib/kobject_uevent.c 2010-04-04 20:46:41.705142860 -0400
49545@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k 50117@@ -95,7 +95,7 @@ int kobject_uevent_env(struct kobject *k
49546 const char *subsystem; 50118 const char *subsystem;
49547 struct kobject *top_kobj; 50119 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
49551 u64 seq; 50123 u64 seq;
49552 int i = 0; 50124 int i = 0;
49553 int retval = 0; 50125 int retval = 0;
49554diff -urNp linux-2.6.32.11/lib/parser.c linux-2.6.32.11/lib/parser.c 50126diff -urNp linux-2.6.32.12/lib/parser.c linux-2.6.32.12/lib/parser.c
49555--- linux-2.6.32.11/lib/parser.c 2010-03-15 11:52:04.000000000 -0400 50127--- linux-2.6.32.12/lib/parser.c 2010-03-15 11:52:04.000000000 -0400
49556+++ linux-2.6.32.11/lib/parser.c 2010-04-04 20:46:41.705142860 -0400 50128+++ linux-2.6.32.12/lib/parser.c 2010-04-04 20:46:41.705142860 -0400
49557@@ -126,7 +126,7 @@ static int match_number(substring_t *s, 50129@@ -126,7 +126,7 @@ static int match_number(substring_t *s,
49558 char *buf; 50130 char *buf;
49559 int ret; 50131 int ret;
@@ -49563,9 +50135,9 @@ diff -urNp linux-2.6.32.11/lib/parser.c linux-2.6.32.11/lib/parser.c
49563 if (!buf) 50135 if (!buf)
49564 return -ENOMEM; 50136 return -ENOMEM;
49565 memcpy(buf, s->from, s->to - s->from); 50137 memcpy(buf, s->from, s->to - s->from);
49566diff -urNp linux-2.6.32.11/lib/radix-tree.c linux-2.6.32.11/lib/radix-tree.c 50138diff -urNp linux-2.6.32.12/lib/radix-tree.c linux-2.6.32.12/lib/radix-tree.c
49567--- linux-2.6.32.11/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400 50139--- linux-2.6.32.12/lib/radix-tree.c 2010-03-15 11:52:04.000000000 -0400
49568+++ linux-2.6.32.11/lib/radix-tree.c 2010-04-04 20:46:41.705142860 -0400 50140+++ linux-2.6.32.12/lib/radix-tree.c 2010-04-04 20:46:41.705142860 -0400
49569@@ -81,7 +81,7 @@ struct radix_tree_preload { 50141@@ -81,7 +81,7 @@ struct radix_tree_preload {
49570 int nr; 50142 int nr;
49571 struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; 50143 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
49575 50147
49576 static inline gfp_t root_gfp_mask(struct radix_tree_root *root) 50148 static inline gfp_t root_gfp_mask(struct radix_tree_root *root)
49577 { 50149 {
49578diff -urNp linux-2.6.32.11/lib/random32.c linux-2.6.32.11/lib/random32.c 50150diff -urNp linux-2.6.32.12/lib/random32.c linux-2.6.32.12/lib/random32.c
49579--- linux-2.6.32.11/lib/random32.c 2010-03-15 11:52:04.000000000 -0400 50151--- linux-2.6.32.12/lib/random32.c 2010-03-15 11:52:04.000000000 -0400
49580+++ linux-2.6.32.11/lib/random32.c 2010-04-04 20:46:41.705142860 -0400 50152+++ linux-2.6.32.12/lib/random32.c 2010-04-04 20:46:41.705142860 -0400
49581@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * 50153@@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state *
49582 */ 50154 */
49583 static inline u32 __seed(u32 x, u32 m) 50155 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
49587 } 50159 }
49588 50160
49589 /** 50161 /**
49590diff -urNp linux-2.6.32.11/localversion-grsec linux-2.6.32.11/localversion-grsec 50162diff -urNp linux-2.6.32.12/localversion-grsec linux-2.6.32.12/localversion-grsec
49591--- linux-2.6.32.11/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 50163--- linux-2.6.32.12/localversion-grsec 1969-12-31 19:00:00.000000000 -0500
49592+++ linux-2.6.32.11/localversion-grsec 2010-04-04 20:46:41.705142860 -0400 50164+++ linux-2.6.32.12/localversion-grsec 2010-04-04 20:46:41.705142860 -0400
49593@@ -0,0 +1 @@ 50165@@ -0,0 +1 @@
49594+-grsec 50166+-grsec
49595diff -urNp linux-2.6.32.11/Makefile linux-2.6.32.11/Makefile 50167diff -urNp linux-2.6.32.12/Makefile linux-2.6.32.12/Makefile
49596--- linux-2.6.32.11/Makefile 2010-04-04 20:41:49.914404054 -0400 50168--- linux-2.6.32.12/Makefile 2010-04-29 17:49:37.365428457 -0400
49597+++ linux-2.6.32.11/Makefile 2010-04-04 20:46:41.705142860 -0400 50169+++ linux-2.6.32.12/Makefile 2010-04-29 17:49:57.861101311 -0400
49598@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" 50170@@ -221,8 +221,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
49599 50171
49600 HOSTCC = gcc 50172 HOSTCC = gcc
@@ -49615,9 +50187,9 @@ diff -urNp linux-2.6.32.11/Makefile linux-2.6.32.11/Makefile
49615 50187
49616 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ 50188 vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \
49617 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ 50189 $(core-y) $(core-m) $(drivers-y) $(drivers-m) \
49618diff -urNp linux-2.6.32.11/mm/filemap.c linux-2.6.32.11/mm/filemap.c 50190diff -urNp linux-2.6.32.12/mm/filemap.c linux-2.6.32.12/mm/filemap.c
49619--- linux-2.6.32.11/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400 50191--- linux-2.6.32.12/mm/filemap.c 2010-03-15 11:52:04.000000000 -0400
49620+++ linux-2.6.32.11/mm/filemap.c 2010-04-04 20:46:41.708732353 -0400 50192+++ linux-2.6.32.12/mm/filemap.c 2010-04-04 20:46:41.708732353 -0400
49621@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file 50193@@ -1622,7 +1622,7 @@ int generic_file_mmap(struct file * file
49622 struct address_space *mapping = file->f_mapping; 50194 struct address_space *mapping = file->f_mapping;
49623 50195
@@ -49635,9 +50207,9 @@ diff -urNp linux-2.6.32.11/mm/filemap.c linux-2.6.32.11/mm/filemap.c
49635 if (*pos >= limit) { 50207 if (*pos >= limit) {
49636 send_sig(SIGXFSZ, current, 0); 50208 send_sig(SIGXFSZ, current, 0);
49637 return -EFBIG; 50209 return -EFBIG;
49638diff -urNp linux-2.6.32.11/mm/fremap.c linux-2.6.32.11/mm/fremap.c 50210diff -urNp linux-2.6.32.12/mm/fremap.c linux-2.6.32.12/mm/fremap.c
49639--- linux-2.6.32.11/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400 50211--- linux-2.6.32.12/mm/fremap.c 2010-03-15 11:52:04.000000000 -0400
49640+++ linux-2.6.32.11/mm/fremap.c 2010-04-04 20:46:41.708732353 -0400 50212+++ linux-2.6.32.12/mm/fremap.c 2010-04-04 20:46:41.708732353 -0400
49641@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign 50213@@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
49642 retry: 50214 retry:
49643 vma = find_vma(mm, start); 50215 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
49650 /* 50222 /*
49651 * Make sure the vma is shared, that it supports prefaulting, 50223 * Make sure the vma is shared, that it supports prefaulting,
49652 * and that the remapped range is valid and fully within 50224 * and that the remapped range is valid and fully within
49653diff -urNp linux-2.6.32.11/mm/highmem.c linux-2.6.32.11/mm/highmem.c 50225diff -urNp linux-2.6.32.12/mm/highmem.c linux-2.6.32.12/mm/highmem.c
49654--- linux-2.6.32.11/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400 50226--- linux-2.6.32.12/mm/highmem.c 2010-03-15 11:52:04.000000000 -0400
49655+++ linux-2.6.32.11/mm/highmem.c 2010-04-04 20:46:41.708732353 -0400 50227+++ linux-2.6.32.12/mm/highmem.c 2010-04-04 20:46:41.708732353 -0400
49656@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void) 50228@@ -116,9 +116,10 @@ static void flush_all_zero_pkmaps(void)
49657 * So no dangers, even with speculative execution. 50229 * So no dangers, even with speculative execution.
49658 */ 50230 */
@@ -49678,9 +50250,9 @@ diff -urNp linux-2.6.32.11/mm/highmem.c linux-2.6.32.11/mm/highmem.c
49678 pkmap_count[last_pkmap_nr] = 1; 50250 pkmap_count[last_pkmap_nr] = 1;
49679 set_page_address(page, (void *)vaddr); 50251 set_page_address(page, (void *)vaddr);
49680 50252
49681diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c 50253diff -urNp linux-2.6.32.12/mm/hugetlb.c linux-2.6.32.12/mm/hugetlb.c
49682--- linux-2.6.32.11/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400 50254--- linux-2.6.32.12/mm/hugetlb.c 2010-03-15 11:52:04.000000000 -0400
49683+++ linux-2.6.32.11/mm/hugetlb.c 2010-04-04 20:46:41.708732353 -0400 50255+++ linux-2.6.32.12/mm/hugetlb.c 2010-04-04 20:46:41.708732353 -0400
49684@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s 50256@@ -1924,6 +1924,26 @@ static int unmap_ref_private(struct mm_s
49685 return 1; 50257 return 1;
49686 } 50258 }
@@ -49760,9 +50332,9 @@ diff -urNp linux-2.6.32.11/mm/hugetlb.c linux-2.6.32.11/mm/hugetlb.c
49760 ptep = huge_pte_alloc(mm, address, huge_page_size(h)); 50332 ptep = huge_pte_alloc(mm, address, huge_page_size(h));
49761 if (!ptep) 50333 if (!ptep)
49762 return VM_FAULT_OOM; 50334 return VM_FAULT_OOM;
49763diff -urNp linux-2.6.32.11/mm/Kconfig linux-2.6.32.11/mm/Kconfig 50335diff -urNp linux-2.6.32.12/mm/Kconfig linux-2.6.32.12/mm/Kconfig
49764--- linux-2.6.32.11/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400 50336--- linux-2.6.32.12/mm/Kconfig 2010-03-15 11:52:04.000000000 -0400
49765+++ linux-2.6.32.11/mm/Kconfig 2010-04-04 20:46:41.708732353 -0400 50337+++ linux-2.6.32.12/mm/Kconfig 2010-04-04 20:46:41.708732353 -0400
49766@@ -228,7 +228,7 @@ config KSM 50338@@ -228,7 +228,7 @@ config KSM
49767 config DEFAULT_MMAP_MIN_ADDR 50339 config DEFAULT_MMAP_MIN_ADDR
49768 int "Low address space to protect from user allocation" 50340 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
49772 help 50344 help
49773 This is the portion of low virtual memory which should be protected 50345 This is the portion of low virtual memory which should be protected
49774 from userspace allocation. Keeping a user from writing to low pages 50346 from userspace allocation. Keeping a user from writing to low pages
49775diff -urNp linux-2.6.32.11/mm/maccess.c linux-2.6.32.11/mm/maccess.c 50347diff -urNp linux-2.6.32.12/mm/maccess.c linux-2.6.32.12/mm/maccess.c
49776--- linux-2.6.32.11/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400 50348--- linux-2.6.32.12/mm/maccess.c 2010-03-15 11:52:04.000000000 -0400
49777+++ linux-2.6.32.11/mm/maccess.c 2010-04-04 20:46:41.708732353 -0400 50349+++ linux-2.6.32.12/mm/maccess.c 2010-04-04 20:46:41.708732353 -0400
49778@@ -14,7 +14,7 @@ 50350@@ -14,7 +14,7 @@
49779 * Safely read from address @src to the buffer at @dst. If a kernel fault 50351 * Safely read from address @src to the buffer at @dst. If a kernel fault
49780 * happens, handle that and return -EFAULT. 50352 * 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
49793 { 50365 {
49794 long ret; 50366 long ret;
49795 mm_segment_t old_fs = get_fs(); 50367 mm_segment_t old_fs = get_fs();
49796diff -urNp linux-2.6.32.11/mm/madvise.c linux-2.6.32.11/mm/madvise.c 50368diff -urNp linux-2.6.32.12/mm/madvise.c linux-2.6.32.12/mm/madvise.c
49797--- linux-2.6.32.11/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400 50369--- linux-2.6.32.12/mm/madvise.c 2010-03-15 11:52:04.000000000 -0400
49798+++ linux-2.6.32.11/mm/madvise.c 2010-04-04 20:46:41.708732353 -0400 50370+++ linux-2.6.32.12/mm/madvise.c 2010-04-04 20:46:41.708732353 -0400
49799@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a 50371@@ -44,6 +44,10 @@ static long madvise_behavior(struct vm_a
49800 pgoff_t pgoff; 50372 pgoff_t pgoff;
49801 unsigned long new_flags = vma->vm_flags; 50373 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
49872 error = 0; 50444 error = 0;
49873 if (end == start) 50445 if (end == start)
49874 goto out; 50446 goto out;
49875diff -urNp linux-2.6.32.11/mm/memory.c linux-2.6.32.11/mm/memory.c 50447diff -urNp linux-2.6.32.12/mm/memory.c linux-2.6.32.12/mm/memory.c
49876--- linux-2.6.32.11/mm/memory.c 2010-03-15 11:52:04.000000000 -0400 50448--- linux-2.6.32.12/mm/memory.c 2010-03-15 11:52:04.000000000 -0400
49877+++ linux-2.6.32.11/mm/memory.c 2010-04-04 20:46:41.708732353 -0400 50449+++ linux-2.6.32.12/mm/memory.c 2010-04-04 20:46:41.708732353 -0400
49878@@ -48,6 +48,7 @@ 50450@@ -48,6 +48,7 @@
49879 #include <linux/ksm.h> 50451 #include <linux/ksm.h>
49880 #include <linux/rmap.h> 50452 #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
50279 /* 50851 /*
50280 * Make sure the vDSO gets into every core dump. 50852 * Make sure the vDSO gets into every core dump.
50281 * Dumping its contents makes post-mortem fully interpretable later 50853 * Dumping its contents makes post-mortem fully interpretable later
50282diff -urNp linux-2.6.32.11/mm/memory-failure.c linux-2.6.32.11/mm/memory-failure.c 50854diff -urNp linux-2.6.32.12/mm/memory-failure.c linux-2.6.32.12/mm/memory-failure.c
50283--- linux-2.6.32.11/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400 50855--- linux-2.6.32.12/mm/memory-failure.c 2010-03-15 11:52:04.000000000 -0400
50284+++ linux-2.6.32.11/mm/memory-failure.c 2010-04-04 20:46:41.708732353 -0400 50856+++ linux-2.6.32.12/mm/memory-failure.c 2010-04-04 20:46:41.708732353 -0400
50285@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r 50857@@ -46,7 +46,7 @@ int sysctl_memory_failure_early_kill __r
50286 50858
50287 int sysctl_memory_failure_recovery __read_mostly = 1; 50859 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
50300 50872
50301 /* 50873 /*
50302 * We need/can do nothing about count=0 pages. 50874 * We need/can do nothing about count=0 pages.
50303diff -urNp linux-2.6.32.11/mm/mempolicy.c linux-2.6.32.11/mm/mempolicy.c 50875diff -urNp linux-2.6.32.12/mm/mempolicy.c linux-2.6.32.12/mm/mempolicy.c
50304--- linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400 50876--- linux-2.6.32.12/mm/mempolicy.c 2010-04-04 20:41:50.072525146 -0400
50305+++ linux-2.6.32.11/mm/mempolicy.c 2010-04-04 20:46:41.708732353 -0400 50877+++ linux-2.6.32.12/mm/mempolicy.c 2010-04-04 20:46:41.708732353 -0400
50306@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st 50878@@ -573,6 +573,10 @@ static int mbind_range(struct vm_area_st
50307 struct vm_area_struct *next; 50879 struct vm_area_struct *next;
50308 int err; 50880 int err;
@@ -50383,9 +50955,9 @@ diff -urNp linux-2.6.32.11/mm/mempolicy.c linux-2.6.32.11/mm/mempolicy.c
50383 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { 50955 } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) {
50384 seq_printf(m, " heap"); 50956 seq_printf(m, " heap");
50385 } else if (vma->vm_start <= mm->start_stack && 50957 } else if (vma->vm_start <= mm->start_stack &&
50386diff -urNp linux-2.6.32.11/mm/migrate.c linux-2.6.32.11/mm/migrate.c 50958diff -urNp linux-2.6.32.12/mm/migrate.c linux-2.6.32.12/mm/migrate.c
50387--- linux-2.6.32.11/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400 50959--- linux-2.6.32.12/mm/migrate.c 2010-03-15 11:52:04.000000000 -0400
50388+++ linux-2.6.32.11/mm/migrate.c 2010-04-04 20:46:41.708732353 -0400 50960+++ linux-2.6.32.12/mm/migrate.c 2010-04-04 20:46:41.708732353 -0400
50389@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, 50961@@ -1106,6 +1106,14 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid,
50390 if (!mm) 50962 if (!mm)
50391 return -EINVAL; 50963 return -EINVAL;
@@ -50411,9 +50983,9 @@ diff -urNp linux-2.6.32.11/mm/migrate.c linux-2.6.32.11/mm/migrate.c
50411 rcu_read_unlock(); 50983 rcu_read_unlock();
50412 err = -EPERM; 50984 err = -EPERM;
50413 goto out; 50985 goto out;
50414diff -urNp linux-2.6.32.11/mm/mlock.c linux-2.6.32.11/mm/mlock.c 50986diff -urNp linux-2.6.32.12/mm/mlock.c linux-2.6.32.12/mm/mlock.c
50415--- linux-2.6.32.11/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400 50987--- linux-2.6.32.12/mm/mlock.c 2010-03-15 11:52:04.000000000 -0400
50416+++ linux-2.6.32.11/mm/mlock.c 2010-04-04 20:46:41.708732353 -0400 50988+++ linux-2.6.32.12/mm/mlock.c 2010-04-04 20:46:41.708732353 -0400
50417@@ -13,6 +13,7 @@ 50989@@ -13,6 +13,7 @@
50418 #include <linux/pagemap.h> 50990 #include <linux/pagemap.h>
50419 #include <linux/mempolicy.h> 50991 #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
50482 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || 51054 if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
50483 capable(CAP_IPC_LOCK)) 51055 capable(CAP_IPC_LOCK))
50484 ret = do_mlockall(flags); 51056 ret = do_mlockall(flags);
50485diff -urNp linux-2.6.32.11/mm/mmap.c linux-2.6.32.11/mm/mmap.c 51057diff -urNp linux-2.6.32.12/mm/mmap.c linux-2.6.32.12/mm/mmap.c
50486--- linux-2.6.32.11/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400 51058--- linux-2.6.32.12/mm/mmap.c 2010-03-15 11:52:04.000000000 -0400
50487+++ linux-2.6.32.11/mm/mmap.c 2010-04-04 20:46:41.713805609 -0400 51059+++ linux-2.6.32.12/mm/mmap.c 2010-04-04 20:46:41.713805609 -0400
50488@@ -45,6 +45,16 @@ 51060@@ -45,6 +45,16 @@
50489 #define arch_rebalance_pgtables(addr, len) (addr) 51061 #define arch_rebalance_pgtables(addr, len) (addr)
50490 #endif 51062 #endif
@@ -51573,9 +52145,9 @@ diff -urNp linux-2.6.32.11/mm/mmap.c linux-2.6.32.11/mm/mmap.c
51573 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; 52145 vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND;
51574 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); 52146 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
51575 52147
51576diff -urNp linux-2.6.32.11/mm/mprotect.c linux-2.6.32.11/mm/mprotect.c 52148diff -urNp linux-2.6.32.12/mm/mprotect.c linux-2.6.32.12/mm/mprotect.c
51577--- linux-2.6.32.11/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400 52149--- linux-2.6.32.12/mm/mprotect.c 2010-03-15 11:52:04.000000000 -0400
51578+++ linux-2.6.32.11/mm/mprotect.c 2010-04-04 20:46:41.713805609 -0400 52150+++ linux-2.6.32.12/mm/mprotect.c 2010-04-04 20:46:41.713805609 -0400
51579@@ -24,10 +24,16 @@ 52151@@ -24,10 +24,16 @@
51580 #include <linux/mmu_notifier.h> 52152 #include <linux/mmu_notifier.h>
51581 #include <linux/migrate.h> 52153 #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
51766 nstart = tmp; 52338 nstart = tmp;
51767 52339
51768 if (nstart < prev->vm_end) 52340 if (nstart < prev->vm_end)
51769diff -urNp linux-2.6.32.11/mm/mremap.c linux-2.6.32.11/mm/mremap.c 52341diff -urNp linux-2.6.32.12/mm/mremap.c linux-2.6.32.12/mm/mremap.c
51770--- linux-2.6.32.11/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400 52342--- linux-2.6.32.12/mm/mremap.c 2010-03-15 11:52:04.000000000 -0400
51771+++ linux-2.6.32.11/mm/mremap.c 2010-04-04 20:46:41.713805609 -0400 52343+++ linux-2.6.32.12/mm/mremap.c 2010-04-04 20:46:41.713805609 -0400
51772@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str 52344@@ -114,6 +114,12 @@ static void move_ptes(struct vm_area_str
51773 continue; 52345 continue;
51774 pte = ptep_clear_flush(vma, old_addr, old_pte); 52346 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
51869 } 52441 }
51870 out: 52442 out:
51871 if (ret & ~PAGE_MASK) 52443 if (ret & ~PAGE_MASK)
51872diff -urNp linux-2.6.32.11/mm/nommu.c linux-2.6.32.11/mm/nommu.c 52444diff -urNp linux-2.6.32.12/mm/nommu.c linux-2.6.32.12/mm/nommu.c
51873--- linux-2.6.32.11/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400 52445--- linux-2.6.32.12/mm/nommu.c 2010-03-15 11:52:04.000000000 -0400
51874+++ linux-2.6.32.11/mm/nommu.c 2010-04-04 20:46:41.713805609 -0400 52446+++ linux-2.6.32.12/mm/nommu.c 2010-04-04 20:46:41.713805609 -0400
51875@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m 52447@@ -758,15 +758,6 @@ struct vm_area_struct *find_vma(struct m
51876 EXPORT_SYMBOL(find_vma); 52448 EXPORT_SYMBOL(find_vma);
51877 52449
@@ -51888,9 +52460,9 @@ diff -urNp linux-2.6.32.11/mm/nommu.c linux-2.6.32.11/mm/nommu.c
51888 * expand a stack to a given address 52460 * expand a stack to a given address
51889 * - not supported under NOMMU conditions 52461 * - not supported under NOMMU conditions
51890 */ 52462 */
51891diff -urNp linux-2.6.32.11/mm/page_alloc.c linux-2.6.32.11/mm/page_alloc.c 52463diff -urNp linux-2.6.32.12/mm/page_alloc.c linux-2.6.32.12/mm/page_alloc.c
51892--- linux-2.6.32.11/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400 52464--- linux-2.6.32.12/mm/page_alloc.c 2010-03-15 11:52:04.000000000 -0400
51893+++ linux-2.6.32.11/mm/page_alloc.c 2010-04-04 20:46:41.713805609 -0400 52465+++ linux-2.6.32.12/mm/page_alloc.c 2010-04-29 17:46:37.045244082 -0400
51894@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page 52466@@ -586,6 +586,10 @@ static void __free_pages_ok(struct page
51895 int bad = 0; 52467 int bad = 0;
51896 int wasMlocked = __TestClearPageMlocked(page); 52468 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
51938 arch_free_page(page, 0); 52510 arch_free_page(page, 0);
51939 kernel_map_pages(page, 1, 0); 52511 kernel_map_pages(page, 1, 0);
51940 52512
51941diff -urNp linux-2.6.32.11/mm/percpu.c linux-2.6.32.11/mm/percpu.c 52513@@ -3723,7 +3740,7 @@ static void __init setup_usemap(struct p
51942--- linux-2.6.32.11/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400 52514 zone->pageblock_flags = alloc_bootmem_node(pgdat, usemapsize);
51943+++ linux-2.6.32.11/mm/percpu.c 2010-04-04 20:46:41.713805609 -0400 52515 }
52516 #else
52517-static void inline setup_usemap(struct pglist_data *pgdat,
52518+static inline void setup_usemap(struct pglist_data *pgdat,
52519 struct zone *zone, unsigned long zonesize) {}
52520 #endif /* CONFIG_SPARSEMEM */
52521
52522diff -urNp linux-2.6.32.12/mm/percpu.c linux-2.6.32.12/mm/percpu.c
52523--- linux-2.6.32.12/mm/percpu.c 2010-03-15 11:52:04.000000000 -0400
52524+++ linux-2.6.32.12/mm/percpu.c 2010-04-04 20:46:41.713805609 -0400
51944@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu 52525@@ -115,7 +115,7 @@ static unsigned int pcpu_first_unit_cpu
51945 static unsigned int pcpu_last_unit_cpu __read_mostly; 52526 static unsigned int pcpu_last_unit_cpu __read_mostly;
51946 52527
@@ -51950,9 +52531,9 @@ diff -urNp linux-2.6.32.11/mm/percpu.c linux-2.6.32.11/mm/percpu.c
51950 EXPORT_SYMBOL_GPL(pcpu_base_addr); 52531 EXPORT_SYMBOL_GPL(pcpu_base_addr);
51951 52532
51952 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */ 52533 static const int *pcpu_unit_map __read_mostly; /* cpu -> unit */
51953diff -urNp linux-2.6.32.11/mm/rmap.c linux-2.6.32.11/mm/rmap.c 52534diff -urNp linux-2.6.32.12/mm/rmap.c linux-2.6.32.12/mm/rmap.c
51954--- linux-2.6.32.11/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400 52535--- linux-2.6.32.12/mm/rmap.c 2010-03-15 11:52:04.000000000 -0400
51955+++ linux-2.6.32.11/mm/rmap.c 2010-04-04 20:46:41.713805609 -0400 52536+++ linux-2.6.32.12/mm/rmap.c 2010-04-04 20:46:41.713805609 -0400
51956@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru 52537@@ -108,6 +108,10 @@ int anon_vma_prepare(struct vm_area_stru
51957 struct mm_struct *mm = vma->vm_mm; 52538 struct mm_struct *mm = vma->vm_mm;
51958 struct anon_vma *allocated; 52539 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
51980 vma->anon_vma = anon_vma; 52561 vma->anon_vma = anon_vma;
51981 list_add_tail(&vma->anon_vma_node, &anon_vma->head); 52562 list_add_tail(&vma->anon_vma_node, &anon_vma->head);
51982 allocated = NULL; 52563 allocated = NULL;
51983diff -urNp linux-2.6.32.11/mm/shmem.c linux-2.6.32.11/mm/shmem.c 52564diff -urNp linux-2.6.32.12/mm/shmem.c linux-2.6.32.12/mm/shmem.c
51984--- linux-2.6.32.11/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400 52565--- linux-2.6.32.12/mm/shmem.c 2010-03-15 11:52:04.000000000 -0400
51985+++ linux-2.6.32.11/mm/shmem.c 2010-04-04 20:46:41.716811517 -0400 52566+++ linux-2.6.32.12/mm/shmem.c 2010-04-04 20:46:41.716811517 -0400
51986@@ -31,7 +31,7 @@ 52567@@ -31,7 +31,7 @@
51987 #include <linux/swap.h> 52568 #include <linux/swap.h>
51988 #include <linux/ima.h> 52569 #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
51992 52573
51993 #ifdef CONFIG_SHMEM 52574 #ifdef CONFIG_SHMEM
51994 /* 52575 /*
51995diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c 52576diff -urNp linux-2.6.32.12/mm/slab.c linux-2.6.32.12/mm/slab.c
51996--- linux-2.6.32.11/mm/slab.c 2010-03-15 11:52:04.000000000 -0400 52577--- linux-2.6.32.12/mm/slab.c 2010-03-15 11:52:04.000000000 -0400
51997+++ linux-2.6.32.11/mm/slab.c 2010-04-04 20:46:41.716811517 -0400 52578+++ linux-2.6.32.12/mm/slab.c 2010-04-04 20:46:41.716811517 -0400
51998@@ -308,7 +308,7 @@ struct kmem_list3 { 52579@@ -308,7 +308,7 @@ struct kmem_list3 {
51999 * Need this for bootstrapping a per node allocator. 52580 * Need this for bootstrapping a per node allocator.
52000 */ 52581 */
@@ -52092,9 +52673,9 @@ diff -urNp linux-2.6.32.11/mm/slab.c linux-2.6.32.11/mm/slab.c
52092 /** 52673 /**
52093 * ksize - get the actual amount of memory allocated for a given object 52674 * ksize - get the actual amount of memory allocated for a given object
52094 * @objp: Pointer to the object 52675 * @objp: Pointer to the object
52095diff -urNp linux-2.6.32.11/mm/slob.c linux-2.6.32.11/mm/slob.c 52676diff -urNp linux-2.6.32.12/mm/slob.c linux-2.6.32.12/mm/slob.c
52096--- linux-2.6.32.11/mm/slob.c 2010-03-15 11:52:04.000000000 -0400 52677--- linux-2.6.32.12/mm/slob.c 2010-03-15 11:52:04.000000000 -0400
52097+++ linux-2.6.32.11/mm/slob.c 2010-04-04 20:46:41.716811517 -0400 52678+++ linux-2.6.32.12/mm/slob.c 2010-04-04 20:46:41.716811517 -0400
52098@@ -29,7 +29,7 @@ 52679@@ -29,7 +29,7 @@
52099 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls 52680 * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
52100 * alloc_pages() directly, allocating compound pages so the page order 52681 * 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
52415 } 52996 }
52416 52997
52417 trace_kmem_cache_free(_RET_IP_, b); 52998 trace_kmem_cache_free(_RET_IP_, b);
52418diff -urNp linux-2.6.32.11/mm/slub.c linux-2.6.32.11/mm/slub.c 52999diff -urNp linux-2.6.32.12/mm/slub.c linux-2.6.32.12/mm/slub.c
52419--- linux-2.6.32.11/mm/slub.c 2010-03-15 11:52:04.000000000 -0400 53000--- linux-2.6.32.12/mm/slub.c 2010-03-15 11:52:04.000000000 -0400
52420+++ linux-2.6.32.11/mm/slub.c 2010-04-04 20:46:41.716811517 -0400 53001+++ linux-2.6.32.12/mm/slub.c 2010-04-04 20:46:41.716811517 -0400
52421@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache * 53002@@ -1893,6 +1893,8 @@ void kmem_cache_free(struct kmem_cache *
52422 53003
52423 page = virt_to_head_page(x); 53004 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
52574 static void print_slabinfo_header(struct seq_file *m) 53155 static void print_slabinfo_header(struct seq_file *m)
52575 { 53156 {
52576 seq_puts(m, "slabinfo - version: 2.1\n"); 53157 seq_puts(m, "slabinfo - version: 2.1\n");
52577diff -urNp linux-2.6.32.11/mm/util.c linux-2.6.32.11/mm/util.c 53158diff -urNp linux-2.6.32.12/mm/util.c linux-2.6.32.12/mm/util.c
52578--- linux-2.6.32.11/mm/util.c 2010-03-15 11:52:04.000000000 -0400 53159--- linux-2.6.32.12/mm/util.c 2010-03-15 11:52:04.000000000 -0400
52579+++ linux-2.6.32.11/mm/util.c 2010-04-04 20:46:41.716811517 -0400 53160+++ linux-2.6.32.12/mm/util.c 2010-04-04 20:46:41.716811517 -0400
52580@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user); 53161@@ -228,6 +228,12 @@ EXPORT_SYMBOL(strndup_user);
52581 void arch_pick_mmap_layout(struct mm_struct *mm) 53162 void arch_pick_mmap_layout(struct mm_struct *mm)
52582 { 53163 {
@@ -52590,9 +53171,9 @@ diff -urNp linux-2.6.32.11/mm/util.c linux-2.6.32.11/mm/util.c
52590 mm->get_unmapped_area = arch_get_unmapped_area; 53171 mm->get_unmapped_area = arch_get_unmapped_area;
52591 mm->unmap_area = arch_unmap_area; 53172 mm->unmap_area = arch_unmap_area;
52592 } 53173 }
52593diff -urNp linux-2.6.32.11/mm/vmalloc.c linux-2.6.32.11/mm/vmalloc.c 53174diff -urNp linux-2.6.32.12/mm/vmalloc.c linux-2.6.32.12/mm/vmalloc.c
52594--- linux-2.6.32.11/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400 53175--- linux-2.6.32.12/mm/vmalloc.c 2010-03-15 11:52:04.000000000 -0400
52595+++ linux-2.6.32.11/mm/vmalloc.c 2010-04-04 20:46:41.716811517 -0400 53176+++ linux-2.6.32.12/mm/vmalloc.c 2010-04-04 20:46:41.716811517 -0400
52596@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd, 53177@@ -40,8 +40,19 @@ static void vunmap_pte_range(pmd_t *pmd,
52597 53178
52598 pte = pte_offset_kernel(pmd, addr); 53179 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
52803 void *vmalloc_32_user(unsigned long size) 53384 void *vmalloc_32_user(unsigned long size)
52804 { 53385 {
52805 struct vm_struct *area; 53386 struct vm_struct *area;
52806diff -urNp linux-2.6.32.11/net/atm/atm_misc.c linux-2.6.32.11/net/atm/atm_misc.c 53387diff -urNp linux-2.6.32.12/net/8021q/vlan.c linux-2.6.32.12/net/8021q/vlan.c
52807--- linux-2.6.32.11/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400 53388--- linux-2.6.32.12/net/8021q/vlan.c 2010-03-15 11:52:04.000000000 -0400
52808+++ linux-2.6.32.11/net/atm/atm_misc.c 2010-04-04 20:46:41.716811517 -0400 53389+++ linux-2.6.32.12/net/8021q/vlan.c 2010-04-29 17:46:37.373258882 -0400
53390@@ -622,8 +622,7 @@ static int vlan_ioctl_handler(struct net
53391 err = -EPERM;
53392 if (!capable(CAP_NET_ADMIN))
53393 break;
53394- if ((args.u.name_type >= 0) &&
53395- (args.u.name_type < VLAN_NAME_TYPE_HIGHEST)) {
53396+ if (args.u.name_type < VLAN_NAME_TYPE_HIGHEST) {
53397 struct vlan_net *vn;
53398
53399 vn = net_generic(net, vlan_net_id);
53400diff -urNp linux-2.6.32.12/net/atm/atm_misc.c linux-2.6.32.12/net/atm/atm_misc.c
53401--- linux-2.6.32.12/net/atm/atm_misc.c 2010-03-15 11:52:04.000000000 -0400
53402+++ linux-2.6.32.12/net/atm/atm_misc.c 2010-04-04 20:46:41.716811517 -0400
52809@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t 53403@@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t
52810 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) 53404 if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
52811 return 1; 53405 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
52842 __SONET_ITEMS 53436 __SONET_ITEMS
52843 #undef __HANDLE_ITEM 53437 #undef __HANDLE_ITEM
52844 } 53438 }
52845diff -urNp linux-2.6.32.11/net/atm/proc.c linux-2.6.32.11/net/atm/proc.c 53439diff -urNp linux-2.6.32.12/net/atm/proc.c linux-2.6.32.12/net/atm/proc.c
52846--- linux-2.6.32.11/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400 53440--- linux-2.6.32.12/net/atm/proc.c 2010-03-15 11:52:04.000000000 -0400
52847+++ linux-2.6.32.11/net/atm/proc.c 2010-04-04 20:46:41.716811517 -0400 53441+++ linux-2.6.32.12/net/atm/proc.c 2010-04-04 20:46:41.716811517 -0400
52848@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s 53442@@ -43,9 +43,9 @@ static void add_stats(struct seq_file *s
52849 const struct k_atm_aal_stats *stats) 53443 const struct k_atm_aal_stats *stats)
52850 { 53444 {
@@ -52858,9 +53452,9 @@ diff -urNp linux-2.6.32.11/net/atm/proc.c linux-2.6.32.11/net/atm/proc.c
52858 } 53452 }
52859 53453
52860 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev) 53454 static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
52861diff -urNp linux-2.6.32.11/net/atm/resources.c linux-2.6.32.11/net/atm/resources.c 53455diff -urNp linux-2.6.32.12/net/atm/resources.c linux-2.6.32.12/net/atm/resources.c
52862--- linux-2.6.32.11/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400 53456--- linux-2.6.32.12/net/atm/resources.c 2010-03-15 11:52:04.000000000 -0400
52863+++ linux-2.6.32.11/net/atm/resources.c 2010-04-04 20:46:41.716811517 -0400 53457+++ linux-2.6.32.12/net/atm/resources.c 2010-04-04 20:46:41.716811517 -0400
52864@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev * 53458@@ -161,7 +161,7 @@ void atm_dev_deregister(struct atm_dev *
52865 static void copy_aal_stats(struct k_atm_aal_stats *from, 53459 static void copy_aal_stats(struct k_atm_aal_stats *from,
52866 struct atm_aal_stats *to) 53460 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
52879 __AAL_STAT_ITEMS 53473 __AAL_STAT_ITEMS
52880 #undef __HANDLE_ITEM 53474 #undef __HANDLE_ITEM
52881 } 53475 }
52882diff -urNp linux-2.6.32.11/net/bridge/br_private.h linux-2.6.32.11/net/bridge/br_private.h 53476diff -urNp linux-2.6.32.12/net/bridge/br_private.h linux-2.6.32.12/net/bridge/br_private.h
52883--- linux-2.6.32.11/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400 53477--- linux-2.6.32.12/net/bridge/br_private.h 2010-03-15 11:52:04.000000000 -0400
52884+++ linux-2.6.32.11/net/bridge/br_private.h 2010-04-04 20:46:41.716811517 -0400 53478+++ linux-2.6.32.12/net/bridge/br_private.h 2010-04-04 20:46:41.716811517 -0400
52885@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event, 53479@@ -254,7 +254,7 @@ extern void br_ifinfo_notify(int event,
52886 53480
52887 #ifdef CONFIG_SYSFS 53481 #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
52891 extern int br_sysfs_addif(struct net_bridge_port *p); 53485 extern int br_sysfs_addif(struct net_bridge_port *p);
52892 53486
52893 /* br_sysfs_br.c */ 53487 /* br_sysfs_br.c */
52894diff -urNp linux-2.6.32.11/net/bridge/br_stp_if.c linux-2.6.32.11/net/bridge/br_stp_if.c 53488diff -urNp linux-2.6.32.12/net/bridge/br_stp_if.c linux-2.6.32.12/net/bridge/br_stp_if.c
52895--- linux-2.6.32.11/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400 53489--- linux-2.6.32.12/net/bridge/br_stp_if.c 2010-03-15 11:52:04.000000000 -0400
52896+++ linux-2.6.32.11/net/bridge/br_stp_if.c 2010-04-04 20:46:41.716811517 -0400 53490+++ linux-2.6.32.12/net/bridge/br_stp_if.c 2010-04-04 20:46:41.716811517 -0400
52897@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg 53491@@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg
52898 char *envp[] = { NULL }; 53492 char *envp[] = { NULL };
52899 53493
@@ -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_
52903 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", 53497 printk(KERN_INFO "%s: userspace STP stopped, return code %d\n",
52904 br->dev->name, r); 53498 br->dev->name, r);
52905 53499
52906diff -urNp linux-2.6.32.11/net/bridge/br_sysfs_if.c linux-2.6.32.11/net/bridge/br_sysfs_if.c 53500diff -urNp linux-2.6.32.12/net/bridge/br_sysfs_if.c linux-2.6.32.12/net/bridge/br_sysfs_if.c
52907--- linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400 53501--- linux-2.6.32.12/net/bridge/br_sysfs_if.c 2010-03-15 11:52:04.000000000 -0400
52908+++ linux-2.6.32.11/net/bridge/br_sysfs_if.c 2010-04-04 20:46:41.716811517 -0400 53502+++ linux-2.6.32.12/net/bridge/br_sysfs_if.c 2010-04-04 20:46:41.716811517 -0400
52909@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje 53503@@ -220,7 +220,7 @@ static ssize_t brport_store(struct kobje
52910 return ret; 53504 return ret;
52911 } 53505 }
@@ -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
52915 .show = brport_show, 53509 .show = brport_show,
52916 .store = brport_store, 53510 .store = brport_store,
52917 }; 53511 };
52918diff -urNp linux-2.6.32.11/net/core/dev.c linux-2.6.32.11/net/core/dev.c 53512diff -urNp linux-2.6.32.12/net/core/dev.c linux-2.6.32.12/net/core/dev.c
52919--- linux-2.6.32.11/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400 53513--- linux-2.6.32.12/net/core/dev.c 2010-03-15 11:52:04.000000000 -0400
52920+++ linux-2.6.32.11/net/core/dev.c 2010-04-04 20:46:41.721901011 -0400 53514+++ linux-2.6.32.12/net/core/dev.c 2010-04-04 20:46:41.721901011 -0400
52921@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb) 53515@@ -2047,7 +2047,7 @@ int netif_rx_ni(struct sk_buff *skb)
52922 } 53516 }
52923 EXPORT_SYMBOL(netif_rx_ni); 53517 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
52936 { 53530 {
52937 struct list_head *list = &__get_cpu_var(softnet_data).poll_list; 53531 struct list_head *list = &__get_cpu_var(softnet_data).poll_list;
52938 unsigned long time_limit = jiffies + 2; 53532 unsigned long time_limit = jiffies + 2;
52939diff -urNp linux-2.6.32.11/net/core/flow.c linux-2.6.32.11/net/core/flow.c 53533diff -urNp linux-2.6.32.12/net/core/flow.c linux-2.6.32.12/net/core/flow.c
52940--- linux-2.6.32.11/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400 53534--- linux-2.6.32.12/net/core/flow.c 2010-03-15 11:52:04.000000000 -0400
52941+++ linux-2.6.32.11/net/core/flow.c 2010-04-04 20:46:41.721901011 -0400 53535+++ linux-2.6.32.12/net/core/flow.c 2010-04-04 20:46:41.721901011 -0400
52942@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( 53536@@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT(
52943 53537
52944 static u32 flow_hash_shift; 53538 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
52966 53560
52967 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) 53561 #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu))
52968 53562
52969diff -urNp linux-2.6.32.11/net/dccp/ccids/ccid3.c linux-2.6.32.11/net/dccp/ccids/ccid3.c 53563diff -urNp linux-2.6.32.12/net/dccp/ccids/ccid3.c linux-2.6.32.12/net/dccp/ccids/ccid3.c
52970--- linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400 53564--- linux-2.6.32.12/net/dccp/ccids/ccid3.c 2010-03-15 11:52:04.000000000 -0400
52971+++ linux-2.6.32.11/net/dccp/ccids/ccid3.c 2010-04-04 20:46:41.721901011 -0400 53565+++ linux-2.6.32.12/net/dccp/ccids/ccid3.c 2010-04-04 20:46:41.721901011 -0400
52972@@ -41,7 +41,7 @@ 53566@@ -41,7 +41,7 @@
52973 static int ccid3_debug; 53567 static int ccid3_debug;
52974 #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) 53568 #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
52978 #endif 53572 #endif
52979 53573
52980 /* 53574 /*
52981diff -urNp linux-2.6.32.11/net/dccp/dccp.h linux-2.6.32.11/net/dccp/dccp.h 53575diff -urNp linux-2.6.32.12/net/dccp/dccp.h linux-2.6.32.12/net/dccp/dccp.h
52982--- linux-2.6.32.11/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400 53576--- linux-2.6.32.12/net/dccp/dccp.h 2010-03-15 11:52:04.000000000 -0400
52983+++ linux-2.6.32.11/net/dccp/dccp.h 2010-04-04 20:46:41.721901011 -0400 53577+++ linux-2.6.32.12/net/dccp/dccp.h 2010-04-04 20:46:41.721901011 -0400
52984@@ -44,9 +44,9 @@ extern int dccp_debug; 53578@@ -44,9 +44,9 @@ extern int dccp_debug;
52985 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) 53579 #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a)
52986 #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) 53580 #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
52994 #endif 53588 #endif
52995 53589
52996 extern struct inet_hashinfo dccp_hashinfo; 53590 extern struct inet_hashinfo dccp_hashinfo;
52997diff -urNp linux-2.6.32.11/net/decnet/sysctl_net_decnet.c linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 53591diff -urNp linux-2.6.32.12/net/decnet/sysctl_net_decnet.c linux-2.6.32.12/net/decnet/sysctl_net_decnet.c
52998--- linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400 53592--- linux-2.6.32.12/net/decnet/sysctl_net_decnet.c 2010-03-15 11:52:04.000000000 -0400
52999+++ linux-2.6.32.11/net/decnet/sysctl_net_decnet.c 2010-04-04 20:46:41.721901011 -0400 53593+++ linux-2.6.32.12/net/decnet/sysctl_net_decnet.c 2010-04-04 20:46:41.721901011 -0400
53000@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t 53594@@ -206,7 +206,7 @@ static int dn_node_address_handler(ctl_t
53001 53595
53002 if (len > *lenp) len = *lenp; 53596 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
53015 return -EFAULT; 53609 return -EFAULT;
53016 53610
53017 *lenp = len; 53611 *lenp = len;
53018diff -urNp linux-2.6.32.11/net/ipv4/inet_hashtables.c linux-2.6.32.11/net/ipv4/inet_hashtables.c 53612diff -urNp linux-2.6.32.12/net/ipv4/inet_hashtables.c linux-2.6.32.12/net/ipv4/inet_hashtables.c
53019--- linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400 53613--- linux-2.6.32.12/net/ipv4/inet_hashtables.c 2010-03-15 11:52:04.000000000 -0400
53020+++ linux-2.6.32.11/net/ipv4/inet_hashtables.c 2010-04-04 20:46:41.721901011 -0400 53614+++ linux-2.6.32.12/net/ipv4/inet_hashtables.c 2010-04-04 20:46:41.721901011 -0400
53021@@ -18,11 +18,14 @@ 53615@@ -18,11 +18,14 @@
53022 #include <linux/sched.h> 53616 #include <linux/sched.h>
53023 #include <linux/slab.h> 53617 #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
53042 if (tw) { 53636 if (tw) {
53043 inet_twsk_deschedule(tw, death_row); 53637 inet_twsk_deschedule(tw, death_row);
53044 inet_twsk_put(tw); 53638 inet_twsk_put(tw);
53045diff -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 53639diff -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
53046--- linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400 53640--- linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-03-15 11:52:04.000000000 -0400
53047+++ linux-2.6.32.11/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-04-04 20:46:41.721901011 -0400 53641+++ linux-2.6.32.12/net/ipv4/netfilter/nf_nat_snmp_basic.c 2010-04-04 20:46:41.721901011 -0400
53048@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( 53642@@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode(
53049 53643
53050 *len = 0; 53644 *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
53054 if (*octets == NULL) { 53648 if (*octets == NULL) {
53055 if (net_ratelimit()) 53649 if (net_ratelimit())
53056 printk("OOM in bsalg (%d)\n", __LINE__); 53650 printk("OOM in bsalg (%d)\n", __LINE__);
53057diff -urNp linux-2.6.32.11/net/ipv4/tcp_ipv4.c linux-2.6.32.11/net/ipv4/tcp_ipv4.c 53651diff -urNp linux-2.6.32.12/net/ipv4/tcp_ipv4.c linux-2.6.32.12/net/ipv4/tcp_ipv4.c
53058--- linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400 53652--- linux-2.6.32.12/net/ipv4/tcp_ipv4.c 2010-03-15 11:52:04.000000000 -0400
53059+++ linux-2.6.32.11/net/ipv4/tcp_ipv4.c 2010-04-04 20:46:41.721901011 -0400 53653+++ linux-2.6.32.12/net/ipv4/tcp_ipv4.c 2010-04-04 20:46:41.721901011 -0400
53060@@ -84,6 +84,9 @@ 53654@@ -84,6 +84,9 @@
53061 int sysctl_tcp_tw_reuse __read_mostly; 53655 int sysctl_tcp_tw_reuse __read_mostly;
53062 int sysctl_tcp_low_latency __read_mostly; 53656 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
53101 tcp_v4_send_reset(NULL, skb); 53695 tcp_v4_send_reset(NULL, skb);
53102 } 53696 }
53103 53697
53104diff -urNp linux-2.6.32.11/net/ipv4/tcp_minisocks.c linux-2.6.32.11/net/ipv4/tcp_minisocks.c 53698diff -urNp linux-2.6.32.12/net/ipv4/tcp_minisocks.c linux-2.6.32.12/net/ipv4/tcp_minisocks.c
53105--- linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400 53699--- linux-2.6.32.12/net/ipv4/tcp_minisocks.c 2010-03-15 11:52:04.000000000 -0400
53106+++ linux-2.6.32.11/net/ipv4/tcp_minisocks.c 2010-04-04 20:46:41.721901011 -0400 53700+++ linux-2.6.32.12/net/ipv4/tcp_minisocks.c 2010-04-04 20:46:41.721901011 -0400
53107@@ -26,6 +26,10 @@ 53701@@ -26,6 +26,10 @@
53108 #include <net/inet_common.h> 53702 #include <net/inet_common.h>
53109 #include <net/xfrm.h> 53703 #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
53126 if (!(flg & TCP_FLAG_RST)) 53720 if (!(flg & TCP_FLAG_RST))
53127 req->rsk_ops->send_reset(sk, skb); 53721 req->rsk_ops->send_reset(sk, skb);
53128 53722
53129diff -urNp linux-2.6.32.11/net/ipv4/tcp_probe.c linux-2.6.32.11/net/ipv4/tcp_probe.c 53723diff -urNp linux-2.6.32.12/net/ipv4/tcp_probe.c linux-2.6.32.12/net/ipv4/tcp_probe.c
53130--- linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400 53724--- linux-2.6.32.12/net/ipv4/tcp_probe.c 2010-03-15 11:52:04.000000000 -0400
53131+++ linux-2.6.32.11/net/ipv4/tcp_probe.c 2010-04-04 20:46:41.721901011 -0400 53725+++ linux-2.6.32.12/net/ipv4/tcp_probe.c 2010-04-04 20:46:41.721901011 -0400
53132@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file 53726@@ -200,7 +200,7 @@ static ssize_t tcpprobe_read(struct file
53133 if (cnt + width >= len) 53727 if (cnt + width >= len)
53134 break; 53728 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
53138 return -EFAULT; 53732 return -EFAULT;
53139 cnt += width; 53733 cnt += width;
53140 } 53734 }
53141diff -urNp linux-2.6.32.11/net/ipv4/tcp_timer.c linux-2.6.32.11/net/ipv4/tcp_timer.c 53735diff -urNp linux-2.6.32.12/net/ipv4/tcp_timer.c linux-2.6.32.12/net/ipv4/tcp_timer.c
53142--- linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400 53736--- linux-2.6.32.12/net/ipv4/tcp_timer.c 2010-03-15 11:52:04.000000000 -0400
53143+++ linux-2.6.32.11/net/ipv4/tcp_timer.c 2010-04-04 20:46:41.721901011 -0400 53737+++ linux-2.6.32.12/net/ipv4/tcp_timer.c 2010-04-04 20:46:41.721901011 -0400
53144@@ -21,6 +21,10 @@ 53738@@ -21,6 +21,10 @@
53145 #include <linux/module.h> 53739 #include <linux/module.h>
53146 #include <net/tcp.h> 53740 #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
53166 if (retransmits_timed_out(sk, retry_until)) { 53760 if (retransmits_timed_out(sk, retry_until)) {
53167 /* Has it gone just too far? */ 53761 /* Has it gone just too far? */
53168 tcp_write_err(sk); 53762 tcp_write_err(sk);
53169diff -urNp linux-2.6.32.11/net/ipv4/udp.c linux-2.6.32.11/net/ipv4/udp.c 53763diff -urNp linux-2.6.32.12/net/ipv4/udp.c linux-2.6.32.12/net/ipv4/udp.c
53170--- linux-2.6.32.11/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400 53764--- linux-2.6.32.12/net/ipv4/udp.c 2010-03-15 11:52:04.000000000 -0400
53171+++ linux-2.6.32.11/net/ipv4/udp.c 2010-04-04 20:46:41.724917264 -0400 53765+++ linux-2.6.32.12/net/ipv4/udp.c 2010-04-04 20:46:41.724917264 -0400
53172@@ -86,6 +86,7 @@ 53766@@ -86,6 +86,7 @@
53173 #include <linux/types.h> 53767 #include <linux/types.h>
53174 #include <linux/fcntl.h> 53768 #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
53238 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); 53832 icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0);
53239 53833
53240 /* 53834 /*
53241diff -urNp linux-2.6.32.11/net/ipv6/exthdrs.c linux-2.6.32.11/net/ipv6/exthdrs.c 53835diff -urNp linux-2.6.32.12/net/ipv6/exthdrs.c linux-2.6.32.12/net/ipv6/exthdrs.c
53242--- linux-2.6.32.11/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400 53836--- linux-2.6.32.12/net/ipv6/exthdrs.c 2010-03-15 11:52:04.000000000 -0400
53243+++ linux-2.6.32.11/net/ipv6/exthdrs.c 2010-04-04 20:46:41.724917264 -0400 53837+++ linux-2.6.32.12/net/ipv6/exthdrs.c 2010-04-04 20:46:41.724917264 -0400
53244@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt 53838@@ -635,7 +635,7 @@ static struct tlvtype_proc tlvprochopopt
53245 .type = IPV6_TLV_JUMBO, 53839 .type = IPV6_TLV_JUMBO,
53246 .func = ipv6_hop_jumbo, 53840 .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
53250 }; 53844 };
53251 53845
53252 int ipv6_parse_hopopts(struct sk_buff *skb) 53846 int ipv6_parse_hopopts(struct sk_buff *skb)
53253diff -urNp linux-2.6.32.11/net/ipv6/raw.c linux-2.6.32.11/net/ipv6/raw.c 53847diff -urNp linux-2.6.32.12/net/ipv6/raw.c linux-2.6.32.12/net/ipv6/raw.c
53254--- linux-2.6.32.11/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400 53848--- linux-2.6.32.12/net/ipv6/raw.c 2010-03-15 11:52:04.000000000 -0400
53255+++ linux-2.6.32.11/net/ipv6/raw.c 2010-04-04 20:46:41.724917264 -0400 53849+++ linux-2.6.32.12/net/ipv6/raw.c 2010-04-04 20:46:41.724917264 -0400
53256@@ -600,7 +600,7 @@ out: 53850@@ -600,7 +600,7 @@ out:
53257 return err; 53851 return err;
53258 } 53852 }
@@ -53262,9 +53856,9 @@ diff -urNp linux-2.6.32.11/net/ipv6/raw.c linux-2.6.32.11/net/ipv6/raw.c
53262 struct flowi *fl, struct rt6_info *rt, 53856 struct flowi *fl, struct rt6_info *rt,
53263 unsigned int flags) 53857 unsigned int flags)
53264 { 53858 {
53265diff -urNp linux-2.6.32.11/net/ipv6/tcp_ipv6.c linux-2.6.32.11/net/ipv6/tcp_ipv6.c 53859diff -urNp linux-2.6.32.12/net/ipv6/tcp_ipv6.c linux-2.6.32.12/net/ipv6/tcp_ipv6.c
53266--- linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400 53860--- linux-2.6.32.12/net/ipv6/tcp_ipv6.c 2010-03-15 11:52:04.000000000 -0400
53267+++ linux-2.6.32.11/net/ipv6/tcp_ipv6.c 2010-04-04 20:46:41.724917264 -0400 53861+++ linux-2.6.32.12/net/ipv6/tcp_ipv6.c 2010-04-04 20:46:41.724917264 -0400
53268@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk 53862@@ -1578,6 +1578,9 @@ static int tcp_v6_do_rcv(struct sock *sk
53269 return 0; 53863 return 0;
53270 53864
@@ -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
53285 tcp_v6_send_reset(NULL, skb); 53879 tcp_v6_send_reset(NULL, skb);
53286 } 53880 }
53287 53881
53288diff -urNp linux-2.6.32.11/net/ipv6/udp.c linux-2.6.32.11/net/ipv6/udp.c 53882diff -urNp linux-2.6.32.12/net/ipv6/udp.c linux-2.6.32.12/net/ipv6/udp.c
53289--- linux-2.6.32.11/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400 53883--- linux-2.6.32.12/net/ipv6/udp.c 2010-03-15 11:52:04.000000000 -0400
53290+++ linux-2.6.32.11/net/ipv6/udp.c 2010-04-04 20:46:41.724917264 -0400 53884+++ linux-2.6.32.12/net/ipv6/udp.c 2010-04-04 20:46:41.724917264 -0400
53291@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, 53885@@ -587,6 +587,9 @@ int __udp6_lib_rcv(struct sk_buff *skb,
53292 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, 53886 UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS,
53293 proto == IPPROTO_UDPLITE); 53887 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
53298 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); 53892 icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev);
53299 53893
53300 kfree_skb(skb); 53894 kfree_skb(skb);
53301diff -urNp linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 53895diff -urNp linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c
53302--- linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400 53896--- linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c 2010-03-15 11:52:04.000000000 -0400
53303+++ linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c 2010-04-04 20:46:41.724917264 -0400 53897+++ linux-2.6.32.12/net/irda/ircomm/ircomm_tty.c 2010-04-04 20:46:41.724917264 -0400
53304@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st 53898@@ -280,16 +280,16 @@ static int ircomm_tty_block_til_ready(st
53305 add_wait_queue(&self->open_wait, &wait); 53899 add_wait_queue(&self->open_wait, &wait);
53306 53900
@@ -53423,9 +54017,9 @@ diff -urNp linux-2.6.32.11/net/irda/ircomm/ircomm_tty.c linux-2.6.32.11/net/irda
53423 seq_printf(m, "Max data size: %d\n", self->max_data_size); 54017 seq_printf(m, "Max data size: %d\n", self->max_data_size);
53424 seq_printf(m, "Max header size: %d\n", self->max_header_size); 54018 seq_printf(m, "Max header size: %d\n", self->max_header_size);
53425 54019
53426diff -urNp linux-2.6.32.11/net/mac80211/ieee80211_i.h linux-2.6.32.11/net/mac80211/ieee80211_i.h 54020diff -urNp linux-2.6.32.12/net/mac80211/ieee80211_i.h linux-2.6.32.12/net/mac80211/ieee80211_i.h
53427--- linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400 54021--- linux-2.6.32.12/net/mac80211/ieee80211_i.h 2010-04-04 20:41:50.080541354 -0400
53428+++ linux-2.6.32.11/net/mac80211/ieee80211_i.h 2010-04-04 20:46:41.724917264 -0400 54022+++ linux-2.6.32.12/net/mac80211/ieee80211_i.h 2010-04-04 20:46:41.724917264 -0400
53429@@ -635,7 +635,7 @@ struct ieee80211_local { 54023@@ -635,7 +635,7 @@ struct ieee80211_local {
53430 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ 54024 /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */
53431 spinlock_t queue_stop_reason_lock; 54025 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
53435 int monitors, cooked_mntrs; 54029 int monitors, cooked_mntrs;
53436 /* number of interfaces with corresponding FIF_ flags */ 54030 /* number of interfaces with corresponding FIF_ flags */
53437 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll; 54031 int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll;
53438diff -urNp linux-2.6.32.11/net/mac80211/iface.c linux-2.6.32.11/net/mac80211/iface.c 54032diff -urNp linux-2.6.32.12/net/mac80211/iface.c linux-2.6.32.12/net/mac80211/iface.c
53439--- linux-2.6.32.11/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400 54033--- linux-2.6.32.12/net/mac80211/iface.c 2010-03-15 11:52:04.000000000 -0400
53440+++ linux-2.6.32.11/net/mac80211/iface.c 2010-04-04 20:46:41.724917264 -0400 54034+++ linux-2.6.32.12/net/mac80211/iface.c 2010-04-04 20:46:41.724917264 -0400
53441@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev 54035@@ -166,7 +166,7 @@ static int ieee80211_open(struct net_dev
53442 break; 54036 break;
53443 } 54037 }
@@ -53492,9 +54086,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/iface.c linux-2.6.32.11/net/mac80211/ifa
53492 ieee80211_clear_tx_pending(local); 54086 ieee80211_clear_tx_pending(local);
53493 ieee80211_stop_device(local); 54087 ieee80211_stop_device(local);
53494 54088
53495diff -urNp linux-2.6.32.11/net/mac80211/main.c linux-2.6.32.11/net/mac80211/main.c 54089diff -urNp linux-2.6.32.12/net/mac80211/main.c linux-2.6.32.12/net/mac80211/main.c
53496--- linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400 54090--- linux-2.6.32.12/net/mac80211/main.c 2010-04-04 20:41:50.080541354 -0400
53497+++ linux-2.6.32.11/net/mac80211/main.c 2010-04-04 20:46:41.724917264 -0400 54091+++ linux-2.6.32.12/net/mac80211/main.c 2010-04-04 20:46:41.724917264 -0400
53498@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211 54092@@ -145,7 +145,7 @@ int ieee80211_hw_config(struct ieee80211
53499 local->hw.conf.power_level = power; 54093 local->hw.conf.power_level = power;
53500 } 54094 }
@@ -53504,9 +54098,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/main.c linux-2.6.32.11/net/mac80211/main
53504 ret = drv_config(local, changed); 54098 ret = drv_config(local, changed);
53505 /* 54099 /*
53506 * Goal: 54100 * Goal:
53507diff -urNp linux-2.6.32.11/net/mac80211/pm.c linux-2.6.32.11/net/mac80211/pm.c 54101diff -urNp linux-2.6.32.12/net/mac80211/pm.c linux-2.6.32.12/net/mac80211/pm.c
53508--- linux-2.6.32.11/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400 54102--- linux-2.6.32.12/net/mac80211/pm.c 2010-03-15 11:52:04.000000000 -0400
53509+++ linux-2.6.32.11/net/mac80211/pm.c 2010-04-04 20:46:41.724917264 -0400 54103+++ linux-2.6.32.12/net/mac80211/pm.c 2010-04-04 20:46:41.724917264 -0400
53510@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211 54104@@ -107,7 +107,7 @@ int __ieee80211_suspend(struct ieee80211
53511 } 54105 }
53512 54106
@@ -53516,9 +54110,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/pm.c linux-2.6.32.11/net/mac80211/pm.c
53516 ieee80211_stop_device(local); 54110 ieee80211_stop_device(local);
53517 54111
53518 local->suspended = true; 54112 local->suspended = true;
53519diff -urNp linux-2.6.32.11/net/mac80211/rate.c linux-2.6.32.11/net/mac80211/rate.c 54113diff -urNp linux-2.6.32.12/net/mac80211/rate.c linux-2.6.32.12/net/mac80211/rate.c
53520--- linux-2.6.32.11/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400 54114--- linux-2.6.32.12/net/mac80211/rate.c 2010-03-15 11:52:04.000000000 -0400
53521+++ linux-2.6.32.11/net/mac80211/rate.c 2010-04-04 20:46:41.724917264 -0400 54115+++ linux-2.6.32.12/net/mac80211/rate.c 2010-04-04 20:46:41.724917264 -0400
53522@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct 54116@@ -287,7 +287,7 @@ int ieee80211_init_rate_ctrl_alg(struct
53523 struct rate_control_ref *ref, *old; 54117 struct rate_control_ref *ref, *old;
53524 54118
@@ -53528,9 +54122,21 @@ diff -urNp linux-2.6.32.11/net/mac80211/rate.c linux-2.6.32.11/net/mac80211/rate
53528 return -EBUSY; 54122 return -EBUSY;
53529 54123
53530 ref = rate_control_alloc(name, local); 54124 ref = rate_control_alloc(name, local);
53531diff -urNp linux-2.6.32.11/net/mac80211/util.c linux-2.6.32.11/net/mac80211/util.c 54125diff -urNp linux-2.6.32.12/net/mac80211/tx.c linux-2.6.32.12/net/mac80211/tx.c
53532--- linux-2.6.32.11/net/mac80211/util.c 2010-03-15 11:52:04.000000000 -0400 54126--- linux-2.6.32.12/net/mac80211/tx.c 2010-04-29 17:49:38.690617032 -0400
53533+++ linux-2.6.32.11/net/mac80211/util.c 2010-04-04 20:46:41.724917264 -0400 54127+++ linux-2.6.32.12/net/mac80211/tx.c 2010-04-29 17:49:58.741536660 -0400
54128@@ -173,7 +173,7 @@ static __le16 ieee80211_duration(struct
54129 return cpu_to_le16(dur);
54130 }
54131
54132-static int inline is_ieee80211_device(struct ieee80211_local *local,
54133+static inline int is_ieee80211_device(struct ieee80211_local *local,
54134 struct net_device *dev)
54135 {
54136 return local == wdev_priv(dev->ieee80211_ptr);
54137diff -urNp linux-2.6.32.12/net/mac80211/util.c linux-2.6.32.12/net/mac80211/util.c
54138--- linux-2.6.32.12/net/mac80211/util.c 2010-04-29 17:49:38.690617032 -0400
54139+++ linux-2.6.32.12/net/mac80211/util.c 2010-04-29 17:49:58.749029456 -0400
53534@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_ 54140@@ -1042,14 +1042,14 @@ int ieee80211_reconfig(struct ieee80211_
53535 local->resuming = true; 54141 local->resuming = true;
53536 54142
@@ -53548,9 +54154,9 @@ diff -urNp linux-2.6.32.11/net/mac80211/util.c linux-2.6.32.11/net/mac80211/util
53548 if (res) { 54154 if (res) {
53549 WARN(local->suspended, "Harware became unavailable " 54155 WARN(local->suspended, "Harware became unavailable "
53550 "upon resume. This is could be a software issue" 54156 "upon resume. This is could be a software issue"
53551diff -urNp linux-2.6.32.11/net/sctp/socket.c linux-2.6.32.11/net/sctp/socket.c 54157diff -urNp linux-2.6.32.12/net/sctp/socket.c linux-2.6.32.12/net/sctp/socket.c
53552--- linux-2.6.32.11/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400 54158--- linux-2.6.32.12/net/sctp/socket.c 2010-03-15 11:52:04.000000000 -0400
53553+++ linux-2.6.32.11/net/sctp/socket.c 2010-04-04 20:46:41.728797784 -0400 54159+++ linux-2.6.32.12/net/sctp/socket.c 2010-04-04 20:46:41.728797784 -0400
53554@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc 54160@@ -1482,7 +1482,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc
53555 struct sctp_sndrcvinfo *sinfo; 54161 struct sctp_sndrcvinfo *sinfo;
53556 struct sctp_initmsg *sinit; 54162 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
53568 54174
53569 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); 54175 SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n");
53570 if (pp->fastreuse && sk->sk_reuse && 54176 if (pp->fastreuse && sk->sk_reuse &&
53571diff -urNp linux-2.6.32.11/net/socket.c linux-2.6.32.11/net/socket.c 54177diff -urNp linux-2.6.32.12/net/socket.c linux-2.6.32.12/net/socket.c
53572--- linux-2.6.32.11/net/socket.c 2010-03-15 11:52:04.000000000 -0400 54178--- linux-2.6.32.12/net/socket.c 2010-03-15 11:52:04.000000000 -0400
53573+++ linux-2.6.32.11/net/socket.c 2010-04-04 20:46:41.728797784 -0400 54179+++ linux-2.6.32.12/net/socket.c 2010-04-04 20:46:41.728797784 -0400
53574@@ -87,6 +87,7 @@ 54180@@ -87,6 +87,7 @@
53575 #include <linux/wireless.h> 54181 #include <linux/wireless.h>
53576 #include <linux/nsproxy.h> 54182 #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
53725 err = 54331 err =
53726 security_socket_connect(sock, (struct sockaddr *)&address, addrlen); 54332 security_socket_connect(sock, (struct sockaddr *)&address, addrlen);
53727 if (err) 54333 if (err)
53728diff -urNp linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 54334diff -urNp linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c
53729--- linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400 54335--- linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c 2010-03-15 11:52:04.000000000 -0400
53730+++ linux-2.6.32.11/net/sunrpc/xprtrdma/svc_rdma.c 2010-04-04 20:46:41.728797784 -0400 54336+++ linux-2.6.32.12/net/sunrpc/xprtrdma/svc_rdma.c 2010-04-04 20:46:41.728797784 -0400
53731@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta 54337@@ -105,7 +105,7 @@ static int read_reset_stat(ctl_table *ta
53732 len -= *ppos; 54338 len -= *ppos;
53733 if (len > *lenp) 54339 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
53737 return -EFAULT; 54343 return -EFAULT;
53738 *lenp = len; 54344 *lenp = len;
53739 *ppos += len; 54345 *ppos += len;
53740diff -urNp linux-2.6.32.11/net/sysctl_net.c linux-2.6.32.11/net/sysctl_net.c 54346diff -urNp linux-2.6.32.12/net/sysctl_net.c linux-2.6.32.12/net/sysctl_net.c
53741--- linux-2.6.32.11/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400 54347--- linux-2.6.32.12/net/sysctl_net.c 2010-03-15 11:52:04.000000000 -0400
53742+++ linux-2.6.32.11/net/sysctl_net.c 2010-04-04 20:46:41.728797784 -0400 54348+++ linux-2.6.32.12/net/sysctl_net.c 2010-04-04 20:46:41.728797784 -0400
53743@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct 54349@@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
53744 struct ctl_table *table) 54350 struct ctl_table *table)
53745 { 54351 {
@@ -53749,9 +54355,24 @@ diff -urNp linux-2.6.32.11/net/sysctl_net.c linux-2.6.32.11/net/sysctl_net.c
53749 int mode = (table->mode >> 6) & 7; 54355 int mode = (table->mode >> 6) & 7;
53750 return (mode << 6) | (mode << 3) | mode; 54356 return (mode << 6) | (mode << 3) | mode;
53751 } 54357 }
53752diff -urNp linux-2.6.32.11/net/unix/af_unix.c linux-2.6.32.11/net/unix/af_unix.c 54358diff -urNp linux-2.6.32.12/net/tipc/socket.c linux-2.6.32.12/net/tipc/socket.c
53753--- linux-2.6.32.11/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400 54359--- linux-2.6.32.12/net/tipc/socket.c 2010-03-15 11:52:04.000000000 -0400
53754+++ linux-2.6.32.11/net/unix/af_unix.c 2010-04-04 20:46:41.728797784 -0400 54360+++ linux-2.6.32.12/net/tipc/socket.c 2010-04-29 17:46:37.401277007 -0400
54361@@ -1449,8 +1449,9 @@ static int connect(struct socket *sock,
54362 } else {
54363 if (res == 0)
54364 res = -ETIMEDOUT;
54365- else
54366- ; /* leave "res" unchanged */
54367+ else {
54368+ /* leave "res" unchanged */
54369+ }
54370 sock->state = SS_DISCONNECTING;
54371 }
54372
54373diff -urNp linux-2.6.32.12/net/unix/af_unix.c linux-2.6.32.12/net/unix/af_unix.c
54374--- linux-2.6.32.12/net/unix/af_unix.c 2010-03-15 11:52:04.000000000 -0400
54375+++ linux-2.6.32.12/net/unix/af_unix.c 2010-04-04 20:46:41.728797784 -0400
53755@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru 54376@@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru
53756 err = -ECONNREFUSED; 54377 err = -ECONNREFUSED;
53757 if (!S_ISSOCK(inode->i_mode)) 54378 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
53809 list = &unix_socket_table[addr->hash]; 54430 list = &unix_socket_table[addr->hash];
53810 } else { 54431 } else {
53811 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; 54432 list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)];
53812diff -urNp linux-2.6.32.11/samples/kobject/kset-example.c linux-2.6.32.11/samples/kobject/kset-example.c 54433diff -urNp linux-2.6.32.12/net/xfrm/xfrm_policy.c linux-2.6.32.12/net/xfrm/xfrm_policy.c
53813--- linux-2.6.32.11/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400 54434--- linux-2.6.32.12/net/xfrm/xfrm_policy.c 2010-03-15 11:52:04.000000000 -0400
53814+++ linux-2.6.32.11/samples/kobject/kset-example.c 2010-04-04 20:46:41.728797784 -0400 54435+++ linux-2.6.32.12/net/xfrm/xfrm_policy.c 2010-04-29 17:46:37.421275445 -0400
54436@@ -1477,7 +1477,7 @@ free_dst:
54437 goto out;
54438 }
54439
54440-static int inline
54441+static inline int
54442 xfrm_dst_alloc_copy(void **target, void *src, int size)
54443 {
54444 if (!*target) {
54445@@ -1489,7 +1489,7 @@ xfrm_dst_alloc_copy(void **target, void
54446 return 0;
54447 }
54448
54449-static int inline
54450+static inline int
54451 xfrm_dst_update_parent(struct dst_entry *dst, struct xfrm_selector *sel)
54452 {
54453 #ifdef CONFIG_XFRM_SUB_POLICY
54454@@ -1501,7 +1501,7 @@ xfrm_dst_update_parent(struct dst_entry
54455 #endif
54456 }
54457
54458-static int inline
54459+static inline int
54460 xfrm_dst_update_origin(struct dst_entry *dst, struct flowi *fl)
54461 {
54462 #ifdef CONFIG_XFRM_SUB_POLICY
54463diff -urNp linux-2.6.32.12/samples/kobject/kset-example.c linux-2.6.32.12/samples/kobject/kset-example.c
54464--- linux-2.6.32.12/samples/kobject/kset-example.c 2010-03-15 11:52:04.000000000 -0400
54465+++ linux-2.6.32.12/samples/kobject/kset-example.c 2010-04-04 20:46:41.728797784 -0400
53815@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob 54466@@ -87,7 +87,7 @@ static ssize_t foo_attr_store(struct kob
53816 } 54467 }
53817 54468
@@ -53821,9 +54472,9 @@ diff -urNp linux-2.6.32.11/samples/kobject/kset-example.c linux-2.6.32.11/sample
53821 .show = foo_attr_show, 54472 .show = foo_attr_show,
53822 .store = foo_attr_store, 54473 .store = foo_attr_store,
53823 }; 54474 };
53824diff -urNp linux-2.6.32.11/scripts/basic/fixdep.c linux-2.6.32.11/scripts/basic/fixdep.c 54475diff -urNp linux-2.6.32.12/scripts/basic/fixdep.c linux-2.6.32.12/scripts/basic/fixdep.c
53825--- linux-2.6.32.11/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400 54476--- linux-2.6.32.12/scripts/basic/fixdep.c 2010-03-15 11:52:04.000000000 -0400
53826+++ linux-2.6.32.11/scripts/basic/fixdep.c 2010-04-04 20:46:41.728797784 -0400 54477+++ linux-2.6.32.12/scripts/basic/fixdep.c 2010-04-04 20:46:41.728797784 -0400
53827@@ -222,9 +222,9 @@ static void use_config(char *m, int slen 54478@@ -222,9 +222,9 @@ static void use_config(char *m, int slen
53828 54479
53829 static void parse_config_file(char *map, size_t len) 54480 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/
53845 54496
53846 if (*p != INT_CONF) { 54497 if (*p != INT_CONF) {
53847 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n", 54498 fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
53848diff -urNp linux-2.6.32.11/scripts/kallsyms.c linux-2.6.32.11/scripts/kallsyms.c 54499diff -urNp linux-2.6.32.12/scripts/kallsyms.c linux-2.6.32.12/scripts/kallsyms.c
53849--- linux-2.6.32.11/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400 54500--- linux-2.6.32.12/scripts/kallsyms.c 2010-03-15 11:52:04.000000000 -0400
53850+++ linux-2.6.32.11/scripts/kallsyms.c 2010-04-04 20:46:41.728797784 -0400 54501+++ linux-2.6.32.12/scripts/kallsyms.c 2010-04-04 20:46:41.728797784 -0400
53851@@ -43,10 +43,10 @@ struct text_range { 54502@@ -43,10 +43,10 @@ struct text_range {
53852 54503
53853 static unsigned long long _text; 54504 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
53863 }; 54514 };
53864 #define text_range_text (&text_ranges[0]) 54515 #define text_range_text (&text_ranges[0])
53865 #define text_range_inittext (&text_ranges[1]) 54516 #define text_range_inittext (&text_ranges[1])
53866diff -urNp linux-2.6.32.11/scripts/mod/file2alias.c linux-2.6.32.11/scripts/mod/file2alias.c 54517diff -urNp linux-2.6.32.12/scripts/mod/file2alias.c linux-2.6.32.12/scripts/mod/file2alias.c
53867--- linux-2.6.32.11/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400 54518--- linux-2.6.32.12/scripts/mod/file2alias.c 2010-03-15 11:52:04.000000000 -0400
53868+++ linux-2.6.32.11/scripts/mod/file2alias.c 2010-04-04 20:46:41.728797784 -0400 54519+++ linux-2.6.32.12/scripts/mod/file2alias.c 2010-04-04 20:46:41.728797784 -0400
53869@@ -72,7 +72,7 @@ static void device_id_check(const char * 54520@@ -72,7 +72,7 @@ static void device_id_check(const char *
53870 unsigned long size, unsigned long id_size, 54521 unsigned long size, unsigned long id_size,
53871 void *symval) 54522 void *symval)
@@ -53920,9 +54571,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/file2alias.c linux-2.6.32.11/scripts/mod/
53920 54571
53921 sprintf(alias, "dmi*"); 54572 sprintf(alias, "dmi*");
53922 54573
53923diff -urNp linux-2.6.32.11/scripts/mod/modpost.c linux-2.6.32.11/scripts/mod/modpost.c 54574diff -urNp linux-2.6.32.12/scripts/mod/modpost.c linux-2.6.32.12/scripts/mod/modpost.c
53924--- linux-2.6.32.11/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400 54575--- linux-2.6.32.12/scripts/mod/modpost.c 2010-03-15 11:52:04.000000000 -0400
53925+++ linux-2.6.32.11/scripts/mod/modpost.c 2010-04-04 20:46:41.728797784 -0400 54576+++ linux-2.6.32.12/scripts/mod/modpost.c 2010-04-04 20:46:41.728797784 -0400
53926@@ -835,6 +835,7 @@ enum mismatch { 54577@@ -835,6 +835,7 @@ enum mismatch {
53927 INIT_TO_EXIT, 54578 INIT_TO_EXIT,
53928 EXIT_TO_INIT, 54579 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
53990 goto close_write; 54641 goto close_write;
53991 54642
53992 tmp = NOFAIL(malloc(b->pos)); 54643 tmp = NOFAIL(malloc(b->pos));
53993diff -urNp linux-2.6.32.11/scripts/mod/modpost.h linux-2.6.32.11/scripts/mod/modpost.h 54644diff -urNp linux-2.6.32.12/scripts/mod/modpost.h linux-2.6.32.12/scripts/mod/modpost.h
53994--- linux-2.6.32.11/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400 54645--- linux-2.6.32.12/scripts/mod/modpost.h 2010-03-15 11:52:04.000000000 -0400
53995+++ linux-2.6.32.11/scripts/mod/modpost.h 2010-04-04 20:46:41.728797784 -0400 54646+++ linux-2.6.32.12/scripts/mod/modpost.h 2010-04-04 20:46:41.728797784 -0400
53996@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e 54647@@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
53997 54648
53998 struct buffer { 54649 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
54012 54663
54013 struct module { 54664 struct module {
54014 struct module *next; 54665 struct module *next;
54015diff -urNp linux-2.6.32.11/scripts/mod/sumversion.c linux-2.6.32.11/scripts/mod/sumversion.c 54666diff -urNp linux-2.6.32.12/scripts/mod/sumversion.c linux-2.6.32.12/scripts/mod/sumversion.c
54016--- linux-2.6.32.11/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400 54667--- linux-2.6.32.12/scripts/mod/sumversion.c 2010-03-15 11:52:04.000000000 -0400
54017+++ linux-2.6.32.11/scripts/mod/sumversion.c 2010-04-04 20:46:41.728797784 -0400 54668+++ linux-2.6.32.12/scripts/mod/sumversion.c 2010-04-04 20:46:41.728797784 -0400
54018@@ -455,7 +455,7 @@ static void write_version(const char *fi 54669@@ -455,7 +455,7 @@ static void write_version(const char *fi
54019 goto out; 54670 goto out;
54020 } 54671 }
@@ -54024,9 +54675,9 @@ diff -urNp linux-2.6.32.11/scripts/mod/sumversion.c linux-2.6.32.11/scripts/mod/
54024 warn("writing sum in %s failed: %s\n", 54675 warn("writing sum in %s failed: %s\n",
54025 filename, strerror(errno)); 54676 filename, strerror(errno));
54026 goto out; 54677 goto out;
54027diff -urNp linux-2.6.32.11/scripts/pnmtologo.c linux-2.6.32.11/scripts/pnmtologo.c 54678diff -urNp linux-2.6.32.12/scripts/pnmtologo.c linux-2.6.32.12/scripts/pnmtologo.c
54028--- linux-2.6.32.11/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400 54679--- linux-2.6.32.12/scripts/pnmtologo.c 2010-03-15 11:52:04.000000000 -0400
54029+++ linux-2.6.32.11/scripts/pnmtologo.c 2010-04-04 20:46:41.728797784 -0400 54680+++ linux-2.6.32.12/scripts/pnmtologo.c 2010-04-04 20:46:41.728797784 -0400
54030@@ -237,14 +237,14 @@ static void write_header(void) 54681@@ -237,14 +237,14 @@ static void write_header(void)
54031 fprintf(out, " * Linux logo %s\n", logoname); 54682 fprintf(out, " * Linux logo %s\n", logoname);
54032 fputs(" */\n\n", out); 54683 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
54053 logoname); 54704 logoname);
54054 write_hex_cnt = 0; 54705 write_hex_cnt = 0;
54055 for (i = 0; i < logo_clutsize; i++) { 54706 for (i = 0; i < logo_clutsize; i++) {
54056diff -urNp linux-2.6.32.11/security/commoncap.c linux-2.6.32.11/security/commoncap.c 54707diff -urNp linux-2.6.32.12/security/commoncap.c linux-2.6.32.12/security/commoncap.c
54057--- linux-2.6.32.11/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400 54708--- linux-2.6.32.12/security/commoncap.c 2010-03-15 11:52:04.000000000 -0400
54058+++ linux-2.6.32.11/security/commoncap.c 2010-04-04 20:46:41.728797784 -0400 54709+++ linux-2.6.32.12/security/commoncap.c 2010-04-04 20:46:41.728797784 -0400
54059@@ -27,7 +27,7 @@ 54710@@ -27,7 +27,7 @@
54060 #include <linux/sched.h> 54711 #include <linux/sched.h>
54061 #include <linux/prctl.h> 54712 #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
54078 return 0; 54729 return 0;
54079 } 54730 }
54080 54731
54081diff -urNp linux-2.6.32.11/security/integrity/ima/ima_api.c linux-2.6.32.11/security/integrity/ima/ima_api.c 54732diff -urNp linux-2.6.32.12/security/integrity/ima/ima_api.c linux-2.6.32.12/security/integrity/ima/ima_api.c
54082--- linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400 54733--- linux-2.6.32.12/security/integrity/ima/ima_api.c 2010-03-15 11:52:04.000000000 -0400
54083+++ linux-2.6.32.11/security/integrity/ima/ima_api.c 2010-04-04 20:46:41.728797784 -0400 54734+++ linux-2.6.32.12/security/integrity/ima/ima_api.c 2010-04-04 20:46:41.728797784 -0400
54084@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino 54735@@ -74,7 +74,7 @@ void ima_add_violation(struct inode *ino
54085 int result; 54736 int result;
54086 54737
@@ -54090,9 +54741,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima_api.c linux-2.6.32.11/secu
54090 54741
54091 entry = kmalloc(sizeof(*entry), GFP_KERNEL); 54742 entry = kmalloc(sizeof(*entry), GFP_KERNEL);
54092 if (!entry) { 54743 if (!entry) {
54093diff -urNp linux-2.6.32.11/security/integrity/ima/ima_fs.c linux-2.6.32.11/security/integrity/ima/ima_fs.c 54744diff -urNp linux-2.6.32.12/security/integrity/ima/ima_fs.c linux-2.6.32.12/security/integrity/ima/ima_fs.c
54094--- linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400 54745--- linux-2.6.32.12/security/integrity/ima/ima_fs.c 2010-03-15 11:52:04.000000000 -0400
54095+++ linux-2.6.32.11/security/integrity/ima/ima_fs.c 2010-04-04 20:46:41.728797784 -0400 54746+++ linux-2.6.32.12/security/integrity/ima/ima_fs.c 2010-04-04 20:46:41.728797784 -0400
54096@@ -27,12 +27,12 @@ 54747@@ -27,12 +27,12 @@
54097 static int valid_policy = 1; 54748 static int valid_policy = 1;
54098 #define TMPBUFLEN 12 54749 #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
54108 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len); 54759 return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
54109 } 54760 }
54110 54761
54111diff -urNp linux-2.6.32.11/security/integrity/ima/ima.h linux-2.6.32.11/security/integrity/ima/ima.h 54762diff -urNp linux-2.6.32.12/security/integrity/ima/ima.h linux-2.6.32.12/security/integrity/ima/ima.h
54112--- linux-2.6.32.11/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400 54763--- linux-2.6.32.12/security/integrity/ima/ima.h 2010-03-15 11:52:04.000000000 -0400
54113+++ linux-2.6.32.11/security/integrity/ima/ima.h 2010-04-04 20:46:41.728797784 -0400 54764+++ linux-2.6.32.12/security/integrity/ima/ima.h 2010-04-04 20:46:41.728797784 -0400
54114@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino 54765@@ -84,8 +84,8 @@ void ima_add_violation(struct inode *ino
54115 extern spinlock_t ima_queue_lock; 54766 extern spinlock_t ima_queue_lock;
54116 54767
@@ -54122,9 +54773,9 @@ diff -urNp linux-2.6.32.11/security/integrity/ima/ima.h linux-2.6.32.11/security
54122 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE]; 54773 struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
54123 }; 54774 };
54124 extern struct ima_h_table ima_htable; 54775 extern struct ima_h_table ima_htable;
54125diff -urNp linux-2.6.32.11/security/integrity/ima/ima_queue.c linux-2.6.32.11/security/integrity/ima/ima_queue.c 54776diff -urNp linux-2.6.32.12/security/integrity/ima/ima_queue.c linux-2.6.32.12/security/integrity/ima/ima_queue.c
54126--- linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400 54777--- linux-2.6.32.12/security/integrity/ima/ima_queue.c 2010-03-15 11:52:04.000000000 -0400
54127+++ linux-2.6.32.11/security/integrity/ima/ima_queue.c 2010-04-04 20:46:41.728797784 -0400 54778+++ linux-2.6.32.12/security/integrity/ima/ima_queue.c 2010-04-04 20:46:41.728797784 -0400
54128@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i 54779@@ -78,7 +78,7 @@ static int ima_add_digest_entry(struct i
54129 INIT_LIST_HEAD(&qe->later); 54780 INIT_LIST_HEAD(&qe->later);
54130 list_add_tail_rcu(&qe->later, &ima_measurements); 54781 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
54134 key = ima_hash_key(entry->digest); 54785 key = ima_hash_key(entry->digest);
54135 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]); 54786 hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
54136 return 0; 54787 return 0;
54137diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig 54788diff -urNp linux-2.6.32.12/security/Kconfig linux-2.6.32.12/security/Kconfig
54138--- linux-2.6.32.11/security/Kconfig 2010-03-15 11:52:04.000000000 -0400 54789--- linux-2.6.32.12/security/Kconfig 2010-03-15 11:52:04.000000000 -0400
54139+++ linux-2.6.32.11/security/Kconfig 2010-04-04 21:03:05.108480196 -0400 54790+++ linux-2.6.32.12/security/Kconfig 2010-04-29 17:46:37.065247062 -0400
54140@@ -4,6 +4,499 @@ 54791@@ -4,6 +4,499 @@
54141 54792
54142 menu "Security options" 54793 menu "Security options"
@@ -54145,6 +54796,15 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig
54145+ 54796+
54146+menu "PaX" 54797+menu "PaX"
54147+ 54798+
54799+ config PAX_PER_CPU_PGD
54800+ bool
54801+
54802+ config TASK_SIZE_MAX_SHIFT
54803+ int
54804+ depends on X86_64
54805+ default 47 if !PAX_PER_CPU_PGD
54806+ default 42 if PAX_PER_CPU_PGD
54807+
54148+config PAX 54808+config PAX
54149+ bool "Enable various PaX features" 54809+ bool "Enable various PaX features"
54150+ depends on GRKERNSEC && (ALPHA || ARM || AVR32 || IA64 || MIPS32 || MIPS64 || PARISC || PPC || SPARC || X86) 54810+ 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
54229+ bool 'hook' 54889+ bool 'hook'
54230+endchoice 54890+endchoice
54231+ 54891+
54232+ config PAX_PER_CPU_PGD
54233+ bool
54234+
54235+ config TASK_SIZE_MAX_SHIFT
54236+ int
54237+ depends on X86_64
54238+ default 47 if !PAX_PER_CPU_PGD
54239+ default 42 if PAX_PER_CPU_PGD
54240+
54241+endmenu 54892+endmenu
54242+ 54893+
54243+menu "Non-executable pages" 54894+menu "Non-executable pages"
@@ -54646,9 +55297,9 @@ diff -urNp linux-2.6.32.11/security/Kconfig linux-2.6.32.11/security/Kconfig
54646 help 55297 help
54647 This is the portion of low virtual memory which should be protected 55298 This is the portion of low virtual memory which should be protected
54648 from userspace allocation. Keeping a user from writing to low pages 55299 from userspace allocation. Keeping a user from writing to low pages
54649diff -urNp linux-2.6.32.11/security/min_addr.c linux-2.6.32.11/security/min_addr.c 55300diff -urNp linux-2.6.32.12/security/min_addr.c linux-2.6.32.12/security/min_addr.c
54650--- linux-2.6.32.11/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400 55301--- linux-2.6.32.12/security/min_addr.c 2010-04-04 20:41:50.084493253 -0400
54651+++ linux-2.6.32.11/security/min_addr.c 2010-04-04 20:46:41.732880788 -0400 55302+++ linux-2.6.32.12/security/min_addr.c 2010-04-04 20:46:41.732880788 -0400
54652@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG 55303@@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
54653 */ 55304 */
54654 static void update_mmap_min_addr(void) 55305 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
54665 } 55316 }
54666 55317
54667 /* 55318 /*
54668diff -urNp linux-2.6.32.11/sound/aoa/codecs/onyx.c linux-2.6.32.11/sound/aoa/codecs/onyx.c 55319diff -urNp linux-2.6.32.12/sound/aoa/codecs/onyx.c linux-2.6.32.12/sound/aoa/codecs/onyx.c
54669--- linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400 55320--- linux-2.6.32.12/sound/aoa/codecs/onyx.c 2010-03-15 11:52:04.000000000 -0400
54670+++ linux-2.6.32.11/sound/aoa/codecs/onyx.c 2010-04-04 20:46:41.732880788 -0400 55321+++ linux-2.6.32.12/sound/aoa/codecs/onyx.c 2010-04-04 20:46:41.732880788 -0400
54671@@ -53,7 +53,7 @@ struct onyx { 55322@@ -53,7 +53,7 @@ struct onyx {
54672 spdif_locked:1, 55323 spdif_locked:1,
54673 analog_locked:1, 55324 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
54696 onyx->spdif_locked = onyx->analog_locked = 0; 55347 onyx->spdif_locked = onyx->analog_locked = 0;
54697 mutex_unlock(&onyx->mutex); 55348 mutex_unlock(&onyx->mutex);
54698 55349
54699diff -urNp linux-2.6.32.11/sound/core/oss/pcm_oss.c linux-2.6.32.11/sound/core/oss/pcm_oss.c 55350diff -urNp linux-2.6.32.12/sound/core/oss/pcm_oss.c linux-2.6.32.12/sound/core/oss/pcm_oss.c
54700--- linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400 55351--- linux-2.6.32.12/sound/core/oss/pcm_oss.c 2010-03-15 11:52:04.000000000 -0400
54701+++ linux-2.6.32.11/sound/core/oss/pcm_oss.c 2010-04-04 20:46:41.732880788 -0400 55352+++ linux-2.6.32.12/sound/core/oss/pcm_oss.c 2010-04-04 20:46:41.732880788 -0400
54702@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct 55353@@ -2949,8 +2949,8 @@ static void snd_pcm_oss_proc_done(struct
54703 } 55354 }
54704 } 55355 }
@@ -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
54710 #endif /* CONFIG_SND_VERBOSE_PROCFS */ 55361 #endif /* CONFIG_SND_VERBOSE_PROCFS */
54711 55362
54712 /* 55363 /*
54713diff -urNp linux-2.6.32.11/sound/core/seq/seq_lock.h linux-2.6.32.11/sound/core/seq/seq_lock.h 55364diff -urNp linux-2.6.32.12/sound/core/seq/seq_lock.h linux-2.6.32.12/sound/core/seq/seq_lock.h
54714--- linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400 55365--- linux-2.6.32.12/sound/core/seq/seq_lock.h 2010-03-15 11:52:04.000000000 -0400
54715+++ linux-2.6.32.11/sound/core/seq/seq_lock.h 2010-04-04 20:46:41.732880788 -0400 55366+++ linux-2.6.32.12/sound/core/seq/seq_lock.h 2010-04-04 20:46:41.732880788 -0400
54716@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo 55367@@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo
54717 #else /* SMP || CONFIG_SND_DEBUG */ 55368 #else /* SMP || CONFIG_SND_DEBUG */
54718 55369
@@ -54728,9 +55379,9 @@ diff -urNp linux-2.6.32.11/sound/core/seq/seq_lock.h linux-2.6.32.11/sound/core/
54728 55379
54729 #endif /* SMP || CONFIG_SND_DEBUG */ 55380 #endif /* SMP || CONFIG_SND_DEBUG */
54730 55381
54731diff -urNp linux-2.6.32.11/sound/drivers/mts64.c linux-2.6.32.11/sound/drivers/mts64.c 55382diff -urNp linux-2.6.32.12/sound/drivers/mts64.c linux-2.6.32.12/sound/drivers/mts64.c
54732--- linux-2.6.32.11/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400 55383--- linux-2.6.32.12/sound/drivers/mts64.c 2010-03-15 11:52:04.000000000 -0400
54733+++ linux-2.6.32.11/sound/drivers/mts64.c 2010-04-04 20:46:41.732880788 -0400 55384+++ linux-2.6.32.12/sound/drivers/mts64.c 2010-04-04 20:46:41.732880788 -0400
54734@@ -65,7 +65,7 @@ struct mts64 { 55385@@ -65,7 +65,7 @@ struct mts64 {
54735 struct pardevice *pardev; 55386 struct pardevice *pardev;
54736 int pardev_claimed; 55387 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
54779 55430
54780 return 0; 55431 return 0;
54781 } 55432 }
54782diff -urNp linux-2.6.32.11/sound/drivers/portman2x4.c linux-2.6.32.11/sound/drivers/portman2x4.c 55433diff -urNp linux-2.6.32.12/sound/drivers/portman2x4.c linux-2.6.32.12/sound/drivers/portman2x4.c
54783--- linux-2.6.32.11/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400 55434--- linux-2.6.32.12/sound/drivers/portman2x4.c 2010-03-15 11:52:04.000000000 -0400
54784+++ linux-2.6.32.11/sound/drivers/portman2x4.c 2010-04-04 20:46:41.732880788 -0400 55435+++ linux-2.6.32.12/sound/drivers/portman2x4.c 2010-04-04 20:46:41.732880788 -0400
54785@@ -83,7 +83,7 @@ struct portman { 55436@@ -83,7 +83,7 @@ struct portman {
54786 struct pardevice *pardev; 55437 struct pardevice *pardev;
54787 int pardev_claimed; 55438 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
54791 int mode[PORTMAN_NUM_INPUT_PORTS]; 55442 int mode[PORTMAN_NUM_INPUT_PORTS];
54792 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS]; 55443 struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
54793 }; 55444 };
54794diff -urNp linux-2.6.32.11/sound/oss/sb_audio.c linux-2.6.32.11/sound/oss/sb_audio.c 55445diff -urNp linux-2.6.32.12/sound/oss/sb_audio.c linux-2.6.32.12/sound/oss/sb_audio.c
54795--- linux-2.6.32.11/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400 55446--- linux-2.6.32.12/sound/oss/sb_audio.c 2010-03-15 11:52:04.000000000 -0400
54796+++ linux-2.6.32.11/sound/oss/sb_audio.c 2010-04-04 20:46:41.732880788 -0400 55447+++ linux-2.6.32.12/sound/oss/sb_audio.c 2010-04-04 20:46:41.732880788 -0400
54797@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev, 55448@@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
54798 buf16 = (signed short *)(localbuf + localoffs); 55449 buf16 = (signed short *)(localbuf + localoffs);
54799 while (c) 55450 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
54803 if (copy_from_user(lbuf8, 55454 if (copy_from_user(lbuf8,
54804 userbuf+useroffs + p, 55455 userbuf+useroffs + p,
54805 locallen)) 55456 locallen))
54806diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_codec.c linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 55457diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_codec.c linux-2.6.32.12/sound/pci/ac97/ac97_codec.c
54807--- linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400 55458--- linux-2.6.32.12/sound/pci/ac97/ac97_codec.c 2010-03-15 11:52:04.000000000 -0400
54808+++ linux-2.6.32.11/sound/pci/ac97/ac97_codec.c 2010-04-04 20:46:41.732880788 -0400 55459+++ linux-2.6.32.12/sound/pci/ac97/ac97_codec.c 2010-04-04 20:46:41.732880788 -0400
54809@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc 55460@@ -1952,7 +1952,7 @@ static int snd_ac97_dev_disconnect(struc
54810 } 55461 }
54811 55462
@@ -54815,9 +55466,9 @@ diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_codec.c linux-2.6.32.11/sound/pci
54815 55466
54816 #ifdef CONFIG_SND_AC97_POWER_SAVE 55467 #ifdef CONFIG_SND_AC97_POWER_SAVE
54817 static void do_update_power(struct work_struct *work) 55468 static void do_update_power(struct work_struct *work)
54818diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_patch.c linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 55469diff -urNp linux-2.6.32.12/sound/pci/ac97/ac97_patch.c linux-2.6.32.12/sound/pci/ac97/ac97_patch.c
54819--- linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400 55470--- linux-2.6.32.12/sound/pci/ac97/ac97_patch.c 2010-04-04 20:41:50.084493253 -0400
54820+++ linux-2.6.32.11/sound/pci/ac97/ac97_patch.c 2010-04-04 20:46:41.732880788 -0400 55471+++ linux-2.6.32.12/sound/pci/ac97/ac97_patch.c 2010-04-04 20:46:41.732880788 -0400
54821@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd 55472@@ -371,7 +371,7 @@ static int patch_yamaha_ymf743_build_spd
54822 return 0; 55473 return 0;
54823 } 55474 }
@@ -55124,9 +55775,9 @@ diff -urNp linux-2.6.32.11/sound/pci/ac97/ac97_patch.c linux-2.6.32.11/sound/pci
55124 .build_specific = patch_ucb1400_specific, 55775 .build_specific = patch_ucb1400_specific,
55125 }; 55776 };
55126 55777
55127diff -urNp linux-2.6.32.11/sound/pci/ens1370.c linux-2.6.32.11/sound/pci/ens1370.c 55778diff -urNp linux-2.6.32.12/sound/pci/ens1370.c linux-2.6.32.12/sound/pci/ens1370.c
55128--- linux-2.6.32.11/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400 55779--- linux-2.6.32.12/sound/pci/ens1370.c 2010-03-15 11:52:04.000000000 -0400
55129+++ linux-2.6.32.11/sound/pci/ens1370.c 2010-04-04 20:46:41.732880788 -0400 55780+++ linux-2.6.32.12/sound/pci/ens1370.c 2010-04-04 20:46:41.732880788 -0400
55130@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci 55781@@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci
55131 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */ 55782 { PCI_VDEVICE(ENSONIQ, 0x5880), 0, }, /* ES1373 - CT5880 */
55132 { PCI_VDEVICE(ECTIVA, 0x8938), 0, }, /* Ectiva EV1938 */ 55783 { 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
55136 }; 55787 };
55137 55788
55138 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); 55789 MODULE_DEVICE_TABLE(pci, snd_audiopci_ids);
55139diff -urNp linux-2.6.32.11/sound/pci/intel8x0.c linux-2.6.32.11/sound/pci/intel8x0.c 55790diff -urNp linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c
55140--- linux-2.6.32.11/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400 55791--- linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c 2010-03-15 11:52:04.000000000 -0400
55141+++ linux-2.6.32.11/sound/pci/intel8x0.c 2010-04-04 20:46:41.732880788 -0400 55792+++ linux-2.6.32.12/sound/pci/hda/patch_intelhdmi.c 2010-04-29 17:46:37.441762570 -0400
55793@@ -511,10 +511,10 @@ static void hdmi_non_intrinsic_event(str
55794 cp_ready);
55795
55796 /* TODO */
55797- if (cp_state)
55798- ;
55799- if (cp_ready)
55800- ;
55801+ if (cp_state) {
55802+ }
55803+ if (cp_ready) {
55804+ }
55805 }
55806
55807
55808diff -urNp linux-2.6.32.12/sound/pci/intel8x0.c linux-2.6.32.12/sound/pci/intel8x0.c
55809--- linux-2.6.32.12/sound/pci/intel8x0.c 2010-03-15 11:52:04.000000000 -0400
55810+++ linux-2.6.32.12/sound/pci/intel8x0.c 2010-04-04 20:46:41.732880788 -0400
55142@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 55811@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0
55143 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 55812 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
55144 { PCI_VDEVICE(AMD, 0x7445), DEVICE_INTEL }, /* AMD768 */ 55813 { 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
55157 }; 55826 };
55158 55827
55159 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, 55828 static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock,
55160diff -urNp linux-2.6.32.11/sound/pci/intel8x0m.c linux-2.6.32.11/sound/pci/intel8x0m.c 55829diff -urNp linux-2.6.32.12/sound/pci/intel8x0m.c linux-2.6.32.12/sound/pci/intel8x0m.c
55161--- linux-2.6.32.11/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400 55830--- linux-2.6.32.12/sound/pci/intel8x0m.c 2010-03-15 11:52:04.000000000 -0400
55162+++ linux-2.6.32.11/sound/pci/intel8x0m.c 2010-04-04 20:46:41.737788480 -0400 55831+++ linux-2.6.32.12/sound/pci/intel8x0m.c 2010-04-04 20:46:41.737788480 -0400
55163@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 55832@@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0
55164 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */ 55833 { PCI_VDEVICE(AMD, 0x746d), DEVICE_INTEL }, /* AMD8111 */
55165 { PCI_VDEVICE(AL, 0x5455), DEVICE_ALI }, /* Ali5455 */ 55834 { 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
55178 }; 55847 };
55179 55848
55180 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, 55849 static int __devinit snd_intel8x0m_probe(struct pci_dev *pci,
55181diff -urNp linux-2.6.32.11/usr/gen_init_cpio.c linux-2.6.32.11/usr/gen_init_cpio.c 55850diff -urNp linux-2.6.32.12/usr/gen_init_cpio.c linux-2.6.32.12/usr/gen_init_cpio.c
55182--- linux-2.6.32.11/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400 55851--- linux-2.6.32.12/usr/gen_init_cpio.c 2010-03-15 11:52:04.000000000 -0400
55183+++ linux-2.6.32.11/usr/gen_init_cpio.c 2010-04-04 20:46:41.737788480 -0400 55852+++ linux-2.6.32.12/usr/gen_init_cpio.c 2010-04-04 20:46:41.737788480 -0400
55184@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name, 55853@@ -299,7 +299,7 @@ static int cpio_mkfile(const char *name,
55185 int retval; 55854 int retval;
55186 int rc = -1; 55855 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
55203 } else 55872 } else
55204 break; 55873 break;
55205 } 55874 }
55206diff -urNp linux-2.6.32.11/virt/kvm/kvm_main.c linux-2.6.32.11/virt/kvm/kvm_main.c 55875diff -urNp linux-2.6.32.12/virt/kvm/kvm_main.c linux-2.6.32.12/virt/kvm/kvm_main.c
55207--- linux-2.6.32.11/virt/kvm/kvm_main.c 2010-03-15 11:52:04.000000000 -0400 55876--- linux-2.6.32.12/virt/kvm/kvm_main.c 2010-04-29 17:49:38.869035092 -0400
55208+++ linux-2.6.32.11/virt/kvm/kvm_main.c 2010-04-04 20:46:41.737788480 -0400 55877+++ linux-2.6.32.12/virt/kvm/kvm_main.c 2010-04-29 17:49:58.805045845 -0400
55209@@ -1745,6 +1745,7 @@ static int kvm_vcpu_release(struct inode 55878@@ -1748,6 +1748,7 @@ static int kvm_vcpu_release(struct inode
55210 return 0; 55879 return 0;
55211 } 55880 }
55212 55881
@@ -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
55214 static struct file_operations kvm_vcpu_fops = { 55883 static struct file_operations kvm_vcpu_fops = {
55215 .release = kvm_vcpu_release, 55884 .release = kvm_vcpu_release,
55216 .unlocked_ioctl = kvm_vcpu_ioctl, 55885 .unlocked_ioctl = kvm_vcpu_ioctl,
55217@@ -2341,6 +2342,7 @@ static int kvm_vm_mmap(struct file *file 55886@@ -2344,6 +2345,7 @@ static int kvm_vm_mmap(struct file *file
55218 return 0; 55887 return 0;
55219 } 55888 }
55220 55889
@@ -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
55222 static struct file_operations kvm_vm_fops = { 55891 static struct file_operations kvm_vm_fops = {
55223 .release = kvm_vm_release, 55892 .release = kvm_vm_release,
55224 .unlocked_ioctl = kvm_vm_ioctl, 55893 .unlocked_ioctl = kvm_vm_ioctl,
55225@@ -2428,6 +2430,7 @@ out: 55894@@ -2431,6 +2433,7 @@ out:
55226 return r; 55895 return r;
55227 } 55896 }
55228 55897
@@ -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
55230 static struct file_operations kvm_chardev_ops = { 55899 static struct file_operations kvm_chardev_ops = {
55231 .unlocked_ioctl = kvm_dev_ioctl, 55900 .unlocked_ioctl = kvm_dev_ioctl,
55232 .compat_ioctl = kvm_dev_ioctl, 55901 .compat_ioctl = kvm_dev_ioctl,
55233@@ -2437,6 +2440,9 @@ static struct miscdevice kvm_dev = { 55902@@ -2440,6 +2443,9 @@ static struct miscdevice kvm_dev = {
55234 KVM_MINOR, 55903 KVM_MINOR,
55235 "kvm", 55904 "kvm",
55236 &kvm_chardev_ops, 55905 &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
55240 }; 55909 };
55241 55910
55242 static void hardware_enable(void *junk) 55911 static void hardware_enable(void *junk)
55243@@ -2711,7 +2717,7 @@ static void kvm_sched_out(struct preempt 55912@@ -2714,7 +2720,7 @@ static void kvm_sched_out(struct preempt
55244 kvm_arch_vcpu_put(vcpu); 55913 kvm_arch_vcpu_put(vcpu);
55245 } 55914 }
55246 55915
© 2015 Mike Crute