diff options
Diffstat (limited to 'main/linux-grsec')
| -rw-r--r-- | main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch | 207 | ||||
| -rw-r--r-- | main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch | 140 | ||||
| -rw-r--r-- | main/linux-grsec/APKBUILD | 24 | ||||
| -rw-r--r-- | main/linux-grsec/grsecurity-2.1.14-2.6.30.4-200908041752.patch (renamed from main/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907231934.patch) | 12147 | ||||
| -rw-r--r-- | main/linux-grsec/kernelconfig | 333 | ||||
| -rw-r--r-- | main/linux-grsec/linux-nbma-mroute-v4-2.6.30.diff | 258 |
6 files changed, 6093 insertions, 7016 deletions
diff --git a/main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch b/main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch deleted file mode 100644 index fd0cfeb2a2..0000000000 --- a/main/linux-grsec/0001-linux-2.6.28.5-ipgre-strict-binding.patch +++ /dev/null @@ -1,207 +0,0 @@ -From: Timo Teras <timo.teras@iki.fi> -Date: Tue, 20 Jan 2009 01:22:12 +0000 (-0800) -Subject: gre: strict physical device binding -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet-next-2.6.git;a=commitdiff_plain;h=749c10f931923451a4c59b4435d182aa9ae27a4f;hp=57a574993d94671b495cdbe8aeb78b745abfe14f - -gre: strict physical device binding - -Check the device on receive path and allow otherwise identical devices -as long as the physical device differs. - -This is useful for NBMA tunnels, where you want to use different gre IP -for each public IP available via different physical devices. - -Signed-off-by: Timo Teras <timo.teras@iki.fi> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - -diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c -index 0101521..4a43739 100644 ---- a/net/ipv4/ip_gre.c -+++ b/net/ipv4/ip_gre.c -@@ -164,67 +164,113 @@ static DEFINE_RWLOCK(ipgre_lock); - - /* Given src, dst and key, find appropriate for input tunnel. */ - --static struct ip_tunnel * ipgre_tunnel_lookup(struct net *net, -+static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev, - __be32 remote, __be32 local, - __be32 key, __be16 gre_proto) - { -+ struct net *net = dev_net(dev); -+ int link = dev->ifindex; - unsigned h0 = HASH(remote); - unsigned h1 = HASH(key); -- struct ip_tunnel *t; -- struct ip_tunnel *t2 = NULL; -+ struct ip_tunnel *t, *sel[4] = { NULL, NULL, NULL, NULL }; - struct ipgre_net *ign = net_generic(net, ipgre_net_id); - int dev_type = (gre_proto == htons(ETH_P_TEB)) ? - ARPHRD_ETHER : ARPHRD_IPGRE; -+ int idx; - - for (t = ign->tunnels_r_l[h0^h1]; t; t = t->next) { -- if (local == t->parms.iph.saddr && remote == t->parms.iph.daddr) { -- if (t->parms.i_key == key && t->dev->flags & IFF_UP) { -- if (t->dev->type == dev_type) -- return t; -- if (t->dev->type == ARPHRD_IPGRE && !t2) -- t2 = t; -- } -- } -+ if (local != t->parms.iph.saddr || -+ remote != t->parms.iph.daddr || -+ key != t->parms.i_key || -+ !(t->dev->flags & IFF_UP)) -+ continue; -+ -+ if (t->dev->type != ARPHRD_IPGRE && -+ t->dev->type != dev_type) -+ continue; -+ -+ idx = 0; -+ if (t->parms.link != link) -+ idx |= 1; -+ if (t->dev->type != dev_type) -+ idx |= 2; -+ if (idx == 0) -+ return t; -+ if (sel[idx] == NULL) -+ sel[idx] = t; - } - - for (t = ign->tunnels_r[h0^h1]; t; t = t->next) { -- if (remote == t->parms.iph.daddr) { -- if (t->parms.i_key == key && t->dev->flags & IFF_UP) { -- if (t->dev->type == dev_type) -- return t; -- if (t->dev->type == ARPHRD_IPGRE && !t2) -- t2 = t; -- } -- } -+ if (remote != t->parms.iph.daddr || -+ key != t->parms.i_key || -+ !(t->dev->flags & IFF_UP)) -+ continue; -+ -+ if (t->dev->type != ARPHRD_IPGRE && -+ t->dev->type != dev_type) -+ continue; -+ -+ idx = 0; -+ if (t->parms.link != link) -+ idx |= 1; -+ if (t->dev->type != dev_type) -+ idx |= 2; -+ if (idx == 0) -+ return t; -+ if (sel[idx] == NULL) -+ sel[idx] = t; - } - - for (t = ign->tunnels_l[h1]; t; t = t->next) { -- if (local == t->parms.iph.saddr || -- (local == t->parms.iph.daddr && -- ipv4_is_multicast(local))) { -- if (t->parms.i_key == key && t->dev->flags & IFF_UP) { -- if (t->dev->type == dev_type) -- return t; -- if (t->dev->type == ARPHRD_IPGRE && !t2) -- t2 = t; -- } -- } -+ if ((local != t->parms.iph.saddr && -+ (local != t->parms.iph.daddr || -+ !ipv4_is_multicast(local))) || -+ key != t->parms.i_key || -+ !(t->dev->flags & IFF_UP)) -+ continue; -+ -+ if (t->dev->type != ARPHRD_IPGRE && -+ t->dev->type != dev_type) -+ continue; -+ -+ idx = 0; -+ if (t->parms.link != link) -+ idx |= 1; -+ if (t->dev->type != dev_type) -+ idx |= 2; -+ if (idx == 0) -+ return t; -+ if (sel[idx] == NULL) -+ sel[idx] = t; - } - - for (t = ign->tunnels_wc[h1]; t; t = t->next) { -- if (t->parms.i_key == key && t->dev->flags & IFF_UP) { -- if (t->dev->type == dev_type) -- return t; -- if (t->dev->type == ARPHRD_IPGRE && !t2) -- t2 = t; -- } -+ if (t->parms.i_key != key || -+ !(t->dev->flags & IFF_UP)) -+ continue; -+ -+ if (t->dev->type != ARPHRD_IPGRE && -+ t->dev->type != dev_type) -+ continue; -+ -+ idx = 0; -+ if (t->parms.link != link) -+ idx |= 1; -+ if (t->dev->type != dev_type) -+ idx |= 2; -+ if (idx == 0) -+ return t; -+ if (sel[idx] == NULL) -+ sel[idx] = t; - } - -- if (t2) -- return t2; -+ for (idx = 1; idx < ARRAY_SIZE(sel); idx++) -+ if (sel[idx] != NULL) -+ return sel[idx]; - -- if (ign->fb_tunnel_dev->flags&IFF_UP) -+ if (ign->fb_tunnel_dev->flags & IFF_UP) - return netdev_priv(ign->fb_tunnel_dev); -+ - return NULL; - } - -@@ -284,6 +330,7 @@ static struct ip_tunnel *ipgre_tunnel_find(struct net *net, - __be32 remote = parms->iph.daddr; - __be32 local = parms->iph.saddr; - __be32 key = parms->i_key; -+ int link = parms->link; - struct ip_tunnel *t, **tp; - struct ipgre_net *ign = net_generic(net, ipgre_net_id); - -@@ -291,6 +338,7 @@ static struct ip_tunnel *ipgre_tunnel_find(struct net *net, - if (local == t->parms.iph.saddr && - remote == t->parms.iph.daddr && - key == t->parms.i_key && -+ link == t->parms.link && - type == t->dev->type) - break; - -@@ -421,7 +469,7 @@ static void ipgre_err(struct sk_buff *skb, u32 info) - } - - read_lock(&ipgre_lock); -- t = ipgre_tunnel_lookup(dev_net(skb->dev), iph->daddr, iph->saddr, -+ t = ipgre_tunnel_lookup(skb->dev, iph->daddr, iph->saddr, - flags & GRE_KEY ? - *(((__be32 *)p) + (grehlen / 4) - 1) : 0, - p[1]); -@@ -518,7 +566,7 @@ static int ipgre_rcv(struct sk_buff *skb) - gre_proto = *(__be16 *)(h + 2); - - read_lock(&ipgre_lock); -- if ((tunnel = ipgre_tunnel_lookup(dev_net(skb->dev), -+ if ((tunnel = ipgre_tunnel_lookup(skb->dev, - iph->saddr, iph->daddr, key, - gre_proto))) { - struct net_device_stats *stats = &tunnel->dev->stats; diff --git a/main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch b/main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch deleted file mode 100644 index fbfef33b9b..0000000000 --- a/main/linux-grsec/0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch +++ /dev/null @@ -1,140 +0,0 @@ -From: Timo Teras <timo.teras@iki.fi> -Date: Tue, 27 Jan 2009 04:56:10 +0000 (-0800) -Subject: gre: optimize hash lookup -X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fdavem%2Fnet-next-2.6.git;a=commitdiff_plain;h=afcf12422ec8236dc8b9238fef7a475876eea8da;hp=3eacdf58c2c0b9507afedfc19108e98b992c31e4 - -gre: optimize hash lookup - -Instead of keeping candidate tunnel device from all categories, -keep only one candidate with best score. This optimizes stack -usage and speeds up exit code. - -Signed-off-by: Timo Teras <timo.teras@iki.fi> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - -diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c -index 4a43739..07a188a 100644 ---- a/net/ipv4/ip_gre.c -+++ b/net/ipv4/ip_gre.c -@@ -172,11 +172,11 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev, - int link = dev->ifindex; - unsigned h0 = HASH(remote); - unsigned h1 = HASH(key); -- struct ip_tunnel *t, *sel[4] = { NULL, NULL, NULL, NULL }; -+ struct ip_tunnel *t, *cand = NULL; - struct ipgre_net *ign = net_generic(net, ipgre_net_id); - int dev_type = (gre_proto == htons(ETH_P_TEB)) ? - ARPHRD_ETHER : ARPHRD_IPGRE; -- int idx; -+ int score, cand_score = 4; - - for (t = ign->tunnels_r_l[h0^h1]; t; t = t->next) { - if (local != t->parms.iph.saddr || -@@ -189,15 +189,18 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev, - t->dev->type != dev_type) - continue; - -- idx = 0; -+ score = 0; - if (t->parms.link != link) -- idx |= 1; -+ score |= 1; - if (t->dev->type != dev_type) -- idx |= 2; -- if (idx == 0) -+ score |= 2; -+ if (score == 0) - return t; -- if (sel[idx] == NULL) -- sel[idx] = t; -+ -+ if (score < cand_score) { -+ cand = t; -+ cand_score = score; -+ } - } - - for (t = ign->tunnels_r[h0^h1]; t; t = t->next) { -@@ -210,15 +213,18 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev, - t->dev->type != dev_type) - continue; - -- idx = 0; -+ score = 0; - if (t->parms.link != link) -- idx |= 1; -+ score |= 1; - if (t->dev->type != dev_type) -- idx |= 2; -- if (idx == 0) -+ score |= 2; -+ if (score == 0) - return t; -- if (sel[idx] == NULL) -- sel[idx] = t; -+ -+ if (score < cand_score) { -+ cand = t; -+ cand_score = score; -+ } - } - - for (t = ign->tunnels_l[h1]; t; t = t->next) { -@@ -233,15 +239,18 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev, - t->dev->type != dev_type) - continue; - -- idx = 0; -+ score = 0; - if (t->parms.link != link) -- idx |= 1; -+ score |= 1; - if (t->dev->type != dev_type) -- idx |= 2; -- if (idx == 0) -+ score |= 2; -+ if (score == 0) - return t; -- if (sel[idx] == NULL) -- sel[idx] = t; -+ -+ if (score < cand_score) { -+ cand = t; -+ cand_score = score; -+ } - } - - for (t = ign->tunnels_wc[h1]; t; t = t->next) { -@@ -253,20 +262,22 @@ static struct ip_tunnel * ipgre_tunnel_lookup(struct net_device *dev, - t->dev->type != dev_type) - continue; - -- idx = 0; -+ score = 0; - if (t->parms.link != link) -- idx |= 1; -+ score |= 1; - if (t->dev->type != dev_type) -- idx |= 2; -- if (idx == 0) -+ score |= 2; -+ if (score == 0) - return t; -- if (sel[idx] == NULL) -- sel[idx] = t; -+ -+ if (score < cand_score) { -+ cand = t; -+ cand_score = score; -+ } - } - -- for (idx = 1; idx < ARRAY_SIZE(sel); idx++) -- if (sel[idx] != NULL) -- return sel[idx]; -+ if (cand != NULL) -+ return cand; - - if (ign->fb_tunnel_dev->flags & IFF_UP) - return netdev_priv(ign->fb_tunnel_dev); diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 20fa9284bd..c5a1d3f9e3 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,9 +2,9 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=2.6.29.6 -_kernver=2.6.29 -pkgrel=2 +pkgver=2.6.30.4 +_kernver=2.6.30 +pkgrel=1 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs" @@ -13,9 +13,8 @@ _config=${config:-kernelconfig} install="$pkgname.post-install $pkgname.post-upgrade" source="ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_kernver.tar.bz2 ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2 - grsecurity-2.1.14-2.6.29.6-200907231934.patch - 0001-linux-2.6.28.5-ipgre-strict-binding.patch - 0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch + grsecurity-2.1.14-2.6.30.4-200908041752.patch + linux-nbma-mroute-v4-2.6.30.diff net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch $_config $install @@ -31,7 +30,7 @@ _prepare() { bunzip2 -c < ../patch-$pkgver.bz2 | patch -p1 || return 1 fi - for i in ../*.patch; do + for i in ../*.diff ../*.patch; do msg "Applying $i..." patch -p1 -N < $i || return 1 done @@ -112,12 +111,11 @@ dev() { "$subpkgdir"/lib/modules/${_abi_release}/build } -md5sums="64921b5ff5cdadbccfcd3820f03be7d8 linux-2.6.29.tar.bz2 -0317760b52c9ac7a11de997da19a366e patch-2.6.29.6.bz2 -bc067ccfe86517c4e4568b76b4a50e06 grsecurity-2.1.14-2.6.29.6-200907231934.patch -7673b4521283ad41434a18ca18b16ad8 0001-linux-2.6.28.5-ipgre-strict-binding.patch -8f405c738b150c532c46eaad5390cca2 0002-linux-2.6.28.5-ipgre-optimize-hash-lookup.patch +md5sums="7a80058a6382e5108cdb5554d1609615 linux-2.6.30.tar.bz2 +d0fc44b54ba5953140b3f2aa9a1f2580 patch-2.6.30.4.bz2 +7d9fd867108074ec9dcc9d2385ff1e7b grsecurity-2.1.14-2.6.30.4-200908041752.patch +7420c0b1095335990313656b114e1379 linux-nbma-mroute-v4-2.6.30.diff ca05fd252783b82e01610e775cf56498 net-next-2.6.git-5ef12d98a19254ee5dc851bd83e214b43ec1f725.patch -c9443dcc46eb70267b4cfe6a6694f637 kernelconfig +13bdad159b0d99281c931a7dcb7d31ae kernelconfig 2834240b15805b248ef2a973b1ad4416 linux-grsec.post-install 2834240b15805b248ef2a973b1ad4416 linux-grsec.post-upgrade" diff --git a/main/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907231934.patch b/main/linux-grsec/grsecurity-2.1.14-2.6.30.4-200908041752.patch index eb8c335b73..799132a383 100644 --- a/main/linux-grsec/grsecurity-2.1.14-2.6.29.6-200907231934.patch +++ b/main/linux-grsec/grsecurity-2.1.14-2.6.30.4-200908041752.patch @@ -1,6 +1,6 @@ -diff -urNp linux-2.6.29.6/arch/alpha/include/asm/atomic.h linux-2.6.29.6/arch/alpha/include/asm/atomic.h ---- linux-2.6.29.6/arch/alpha/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/alpha/include/asm/atomic.h 2009-07-23 17:34:32.032153687 -0400 +diff -urNp linux-2.6.30.4/arch/alpha/include/asm/atomic.h linux-2.6.30.4/arch/alpha/include/asm/atomic.h +--- linux-2.6.30.4/arch/alpha/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/alpha/include/asm/atomic.h 2009-07-30 09:48:09.872868955 -0400 @@ -246,6 +246,9 @@ static __inline__ int atomic64_add_unles #define atomic64_dec_and_test(v) (atomic64_sub_return(1, (v)) == 0) @@ -11,9 +11,9 @@ diff -urNp linux-2.6.29.6/arch/alpha/include/asm/atomic.h linux-2.6.29.6/arch/al #define atomic64_inc(v) atomic64_add(1,(v)) #define atomic_dec(v) atomic_sub(1,(v)) -diff -urNp linux-2.6.29.6/arch/alpha/include/asm/elf.h linux-2.6.29.6/arch/alpha/include/asm/elf.h ---- linux-2.6.29.6/arch/alpha/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/alpha/include/asm/elf.h 2009-07-23 17:34:32.032809072 -0400 +diff -urNp linux-2.6.30.4/arch/alpha/include/asm/elf.h linux-2.6.30.4/arch/alpha/include/asm/elf.h +--- linux-2.6.30.4/arch/alpha/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/alpha/include/asm/elf.h 2009-07-30 09:48:09.873636524 -0400 @@ -91,6 +91,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x1000000) @@ -28,9 +28,9 @@ diff -urNp linux-2.6.29.6/arch/alpha/include/asm/elf.h linux-2.6.29.6/arch/alpha /* $0 is set by ld.so to a pointer to a function which might be registered using atexit. This provides a mean for the dynamic linker to call DT_FINI functions for shared libraries that have -diff -urNp linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h 2009-07-23 17:34:32.032809072 -0400 +diff -urNp linux-2.6.30.4/arch/alpha/include/asm/kmap_types.h linux-2.6.30.4/arch/alpha/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/alpha/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/alpha/include/asm/kmap_types.h 2009-07-30 09:48:09.873636524 -0400 @@ -24,7 +24,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -41,9 +41,9 @@ diff -urNp linux-2.6.29.6/arch/alpha/include/asm/kmap_types.h linux-2.6.29.6/arc }; #undef D -diff -urNp linux-2.6.29.6/arch/alpha/include/asm/pgtable.h linux-2.6.29.6/arch/alpha/include/asm/pgtable.h ---- linux-2.6.29.6/arch/alpha/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/alpha/include/asm/pgtable.h 2009-07-23 17:34:32.032809072 -0400 +diff -urNp linux-2.6.30.4/arch/alpha/include/asm/pgtable.h linux-2.6.30.4/arch/alpha/include/asm/pgtable.h +--- linux-2.6.30.4/arch/alpha/include/asm/pgtable.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/alpha/include/asm/pgtable.h 2009-07-30 09:48:09.874706218 -0400 @@ -101,6 +101,17 @@ struct vm_area_struct; #define PAGE_SHARED __pgprot(_PAGE_VALID | __ACCESS_BITS) #define PAGE_COPY __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW) @@ -62,9 +62,9 @@ diff -urNp linux-2.6.29.6/arch/alpha/include/asm/pgtable.h linux-2.6.29.6/arch/a #define PAGE_KERNEL __pgprot(_PAGE_VALID | _PAGE_ASM | _PAGE_KRE | _PAGE_KWE) #define _PAGE_NORMAL(x) __pgprot(_PAGE_VALID | __ACCESS_BITS | (x)) -diff -urNp linux-2.6.29.6/arch/alpha/kernel/module.c linux-2.6.29.6/arch/alpha/kernel/module.c ---- linux-2.6.29.6/arch/alpha/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/alpha/kernel/module.c 2009-07-23 17:34:32.032809072 -0400 +diff -urNp linux-2.6.30.4/arch/alpha/kernel/module.c linux-2.6.30.4/arch/alpha/kernel/module.c +--- linux-2.6.30.4/arch/alpha/kernel/module.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/alpha/kernel/module.c 2009-07-30 09:48:09.875723461 -0400 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, /* The small sections were sorted to the end of the segment. @@ -74,10 +74,10 @@ diff -urNp linux-2.6.29.6/arch/alpha/kernel/module.c linux-2.6.29.6/arch/alpha/k got = sechdrs[me->arch.gotsecindex].sh_addr; for (i = 0; i < n; i++) { -diff -urNp linux-2.6.29.6/arch/alpha/kernel/osf_sys.c linux-2.6.29.6/arch/alpha/kernel/osf_sys.c ---- linux-2.6.29.6/arch/alpha/kernel/osf_sys.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/alpha/kernel/osf_sys.c 2009-07-23 17:34:32.032809072 -0400 -@@ -1217,6 +1217,10 @@ arch_get_unmapped_area(struct file *filp +diff -urNp linux-2.6.30.4/arch/alpha/kernel/osf_sys.c linux-2.6.30.4/arch/alpha/kernel/osf_sys.c +--- linux-2.6.30.4/arch/alpha/kernel/osf_sys.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/alpha/kernel/osf_sys.c 2009-07-30 09:48:09.875723461 -0400 +@@ -1215,6 +1215,10 @@ arch_get_unmapped_area(struct file *filp merely specific addresses, but regions of memory -- perhaps this feature should be incorporated into all ports? */ @@ -88,7 +88,7 @@ diff -urNp linux-2.6.29.6/arch/alpha/kernel/osf_sys.c linux-2.6.29.6/arch/alpha/ if (addr) { addr = arch_get_unmapped_area_1 (PAGE_ALIGN(addr), len, limit); if (addr != (unsigned long) -ENOMEM) -@@ -1224,8 +1228,8 @@ arch_get_unmapped_area(struct file *filp +@@ -1222,8 +1226,8 @@ arch_get_unmapped_area(struct file *filp } /* Next, try allocating at TASK_UNMAPPED_BASE. */ @@ -99,9 +99,9 @@ diff -urNp linux-2.6.29.6/arch/alpha/kernel/osf_sys.c linux-2.6.29.6/arch/alpha/ if (addr != (unsigned long) -ENOMEM) return addr; -diff -urNp linux-2.6.29.6/arch/alpha/mm/fault.c linux-2.6.29.6/arch/alpha/mm/fault.c ---- linux-2.6.29.6/arch/alpha/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/alpha/mm/fault.c 2009-07-23 17:34:32.033902767 -0400 +diff -urNp linux-2.6.30.4/arch/alpha/mm/fault.c linux-2.6.30.4/arch/alpha/mm/fault.c +--- linux-2.6.30.4/arch/alpha/mm/fault.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/alpha/mm/fault.c 2009-07-30 09:48:09.876636955 -0400 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct * __reload_thread(pcb); } @@ -258,23 +258,23 @@ diff -urNp linux-2.6.29.6/arch/alpha/mm/fault.c linux-2.6.29.6/arch/alpha/mm/fau } else if (!cause) { /* Allow reads even for write-only mappings */ if (!(vma->vm_flags & (VM_READ | VM_WRITE))) -diff -urNp linux-2.6.29.6/arch/arm/include/asm/atomic.h linux-2.6.29.6/arch/arm/include/asm/atomic.h ---- linux-2.6.29.6/arch/arm/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/arm/include/asm/atomic.h 2009-07-23 17:34:32.033902767 -0400 -@@ -191,6 +191,9 @@ static inline int atomic_add_unless(atom - #define atomic_inc(v) (void) atomic_add_return(1, v) - #define atomic_sub(i, v) (void) atomic_sub_return(i, v) - #define atomic_dec(v) (void) atomic_sub_return(1, v) -+#define atomic_inc_unchecked(v) (void) atomic_inc(v) -+#define atomic_add_unchecked(i, v) (void) atomic_add(i, v) -+#define atomic_sub_unchecked(i, v) (void) atomic_sub(i, v) +diff -urNp linux-2.6.30.4/arch/arm/include/asm/atomic.h linux-2.6.30.4/arch/arm/include/asm/atomic.h +--- linux-2.6.30.4/arch/arm/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/arm/include/asm/atomic.h 2009-07-30 09:48:09.876636955 -0400 +@@ -235,6 +235,9 @@ static inline int atomic_add_unless(atom + + #define atomic_inc(v) atomic_add(1, v) + #define atomic_dec(v) atomic_sub(1, v) ++#define atomic_inc_unchecked(v) atomic_inc(v) ++#define atomic_add_unchecked(i, v) atomic_add(i, v) ++#define atomic_sub_unchecked(i, v) atomic_sub(i, v) #define atomic_inc_and_test(v) (atomic_add_return(1, v) == 0) #define atomic_dec_and_test(v) (atomic_sub_return(1, v) == 0) -diff -urNp linux-2.6.29.6/arch/arm/include/asm/elf.h linux-2.6.29.6/arch/arm/include/asm/elf.h ---- linux-2.6.29.6/arch/arm/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/arm/include/asm/elf.h 2009-07-23 17:34:32.033902767 -0400 -@@ -100,7 +100,14 @@ extern int arm_elf_read_implies_exec(con +diff -urNp linux-2.6.30.4/arch/arm/include/asm/elf.h linux-2.6.30.4/arch/arm/include/asm/elf.h +--- linux-2.6.30.4/arch/arm/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/arm/include/asm/elf.h 2009-07-30 09:48:09.877630671 -0400 +@@ -103,7 +103,14 @@ extern int arm_elf_read_implies_exec(con the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -290,32 +290,43 @@ diff -urNp linux-2.6.29.6/arch/arm/include/asm/elf.h linux-2.6.29.6/arch/arm/inc /* When the program starts, a1 contains a pointer to a function to be registered with atexit, as per the SVR4 ABI. A value of 0 means we -diff -urNp linux-2.6.29.6/arch/arm/include/asm/kmap_types.h linux-2.6.29.6/arch/arm/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/arm/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/arm/include/asm/kmap_types.h 2009-07-23 17:34:32.033902767 -0400 -@@ -18,6 +18,7 @@ enum km_type { - KM_IRQ1, +diff -urNp linux-2.6.30.4/arch/arm/include/asm/kmap_types.h linux-2.6.30.4/arch/arm/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/arm/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/arm/include/asm/kmap_types.h 2009-07-30 09:48:09.878525050 -0400 +@@ -19,6 +19,7 @@ enum km_type { KM_SOFTIRQ0, KM_SOFTIRQ1, + KM_L2_CACHE, + KM_CLEARPAGE, KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/arm/include/asm/uaccess.h linux-2.6.29.6/arch/arm/include/asm/uaccess.h ---- linux-2.6.29.6/arch/arm/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/arm/include/asm/uaccess.h 2009-07-23 17:34:32.033902767 -0400 -@@ -400,7 +400,7 @@ static inline unsigned long __must_check +diff -urNp linux-2.6.30.4/arch/arm/include/asm/uaccess.h linux-2.6.30.4/arch/arm/include/asm/uaccess.h +--- linux-2.6.30.4/arch/arm/include/asm/uaccess.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/arm/include/asm/uaccess.h 2009-07-30 09:48:09.878525050 -0400 +@@ -398,6 +398,9 @@ extern unsigned long __must_check __strn + + static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long n) { ++ if ((long)n < 0) ++ return n; ++ if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); -- else /* security hole - plug it */ -+ else if ((long)n > 0) /* security hole - plug it -- good idea! */ - memset(to, 0, n); + else /* security hole - plug it */ +@@ -407,6 +410,9 @@ static inline unsigned long __must_check + + static inline unsigned long __must_check copy_to_user(void __user *to, const void *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + if (access_ok(VERIFY_WRITE, to, n)) + n = __copy_to_user(to, from, n); return n; - } -diff -urNp linux-2.6.29.6/arch/arm/mach-ns9xxx/clock.c linux-2.6.29.6/arch/arm/mach-ns9xxx/clock.c ---- linux-2.6.29.6/arch/arm/mach-ns9xxx/clock.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/arm/mach-ns9xxx/clock.c 2009-07-23 18:40:27.482433806 -0400 +diff -urNp linux-2.6.30.4/arch/arm/mach-ns9xxx/clock.c linux-2.6.30.4/arch/arm/mach-ns9xxx/clock.c +--- linux-2.6.30.4/arch/arm/mach-ns9xxx/clock.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/arm/mach-ns9xxx/clock.c 2009-07-30 09:48:09.879705308 -0400 @@ -195,7 +195,7 @@ static int clk_debugfs_open(struct inode return single_open(file, clk_debugfs_show, NULL); } @@ -325,9 +336,9 @@ diff -urNp linux-2.6.29.6/arch/arm/mach-ns9xxx/clock.c linux-2.6.29.6/arch/arm/m .open = clk_debugfs_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/arch/arm/mm/mmap.c linux-2.6.29.6/arch/arm/mm/mmap.c ---- linux-2.6.29.6/arch/arm/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/arm/mm/mmap.c 2009-07-23 17:34:32.033902767 -0400 +diff -urNp linux-2.6.30.4/arch/arm/mm/mmap.c linux-2.6.30.4/arch/arm/mm/mmap.c +--- linux-2.6.30.4/arch/arm/mm/mmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/arm/mm/mmap.c 2009-07-30 09:48:09.881684524 -0400 @@ -62,6 +62,10 @@ arch_get_unmapped_area(struct file *filp if (len > TASK_SIZE) return -ENOMEM; @@ -364,9 +375,9 @@ diff -urNp linux-2.6.29.6/arch/arm/mm/mmap.c linux-2.6.29.6/arch/arm/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -diff -urNp linux-2.6.29.6/arch/avr32/include/asm/atomic.h linux-2.6.29.6/arch/avr32/include/asm/atomic.h ---- linux-2.6.29.6/arch/avr32/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/avr32/include/asm/atomic.h 2009-07-23 17:34:32.034839933 -0400 +diff -urNp linux-2.6.30.4/arch/avr32/include/asm/atomic.h linux-2.6.30.4/arch/avr32/include/asm/atomic.h +--- linux-2.6.30.4/arch/avr32/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/avr32/include/asm/atomic.h 2009-07-30 09:48:09.881684524 -0400 @@ -176,9 +176,12 @@ static inline int atomic_sub_if_positive #define atomic_cmpxchg(v, o, n) (cmpxchg(&((v)->counter), (o), (n))) @@ -380,9 +391,9 @@ diff -urNp linux-2.6.29.6/arch/avr32/include/asm/atomic.h linux-2.6.29.6/arch/av #define atomic_dec_return(v) atomic_sub_return(1, v) #define atomic_inc_return(v) atomic_add_return(1, v) -diff -urNp linux-2.6.29.6/arch/avr32/include/asm/elf.h linux-2.6.29.6/arch/avr32/include/asm/elf.h ---- linux-2.6.29.6/arch/avr32/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/avr32/include/asm/elf.h 2009-07-23 17:34:32.034839933 -0400 +diff -urNp linux-2.6.30.4/arch/avr32/include/asm/elf.h linux-2.6.30.4/arch/avr32/include/asm/elf.h +--- linux-2.6.30.4/arch/avr32/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/avr32/include/asm/elf.h 2009-07-30 09:48:09.881684524 -0400 @@ -85,8 +85,14 @@ typedef struct user_fpu_struct elf_fpreg the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -399,9 +410,9 @@ diff -urNp linux-2.6.29.6/arch/avr32/include/asm/elf.h linux-2.6.29.6/arch/avr32 /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -diff -urNp linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h 2009-07-23 17:34:32.034839933 -0400 +diff -urNp linux-2.6.30.4/arch/avr32/include/asm/kmap_types.h linux-2.6.30.4/arch/avr32/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/avr32/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/avr32/include/asm/kmap_types.h 2009-07-30 09:48:09.882650296 -0400 @@ -22,7 +22,8 @@ D(10) KM_IRQ0, D(11) KM_IRQ1, D(12) KM_SOFTIRQ0, @@ -412,9 +423,9 @@ diff -urNp linux-2.6.29.6/arch/avr32/include/asm/kmap_types.h linux-2.6.29.6/arc }; #undef D -diff -urNp linux-2.6.29.6/arch/avr32/mm/fault.c linux-2.6.29.6/arch/avr32/mm/fault.c ---- linux-2.6.29.6/arch/avr32/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/avr32/mm/fault.c 2009-07-23 17:34:32.035832174 -0400 +diff -urNp linux-2.6.30.4/arch/avr32/mm/fault.c linux-2.6.30.4/arch/avr32/mm/fault.c +--- linux-2.6.30.4/arch/avr32/mm/fault.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/avr32/mm/fault.c 2009-07-30 09:48:09.882650296 -0400 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru int exception_trace = 1; @@ -456,9 +467,9 @@ diff -urNp linux-2.6.29.6/arch/avr32/mm/fault.c linux-2.6.29.6/arch/avr32/mm/fau if (exception_trace && printk_ratelimit()) printk("%s%s[%d]: segfault at %08lx pc %08lx " "sp %08lx ecr %lu\n", -diff -urNp linux-2.6.29.6/arch/blackfin/include/asm/atomic.h linux-2.6.29.6/arch/blackfin/include/asm/atomic.h ---- linux-2.6.29.6/arch/blackfin/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/blackfin/include/asm/atomic.h 2009-07-23 17:34:32.036919850 -0400 +diff -urNp linux-2.6.30.4/arch/blackfin/include/asm/atomic.h linux-2.6.30.4/arch/blackfin/include/asm/atomic.h +--- linux-2.6.30.4/arch/blackfin/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/blackfin/include/asm/atomic.h 2009-07-30 09:48:09.882650296 -0400 @@ -178,6 +178,9 @@ static inline void atomic_set_mask(unsig #endif /* !CONFIG_SMP */ @@ -469,9 +480,9 @@ diff -urNp linux-2.6.29.6/arch/blackfin/include/asm/atomic.h linux-2.6.29.6/arch #define atomic_add_negative(a, v) (atomic_add_return((a), (v)) < 0) #define atomic_dec_return(v) atomic_sub_return(1,(v)) #define atomic_inc_return(v) atomic_add_return(1,(v)) -diff -urNp linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h 2009-07-23 17:34:32.036919850 -0400 +diff -urNp linux-2.6.30.4/arch/blackfin/include/asm/kmap_types.h linux-2.6.30.4/arch/blackfin/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/blackfin/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/blackfin/include/asm/kmap_types.h 2009-07-30 09:48:09.883618875 -0400 @@ -15,6 +15,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -480,9 +491,9 @@ diff -urNp linux-2.6.29.6/arch/blackfin/include/asm/kmap_types.h linux-2.6.29.6/ KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/blackfin/mach-bf561/coreb.c linux-2.6.29.6/arch/blackfin/mach-bf561/coreb.c ---- linux-2.6.29.6/arch/blackfin/mach-bf561/coreb.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/blackfin/mach-bf561/coreb.c 2009-07-23 18:40:27.483411300 -0400 +diff -urNp linux-2.6.30.4/arch/blackfin/mach-bf561/coreb.c linux-2.6.30.4/arch/blackfin/mach-bf561/coreb.c +--- linux-2.6.30.4/arch/blackfin/mach-bf561/coreb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/blackfin/mach-bf561/coreb.c 2009-07-30 09:48:09.883618875 -0400 @@ -292,7 +292,7 @@ static int coreb_ioctl(struct inode *ino return retval; } @@ -492,9 +503,9 @@ diff -urNp linux-2.6.29.6/arch/blackfin/mach-bf561/coreb.c linux-2.6.29.6/arch/b .owner = THIS_MODULE, .llseek = coreb_lseek, .read = coreb_read, -diff -urNp linux-2.6.29.6/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.29.6/arch/cris/arch-v10/drivers/sync_serial.c ---- linux-2.6.29.6/arch/cris/arch-v10/drivers/sync_serial.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/cris/arch-v10/drivers/sync_serial.c 2009-07-23 18:40:27.483411300 -0400 +diff -urNp linux-2.6.30.4/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.30.4/arch/cris/arch-v10/drivers/sync_serial.c +--- linux-2.6.30.4/arch/cris/arch-v10/drivers/sync_serial.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/cris/arch-v10/drivers/sync_serial.c 2009-07-30 09:48:09.883618875 -0400 @@ -244,7 +244,7 @@ static unsigned sync_serial_prescale_sha #define NUMBER_OF_PORTS 2 @@ -504,9 +515,9 @@ diff -urNp linux-2.6.29.6/arch/cris/arch-v10/drivers/sync_serial.c linux-2.6.29. .owner = THIS_MODULE, .write = sync_serial_write, .read = sync_serial_read, -diff -urNp linux-2.6.29.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.29.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c ---- linux-2.6.29.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-07-23 18:40:27.484276735 -0400 +diff -urNp linux-2.6.30.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.30.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c +--- linux-2.6.30.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/cris/arch-v32/drivers/mach-fs/gpio.c 2009-07-30 12:06:52.081911892 -0400 @@ -855,7 +855,7 @@ gpio_leds_ioctl(unsigned int cmd, unsign return 0; } @@ -516,9 +527,9 @@ diff -urNp linux-2.6.29.6/arch/cris/arch-v32/drivers/mach-fs/gpio.c linux-2.6.29 .owner = THIS_MODULE, .poll = gpio_poll, .ioctl = gpio_ioctl, -diff -urNp linux-2.6.29.6/arch/cris/include/asm/atomic.h linux-2.6.29.6/arch/cris/include/asm/atomic.h ---- linux-2.6.29.6/arch/cris/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/cris/include/asm/atomic.h 2009-07-23 17:34:32.036919850 -0400 +diff -urNp linux-2.6.30.4/arch/cris/include/asm/atomic.h linux-2.6.30.4/arch/cris/include/asm/atomic.h +--- linux-2.6.30.4/arch/cris/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/cris/include/asm/atomic.h 2009-07-30 09:48:09.884412595 -0400 @@ -152,6 +152,10 @@ static inline int atomic_add_unless(atom } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) @@ -530,9 +541,9 @@ diff -urNp linux-2.6.29.6/arch/cris/include/asm/atomic.h linux-2.6.29.6/arch/cri /* Atomic operations are already serializing */ #define smp_mb__before_atomic_dec() barrier() #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.29.6/arch/cris/include/asm/kmap_types.h linux-2.6.29.6/arch/cris/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/cris/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/cris/include/asm/kmap_types.h 2009-07-23 17:34:32.036919850 -0400 +diff -urNp linux-2.6.30.4/arch/cris/include/asm/kmap_types.h linux-2.6.30.4/arch/cris/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/cris/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/cris/include/asm/kmap_types.h 2009-07-30 09:48:09.884412595 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -541,9 +552,34 @@ diff -urNp linux-2.6.29.6/arch/cris/include/asm/kmap_types.h linux-2.6.29.6/arch KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/h8300/include/asm/atomic.h linux-2.6.29.6/arch/h8300/include/asm/atomic.h ---- linux-2.6.29.6/arch/h8300/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/h8300/include/asm/atomic.h 2009-07-23 17:34:32.036919850 -0400 +diff -urNp linux-2.6.30.4/arch/frv/include/asm/atomic.h linux-2.6.30.4/arch/frv/include/asm/atomic.h +--- linux-2.6.30.4/arch/frv/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/frv/include/asm/atomic.h 2009-07-30 09:48:09.885412202 -0400 +@@ -114,6 +114,10 @@ static inline void atomic_dec(atomic_t * + atomic_sub_return(1, v); + } + ++#define atomic_inc_unchecked(v) atomic_inc(v) ++#define atomic_add_unchecked(i,v) atomic_add((i),(v)) ++#define atomic_sub_unchecked(i,v) atomic_sub((i),(v)) ++ + #define atomic_dec_return(v) atomic_sub_return(1, (v)) + #define atomic_inc_return(v) atomic_add_return(1, (v)) + +diff -urNp linux-2.6.30.4/arch/frv/include/asm/kmap_types.h linux-2.6.30.4/arch/frv/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/frv/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/frv/include/asm/kmap_types.h 2009-07-30 09:48:09.885412202 -0400 +@@ -23,6 +23,7 @@ enum km_type { + KM_IRQ1, + KM_SOFTIRQ0, + KM_SOFTIRQ1, ++ KM_CLEARPAGE, + KM_TYPE_NR + }; + +diff -urNp linux-2.6.30.4/arch/h8300/include/asm/atomic.h linux-2.6.30.4/arch/h8300/include/asm/atomic.h +--- linux-2.6.30.4/arch/h8300/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/h8300/include/asm/atomic.h 2009-07-30 09:48:09.885412202 -0400 @@ -26,6 +26,7 @@ static __inline__ int atomic_add_return( } @@ -568,9 +604,9 @@ diff -urNp linux-2.6.29.6/arch/h8300/include/asm/atomic.h linux-2.6.29.6/arch/h8 /* * atomic_inc_and_test - increment and test -diff -urNp linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h 2009-07-23 17:34:32.036919850 -0400 +diff -urNp linux-2.6.30.4/arch/h8300/include/asm/kmap_types.h linux-2.6.30.4/arch/h8300/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/h8300/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/h8300/include/asm/kmap_types.h 2009-07-30 09:48:09.885412202 -0400 @@ -15,6 +15,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -579,9 +615,9 @@ diff -urNp linux-2.6.29.6/arch/h8300/include/asm/kmap_types.h linux-2.6.29.6/arc KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c ---- linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c 2009-07-23 18:40:27.465457938 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/ia32/binfmt_elf32.c linux-2.6.30.4/arch/ia64/ia32/binfmt_elf32.c +--- linux-2.6.30.4/arch/ia64/ia32/binfmt_elf32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/ia32/binfmt_elf32.c 2009-07-30 09:48:09.886522893 -0400 @@ -45,6 +45,13 @@ randomize_stack_top(unsigned long stack_ #define elf_read_implies_exec(ex, have_pt_gnu_stack) (!(have_pt_gnu_stack)) @@ -610,9 +646,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/ia32/binfmt_elf32.c linux-2.6.29.6/arch/ia64 .fault = ia32_install_gate_page }; -diff -urNp linux-2.6.29.6/arch/ia64/ia32/ia32priv.h linux-2.6.29.6/arch/ia64/ia32/ia32priv.h ---- linux-2.6.29.6/arch/ia64/ia32/ia32priv.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/ia32/ia32priv.h 2009-07-23 17:34:32.037851190 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/ia32/ia32priv.h linux-2.6.30.4/arch/ia64/ia32/ia32priv.h +--- linux-2.6.30.4/arch/ia64/ia32/ia32priv.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/ia32/ia32priv.h 2009-07-30 09:48:09.886522893 -0400 @@ -296,7 +296,14 @@ typedef struct compat_siginfo { #define ELF_DATA ELFDATA2LSB #define ELF_ARCH EM_386 @@ -629,9 +665,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/ia32/ia32priv.h linux-2.6.29.6/arch/ia64/ia3 #define IA32_GATE_OFFSET IA32_PAGE_OFFSET #define IA32_GATE_END IA32_PAGE_OFFSET + PAGE_SIZE -diff -urNp linux-2.6.29.6/arch/ia64/include/asm/atomic.h linux-2.6.29.6/arch/ia64/include/asm/atomic.h ---- linux-2.6.29.6/arch/ia64/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/include/asm/atomic.h 2009-07-23 17:34:32.037851190 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/include/asm/atomic.h linux-2.6.30.4/arch/ia64/include/asm/atomic.h +--- linux-2.6.30.4/arch/ia64/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/include/asm/atomic.h 2009-07-30 09:48:09.886522893 -0400 @@ -201,8 +201,11 @@ atomic64_add_negative (__s64 i, atomic64 #define atomic64_inc_and_test(v) (atomic64_add_return(1, (v)) == 0) @@ -644,9 +680,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/include/asm/atomic.h linux-2.6.29.6/arch/ia6 #define atomic_dec(v) atomic_sub(1, (v)) #define atomic64_add(i,v) atomic64_add_return((i), (v)) -diff -urNp linux-2.6.29.6/arch/ia64/include/asm/elf.h linux-2.6.29.6/arch/ia64/include/asm/elf.h ---- linux-2.6.29.6/arch/ia64/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/include/asm/elf.h 2009-07-23 17:34:32.037851190 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/include/asm/elf.h linux-2.6.30.4/arch/ia64/include/asm/elf.h +--- linux-2.6.30.4/arch/ia64/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/include/asm/elf.h 2009-07-30 09:48:09.887468908 -0400 @@ -43,6 +43,13 @@ */ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL) @@ -661,9 +697,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/include/asm/elf.h linux-2.6.29.6/arch/ia64/i #define PT_IA_64_UNWIND 0x70000001 /* IA-64 relocations: */ -diff -urNp linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h 2009-07-23 17:34:32.037851190 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/include/asm/kmap_types.h linux-2.6.30.4/arch/ia64/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/ia64/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/include/asm/kmap_types.h 2009-07-30 09:48:09.887468908 -0400 @@ -22,7 +22,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -674,9 +710,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/include/asm/kmap_types.h linux-2.6.29.6/arch }; #undef D -diff -urNp linux-2.6.29.6/arch/ia64/include/asm/pgtable.h linux-2.6.29.6/arch/ia64/include/asm/pgtable.h ---- linux-2.6.29.6/arch/ia64/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/include/asm/pgtable.h 2009-07-23 17:34:32.037851190 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/include/asm/pgtable.h linux-2.6.30.4/arch/ia64/include/asm/pgtable.h +--- linux-2.6.30.4/arch/ia64/include/asm/pgtable.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/include/asm/pgtable.h 2009-07-30 09:48:09.887468908 -0400 @@ -143,6 +143,17 @@ #define PAGE_READONLY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) #define PAGE_COPY __pgprot(__ACCESS_BITS | _PAGE_PL_3 | _PAGE_AR_R) @@ -695,9 +731,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/include/asm/pgtable.h linux-2.6.29.6/arch/ia #define PAGE_GATE __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_X_RX) #define PAGE_KERNEL __pgprot(__DIRTY_BITS | _PAGE_PL_0 | _PAGE_AR_RWX) #define PAGE_KERNELRX __pgprot(__ACCESS_BITS | _PAGE_PL_0 | _PAGE_AR_RX) -diff -urNp linux-2.6.29.6/arch/ia64/include/asm/uaccess.h linux-2.6.29.6/arch/ia64/include/asm/uaccess.h ---- linux-2.6.29.6/arch/ia64/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/include/asm/uaccess.h 2009-07-23 17:34:32.038733548 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/include/asm/uaccess.h linux-2.6.30.4/arch/ia64/include/asm/uaccess.h +--- linux-2.6.30.4/arch/ia64/include/asm/uaccess.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/include/asm/uaccess.h 2009-07-30 11:10:48.660249525 -0400 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _ const void *__cu_from = (from); \ long __cu_len = (n); \ @@ -716,9 +752,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/include/asm/uaccess.h linux-2.6.29.6/arch/ia __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len); \ __cu_len; \ }) -diff -urNp linux-2.6.29.6/arch/ia64/kernel/module.c linux-2.6.29.6/arch/ia64/kernel/module.c ---- linux-2.6.29.6/arch/ia64/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/kernel/module.c 2009-07-23 17:34:32.038733548 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/kernel/module.c linux-2.6.30.4/arch/ia64/kernel/module.c +--- linux-2.6.30.4/arch/ia64/kernel/module.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/kernel/module.c 2009-07-30 09:48:09.888412729 -0400 @@ -312,8 +312,7 @@ module_alloc (unsigned long size) void module_free (struct module *mod, void *module_region) @@ -729,7 +765,7 @@ diff -urNp linux-2.6.29.6/arch/ia64/kernel/module.c linux-2.6.29.6/arch/ia64/ker unw_remove_unwind_table(mod->arch.init_unw_table); mod->arch.init_unw_table = NULL; } -@@ -491,15 +490,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd +@@ -499,15 +498,39 @@ module_frob_arch_sections (Elf_Ehdr *ehd } static inline int @@ -771,7 +807,7 @@ diff -urNp linux-2.6.29.6/arch/ia64/kernel/module.c linux-2.6.29.6/arch/ia64/ker } static inline int -@@ -683,7 +706,14 @@ do_reloc (struct module *mod, uint8_t r_ +@@ -690,7 +713,14 @@ do_reloc (struct module *mod, uint8_t r_ break; case RV_BDREL: @@ -787,7 +823,7 @@ diff -urNp linux-2.6.29.6/arch/ia64/kernel/module.c linux-2.6.29.6/arch/ia64/ker break; case RV_LTV: -@@ -817,15 +847,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, +@@ -824,15 +854,15 @@ apply_relocate_add (Elf64_Shdr *sechdrs, * addresses have been selected... */ uint64_t gp; @@ -807,21 +843,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/kernel/module.c linux-2.6.29.6/arch/ia64/ker mod->arch.gp = gp; DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp); } -diff -urNp linux-2.6.29.6/arch/ia64/kernel/perfmon.c linux-2.6.29.6/arch/ia64/kernel/perfmon.c ---- linux-2.6.29.6/arch/ia64/kernel/perfmon.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/kernel/perfmon.c 2009-07-23 18:40:27.485493611 -0400 -@@ -2196,7 +2196,7 @@ pfmfs_delete_dentry(struct dentry *dentr - return 1; - } - --static struct dentry_operations pfmfs_dentry_operations = { -+static const struct dentry_operations pfmfs_dentry_operations = { - .d_delete = pfmfs_delete_dentry, - }; - -diff -urNp linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c ---- linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c 2009-07-23 17:34:32.038733548 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/kernel/sys_ia64.c linux-2.6.30.4/arch/ia64/kernel/sys_ia64.c +--- linux-2.6.30.4/arch/ia64/kernel/sys_ia64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/kernel/sys_ia64.c 2009-07-30 09:48:09.888412729 -0400 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil if (REGION_NUMBER(addr) == RGN_HPAGE) addr = 0; @@ -848,9 +872,9 @@ diff -urNp linux-2.6.29.6/arch/ia64/kernel/sys_ia64.c linux-2.6.29.6/arch/ia64/k goto full_search; } return -ENOMEM; -diff -urNp linux-2.6.29.6/arch/ia64/mm/fault.c linux-2.6.29.6/arch/ia64/mm/fault.c ---- linux-2.6.29.6/arch/ia64/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/mm/fault.c 2009-07-23 17:34:32.038733548 -0400 +diff -urNp linux-2.6.30.4/arch/ia64/mm/fault.c linux-2.6.30.4/arch/ia64/mm/fault.c +--- linux-2.6.30.4/arch/ia64/mm/fault.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/mm/fault.c 2009-07-30 09:48:09.889484146 -0400 @@ -72,6 +72,23 @@ mapped_kernel_page_is_present (unsigned return pte_present(pte); } @@ -900,10 +924,10 @@ diff -urNp linux-2.6.29.6/arch/ia64/mm/fault.c linux-2.6.29.6/arch/ia64/mm/fault survive: /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.29.6/arch/ia64/mm/init.c linux-2.6.29.6/arch/ia64/mm/init.c ---- linux-2.6.29.6/arch/ia64/mm/init.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/ia64/mm/init.c 2009-07-23 17:34:32.038733548 -0400 -@@ -121,6 +121,19 @@ ia64_init_addr_space (void) +diff -urNp linux-2.6.30.4/arch/ia64/mm/init.c linux-2.6.30.4/arch/ia64/mm/init.c +--- linux-2.6.30.4/arch/ia64/mm/init.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/ia64/mm/init.c 2009-07-30 09:48:09.889484146 -0400 +@@ -122,6 +122,19 @@ ia64_init_addr_space (void) vma->vm_start = current->thread.rbs_bot & PAGE_MASK; vma->vm_end = vma->vm_start + PAGE_SIZE; vma->vm_flags = VM_DATA_DEFAULT_FLAGS|VM_GROWSUP|VM_ACCOUNT; @@ -923,21 +947,59 @@ diff -urNp linux-2.6.29.6/arch/ia64/mm/init.c linux-2.6.29.6/arch/ia64/mm/init.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); down_write(¤t->mm->mmap_sem); if (insert_vm_struct(current->mm, vma)) { -diff -urNp linux-2.6.29.6/arch/m32r/lib/usercopy.c linux-2.6.29.6/arch/m32r/lib/usercopy.c ---- linux-2.6.29.6/arch/m32r/lib/usercopy.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/m32r/lib/usercopy.c 2009-07-23 17:34:32.039725062 -0400 -@@ -26,7 +26,7 @@ __generic_copy_from_user(void *to, const +diff -urNp linux-2.6.30.4/arch/m32r/include/asm/atomic.h linux-2.6.30.4/arch/m32r/include/asm/atomic.h +--- linux-2.6.30.4/arch/m32r/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/m32r/include/asm/atomic.h 2009-07-30 09:48:09.889484146 -0400 +@@ -308,6 +308,10 @@ static __inline__ void atomic_set_mask(u + local_irq_restore(flags); + } + ++#define atomic_inc_unchecked(v) atomic_inc(v) ++#define atomic_add_unchecked(i,v) atomic_add((i),(v)) ++#define atomic_sub_unchecked(i,v) atomic_sub((i),(v)) ++ + /* Atomic operations are already serializing on m32r */ + #define smp_mb__before_atomic_dec() barrier() + #define smp_mb__after_atomic_dec() barrier() +diff -urNp linux-2.6.30.4/arch/m32r/include/asm/kmap_types.h linux-2.6.30.4/arch/m32r/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/m32r/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/m32r/include/asm/kmap_types.h 2009-07-30 09:48:09.890443797 -0400 +@@ -21,7 +21,8 @@ D(9) KM_IRQ0, + D(10) KM_IRQ1, + D(11) KM_SOFTIRQ0, + D(12) KM_SOFTIRQ1, +-D(13) KM_TYPE_NR ++D(13) KM_CLEARPAGE, ++D(14) KM_TYPE_NR + }; + + #undef D +diff -urNp linux-2.6.30.4/arch/m32r/lib/usercopy.c linux-2.6.30.4/arch/m32r/lib/usercopy.c +--- linux-2.6.30.4/arch/m32r/lib/usercopy.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/m32r/lib/usercopy.c 2009-07-30 09:48:09.890443797 -0400 +@@ -14,6 +14,9 @@ + unsigned long + __generic_copy_to_user(void __user *to, const void *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + prefetch(from); + if (access_ok(VERIFY_WRITE, to, n)) + __copy_user(to,from,n); +@@ -23,6 +26,9 @@ __generic_copy_to_user(void __user *to, + unsigned long + __generic_copy_from_user(void *to, const void __user *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ prefetchw(to); if (access_ok(VERIFY_READ, from, n)) __copy_user_zeroing(to,from,n); -- else -+ else if ((long)n > 0) - memset(to, 0, n); - return n; - } -diff -urNp linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h ---- linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h 2009-07-23 17:34:32.039725062 -0400 +diff -urNp linux-2.6.30.4/arch/m68k/include/asm/atomic_mm.h linux-2.6.30.4/arch/m68k/include/asm/atomic_mm.h +--- linux-2.6.30.4/arch/m68k/include/asm/atomic_mm.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/m68k/include/asm/atomic_mm.h 2009-07-30 09:48:09.890443797 -0400 @@ -186,6 +186,10 @@ static __inline__ int atomic_add_unless( #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) @@ -949,9 +1011,9 @@ diff -urNp linux-2.6.29.6/arch/m68k/include/asm/atomic_mm.h linux-2.6.29.6/arch/ /* Atomic operations are already serializing */ #define smp_mb__before_atomic_dec() barrier() #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h ---- linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h 2009-07-23 17:34:32.039725062 -0400 +diff -urNp linux-2.6.30.4/arch/m68k/include/asm/atomic_no.h linux-2.6.30.4/arch/m68k/include/asm/atomic_no.h +--- linux-2.6.30.4/arch/m68k/include/asm/atomic_no.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/m68k/include/asm/atomic_no.h 2009-07-30 09:48:09.890443797 -0400 @@ -151,5 +151,9 @@ static __inline__ int atomic_add_unless( #define atomic_dec_return(v) atomic_sub_return(1,(v)) #define atomic_inc_return(v) atomic_add_return(1,(v)) @@ -962,20 +1024,9 @@ diff -urNp linux-2.6.29.6/arch/m68k/include/asm/atomic_no.h linux-2.6.29.6/arch/ + #include <asm-generic/atomic.h> #endif /* __ARCH_M68KNOMMU_ATOMIC __ */ -diff -urNp linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h ---- linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/m68k/include/asm/kmap_types_mm.h 2009-07-23 17:34:32.039725062 -0400 -@@ -15,6 +15,7 @@ enum km_type { - KM_IRQ1, - KM_SOFTIRQ0, - KM_SOFTIRQ1, -+ KM_CLEARPAGE, - KM_TYPE_NR - }; - -diff -urNp linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h ---- linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h 2009-07-23 17:34:32.039725062 -0400 +diff -urNp linux-2.6.30.4/arch/m68k/include/asm/kmap_types.h linux-2.6.30.4/arch/m68k/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/m68k/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/m68k/include/asm/kmap_types.h 2009-07-30 09:48:09.891413194 -0400 @@ -15,6 +15,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -984,9 +1035,9 @@ diff -urNp linux-2.6.29.6/arch/m68k/include/asm/kmap_types_no.h linux-2.6.29.6/a KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/mips/include/asm/atomic.h linux-2.6.29.6/arch/mips/include/asm/atomic.h ---- linux-2.6.29.6/arch/mips/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/include/asm/atomic.h 2009-07-23 17:34:32.039725062 -0400 +diff -urNp linux-2.6.30.4/arch/mips/include/asm/atomic.h linux-2.6.30.4/arch/mips/include/asm/atomic.h +--- linux-2.6.30.4/arch/mips/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/include/asm/atomic.h 2009-07-30 09:48:09.891413194 -0400 @@ -381,6 +381,9 @@ static __inline__ int atomic_add_unless( * Atomically increments @v by 1. */ @@ -997,9 +1048,9 @@ diff -urNp linux-2.6.29.6/arch/mips/include/asm/atomic.h linux-2.6.29.6/arch/mip /* * atomic_dec - decrement and test -diff -urNp linux-2.6.29.6/arch/mips/include/asm/elf.h linux-2.6.29.6/arch/mips/include/asm/elf.h ---- linux-2.6.29.6/arch/mips/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/include/asm/elf.h 2009-07-23 17:34:32.039725062 -0400 +diff -urNp linux-2.6.30.4/arch/mips/include/asm/elf.h linux-2.6.30.4/arch/mips/include/asm/elf.h +--- linux-2.6.30.4/arch/mips/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/include/asm/elf.h 2009-07-30 09:48:09.891413194 -0400 @@ -364,4 +364,11 @@ extern int dump_task_fpu(struct task_str #define ELF_ET_DYN_BASE (TASK_SIZE / 3 * 2) #endif @@ -1012,9 +1063,9 @@ diff -urNp linux-2.6.29.6/arch/mips/include/asm/elf.h linux-2.6.29.6/arch/mips/i +#endif + #endif /* _ASM_ELF_H */ -diff -urNp linux-2.6.29.6/arch/mips/include/asm/kmap_types.h linux-2.6.29.6/arch/mips/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/mips/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/include/asm/kmap_types.h 2009-07-23 17:34:32.040769533 -0400 +diff -urNp linux-2.6.30.4/arch/mips/include/asm/kmap_types.h linux-2.6.30.4/arch/mips/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/mips/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/include/asm/kmap_types.h 2009-07-30 09:48:09.892412592 -0400 @@ -22,7 +22,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -1025,10 +1076,10 @@ diff -urNp linux-2.6.29.6/arch/mips/include/asm/kmap_types.h linux-2.6.29.6/arch }; #undef D -diff -urNp linux-2.6.29.6/arch/mips/include/asm/page.h linux-2.6.29.6/arch/mips/include/asm/page.h ---- linux-2.6.29.6/arch/mips/include/asm/page.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/include/asm/page.h 2009-07-23 17:34:32.040769533 -0400 -@@ -82,7 +82,7 @@ extern void copy_user_highpage(struct pa +diff -urNp linux-2.6.30.4/arch/mips/include/asm/page.h linux-2.6.30.4/arch/mips/include/asm/page.h +--- linux-2.6.30.4/arch/mips/include/asm/page.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/include/asm/page.h 2009-07-30 09:48:09.892412592 -0400 +@@ -85,7 +85,7 @@ extern void copy_user_highpage(struct pa #ifdef CONFIG_CPU_MIPS32 typedef struct { unsigned long pte_low, pte_high; } pte_t; #define pte_val(x) ((x).pte_low | ((unsigned long long)(x).pte_high << 32)) @@ -1037,9 +1088,9 @@ diff -urNp linux-2.6.29.6/arch/mips/include/asm/page.h linux-2.6.29.6/arch/mips/ #else typedef struct { unsigned long long pte; } pte_t; #define pte_val(x) ((x).pte) -diff -urNp linux-2.6.29.6/arch/mips/include/asm/system.h linux-2.6.29.6/arch/mips/include/asm/system.h ---- linux-2.6.29.6/arch/mips/include/asm/system.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/include/asm/system.h 2009-07-23 17:34:32.040769533 -0400 +diff -urNp linux-2.6.30.4/arch/mips/include/asm/system.h linux-2.6.30.4/arch/mips/include/asm/system.h +--- linux-2.6.30.4/arch/mips/include/asm/system.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/include/asm/system.h 2009-07-30 09:48:09.892412592 -0400 @@ -217,6 +217,6 @@ extern void per_cpu_trap_init(void); */ #define __ARCH_WANT_UNLOCKED_CTXSW @@ -1048,9 +1099,9 @@ diff -urNp linux-2.6.29.6/arch/mips/include/asm/system.h linux-2.6.29.6/arch/mip +#define arch_align_stack(x) ((x) & ALMASK) #endif /* _ASM_SYSTEM_H */ -diff -urNp linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c ---- linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c 2009-07-23 17:34:32.040769533 -0400 +diff -urNp linux-2.6.30.4/arch/mips/kernel/binfmt_elfn32.c linux-2.6.30.4/arch/mips/kernel/binfmt_elfn32.c +--- linux-2.6.30.4/arch/mips/kernel/binfmt_elfn32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/kernel/binfmt_elfn32.c 2009-07-30 09:48:09.892412592 -0400 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1065,9 +1116,9 @@ diff -urNp linux-2.6.29.6/arch/mips/kernel/binfmt_elfn32.c linux-2.6.29.6/arch/m #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c ---- linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c 2009-07-23 17:34:32.040769533 -0400 +diff -urNp linux-2.6.30.4/arch/mips/kernel/binfmt_elfo32.c linux-2.6.30.4/arch/mips/kernel/binfmt_elfo32.c +--- linux-2.6.30.4/arch/mips/kernel/binfmt_elfo32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/kernel/binfmt_elfo32.c 2009-07-30 09:48:09.893444022 -0400 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N #undef ELF_ET_DYN_BASE #define ELF_ET_DYN_BASE (TASK32_SIZE / 3 * 2) @@ -1082,9 +1133,9 @@ diff -urNp linux-2.6.29.6/arch/mips/kernel/binfmt_elfo32.c linux-2.6.29.6/arch/m #include <asm/processor.h> #include <linux/module.h> #include <linux/elfcore.h> -diff -urNp linux-2.6.29.6/arch/mips/kernel/process.c linux-2.6.29.6/arch/mips/kernel/process.c ---- linux-2.6.29.6/arch/mips/kernel/process.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/kernel/process.c 2009-07-23 17:34:32.040769533 -0400 +diff -urNp linux-2.6.30.4/arch/mips/kernel/process.c linux-2.6.30.4/arch/mips/kernel/process.c +--- linux-2.6.30.4/arch/mips/kernel/process.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/kernel/process.c 2009-07-30 09:48:09.893444022 -0400 @@ -457,15 +457,3 @@ unsigned long get_wchan(struct task_stru out: return pc; @@ -1101,9 +1152,9 @@ diff -urNp linux-2.6.29.6/arch/mips/kernel/process.c linux-2.6.29.6/arch/mips/ke - - return sp & ALMASK; -} -diff -urNp linux-2.6.29.6/arch/mips/kernel/syscall.c linux-2.6.29.6/arch/mips/kernel/syscall.c ---- linux-2.6.29.6/arch/mips/kernel/syscall.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/kernel/syscall.c 2009-07-23 17:34:32.040769533 -0400 +diff -urNp linux-2.6.30.4/arch/mips/kernel/syscall.c linux-2.6.30.4/arch/mips/kernel/syscall.c +--- linux-2.6.30.4/arch/mips/kernel/syscall.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/kernel/syscall.c 2009-07-30 09:48:09.893444022 -0400 @@ -99,6 +99,11 @@ unsigned long arch_get_unmapped_area(str do_color_align = 0; if (filp || (flags & MAP_SHARED)) @@ -1125,9 +1176,9 @@ diff -urNp linux-2.6.29.6/arch/mips/kernel/syscall.c linux-2.6.29.6/arch/mips/ke if (do_color_align) addr = COLOUR_ALIGN(addr, pgoff); else -diff -urNp linux-2.6.29.6/arch/mips/mm/fault.c linux-2.6.29.6/arch/mips/mm/fault.c ---- linux-2.6.29.6/arch/mips/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mips/mm/fault.c 2009-07-23 17:34:32.041802959 -0400 +diff -urNp linux-2.6.30.4/arch/mips/mm/fault.c linux-2.6.30.4/arch/mips/mm/fault.c +--- linux-2.6.30.4/arch/mips/mm/fault.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mips/mm/fault.c 2009-07-30 09:48:09.896533953 -0400 @@ -26,6 +26,23 @@ #include <asm/ptrace.h> #include <asm/highmem.h> /* For VMALLOC_END */ @@ -1152,10 +1203,35 @@ diff -urNp linux-2.6.29.6/arch/mips/mm/fault.c linux-2.6.29.6/arch/mips/mm/fault /* * This routine handles page faults. It determines the address, * and the problem, and then passes it off to one of the appropriate -diff -urNp linux-2.6.29.6/arch/mn10300/kernel/setup.c linux-2.6.29.6/arch/mn10300/kernel/setup.c ---- linux-2.6.29.6/arch/mn10300/kernel/setup.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/mn10300/kernel/setup.c 2009-07-23 18:40:27.492312305 -0400 -@@ -289,7 +289,7 @@ static void c_stop(struct seq_file *m, v +diff -urNp linux-2.6.30.4/arch/mn10300/include/asm/atomic.h linux-2.6.30.4/arch/mn10300/include/asm/atomic.h +--- linux-2.6.30.4/arch/mn10300/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mn10300/include/asm/atomic.h 2009-07-30 09:48:09.897612189 -0400 +@@ -145,6 +145,10 @@ static inline void atomic_clear_mask(uns + #define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v))) + #define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new))) + ++#define atomic_inc_unchecked(v) atomic_inc(v) ++#define atomic_add_unchecked(i,v) atomic_add((i),(v)) ++#define atomic_sub_unchecked(i,v) atomic_sub((i),(v)) ++ + /* Atomic operations are already serializing on MN10300??? */ + #define smp_mb__before_atomic_dec() barrier() + #define smp_mb__after_atomic_dec() barrier() +diff -urNp linux-2.6.30.4/arch/mn10300/include/asm/kmap_types.h linux-2.6.30.4/arch/mn10300/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/mn10300/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mn10300/include/asm/kmap_types.h 2009-07-30 09:48:09.897612189 -0400 +@@ -25,6 +25,7 @@ enum km_type { + KM_IRQ1, + KM_SOFTIRQ0, + KM_SOFTIRQ1, ++ KM_CLEARPAGE, + KM_TYPE_NR + }; + +diff -urNp linux-2.6.30.4/arch/mn10300/kernel/setup.c linux-2.6.30.4/arch/mn10300/kernel/setup.c +--- linux-2.6.30.4/arch/mn10300/kernel/setup.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/mn10300/kernel/setup.c 2009-07-30 09:48:09.897612189 -0400 +@@ -285,7 +285,7 @@ static void c_stop(struct seq_file *m, v { } @@ -1164,25 +1240,25 @@ diff -urNp linux-2.6.29.6/arch/mn10300/kernel/setup.c linux-2.6.29.6/arch/mn1030 .start = c_start, .next = c_next, .stop = c_stop, -diff -urNp linux-2.6.29.6/arch/parisc/include/asm/atomic.h linux-2.6.29.6/arch/parisc/include/asm/atomic.h ---- linux-2.6.29.6/arch/parisc/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/include/asm/atomic.h 2009-07-23 17:34:32.041802959 -0400 +diff -urNp linux-2.6.30.4/arch/parisc/include/asm/atomic.h linux-2.6.30.4/arch/parisc/include/asm/atomic.h +--- linux-2.6.30.4/arch/parisc/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/include/asm/atomic.h 2009-07-30 09:48:09.898625493 -0400 @@ -223,8 +223,11 @@ static __inline__ int atomic_add_unless( #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) - #define atomic_add(i,v) ((void)(__atomic_add_return( ((int)i),(v)))) + #define atomic_add(i,v) ((void)(__atomic_add_return( ((int)(i)),(v)))) +#define atomic_add_unchecked(i,v) atomic_add((i), (v)) - #define atomic_sub(i,v) ((void)(__atomic_add_return(-((int)i),(v)))) + #define atomic_sub(i,v) ((void)(__atomic_add_return(-((int)(i)),(v)))) +#define atomic_sub_unchecked(i,v) atomic_sub((i), (v)) #define atomic_inc(v) ((void)(__atomic_add_return( 1,(v)))) +#define atomic_inc_unchecked(v) atomic_inc(v) #define atomic_dec(v) ((void)(__atomic_add_return( -1,(v)))) - #define atomic_add_return(i,v) (__atomic_add_return( ((int)i),(v))) -diff -urNp linux-2.6.29.6/arch/parisc/include/asm/elf.h linux-2.6.29.6/arch/parisc/include/asm/elf.h ---- linux-2.6.29.6/arch/parisc/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/include/asm/elf.h 2009-07-23 17:34:32.041802959 -0400 -@@ -333,6 +333,13 @@ struct pt_regs; /* forward declaration.. + #define atomic_add_return(i,v) (__atomic_add_return( ((int)(i)),(v))) +diff -urNp linux-2.6.30.4/arch/parisc/include/asm/elf.h linux-2.6.30.4/arch/parisc/include/asm/elf.h +--- linux-2.6.30.4/arch/parisc/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/include/asm/elf.h 2009-07-30 09:48:09.898625493 -0400 +@@ -343,6 +343,13 @@ struct pt_regs; /* forward declaration.. #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x01000000) @@ -1196,9 +1272,9 @@ diff -urNp linux-2.6.29.6/arch/parisc/include/asm/elf.h linux-2.6.29.6/arch/pari /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, but it's not easy, and we've already done it here. */ -diff -urNp linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h 2009-07-23 17:34:32.041802959 -0400 +diff -urNp linux-2.6.30.4/arch/parisc/include/asm/kmap_types.h linux-2.6.30.4/arch/parisc/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/parisc/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/include/asm/kmap_types.h 2009-07-30 09:48:09.898625493 -0400 @@ -22,7 +22,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -1209,10 +1285,10 @@ diff -urNp linux-2.6.29.6/arch/parisc/include/asm/kmap_types.h linux-2.6.29.6/ar }; #undef D -diff -urNp linux-2.6.29.6/arch/parisc/include/asm/pgtable.h linux-2.6.29.6/arch/parisc/include/asm/pgtable.h ---- linux-2.6.29.6/arch/parisc/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/include/asm/pgtable.h 2009-07-23 17:34:32.041802959 -0400 -@@ -202,6 +202,17 @@ +diff -urNp linux-2.6.30.4/arch/parisc/include/asm/pgtable.h linux-2.6.30.4/arch/parisc/include/asm/pgtable.h +--- linux-2.6.30.4/arch/parisc/include/asm/pgtable.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/include/asm/pgtable.h 2009-07-30 09:48:09.898625493 -0400 +@@ -207,6 +207,17 @@ #define PAGE_EXECREAD __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED) #define PAGE_COPY PAGE_EXECREAD #define PAGE_RWX __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_WRITE | _PAGE_EXEC |_PAGE_ACCESSED) @@ -1230,10 +1306,10 @@ diff -urNp linux-2.6.29.6/arch/parisc/include/asm/pgtable.h linux-2.6.29.6/arch/ #define PAGE_KERNEL __pgprot(_PAGE_KERNEL) #define PAGE_KERNEL_RO __pgprot(_PAGE_KERNEL & ~_PAGE_WRITE) #define PAGE_KERNEL_UNC __pgprot(_PAGE_KERNEL | _PAGE_NO_CACHE) -diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc/kernel/module.c ---- linux-2.6.29.6/arch/parisc/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/kernel/module.c 2009-07-23 17:34:32.041802959 -0400 -@@ -93,16 +93,38 @@ +diff -urNp linux-2.6.30.4/arch/parisc/kernel/module.c linux-2.6.30.4/arch/parisc/kernel/module.c +--- linux-2.6.30.4/arch/parisc/kernel/module.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/kernel/module.c 2009-07-30 09:48:09.899565255 -0400 +@@ -91,16 +91,38 @@ /* three functions to determine where in the module core * or init pieces the location is */ @@ -1276,7 +1352,7 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc } static inline int in_local(struct module *me, void *loc) -@@ -340,13 +362,13 @@ int module_frob_arch_sections(CONST Elf_ +@@ -334,13 +356,13 @@ int module_frob_arch_sections(CONST Elf_ } /* align things a bit */ @@ -1297,7 +1373,7 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc me->arch.got_max = gots; me->arch.fdesc_max = fdescs; -@@ -364,7 +386,7 @@ static Elf64_Word get_got(struct module +@@ -358,7 +380,7 @@ static Elf64_Word get_got(struct module BUG_ON(value == 0); @@ -1306,7 +1382,7 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc for (i = 0; got[i].addr; i++) if (got[i].addr == value) goto out; -@@ -382,7 +404,7 @@ static Elf64_Word get_got(struct module +@@ -376,7 +398,7 @@ static Elf64_Word get_got(struct module #ifdef CONFIG_64BIT static Elf_Addr get_fdesc(struct module *me, unsigned long value) { @@ -1315,7 +1391,7 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc if (!value) { printk(KERN_ERR "%s: zero OPD requested!\n", me->name); -@@ -400,7 +422,7 @@ static Elf_Addr get_fdesc(struct module +@@ -394,7 +416,7 @@ static Elf_Addr get_fdesc(struct module /* Create new one */ fdesc->addr = value; @@ -1324,7 +1400,7 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc return (Elf_Addr)fdesc; } #endif /* CONFIG_64BIT */ -@@ -816,7 +838,7 @@ register_unwind_table(struct module *me, +@@ -810,7 +832,7 @@ register_unwind_table(struct module *me, table = (unsigned char *)sechdrs[me->arch.unwind_section].sh_addr; end = table + sechdrs[me->arch.unwind_section].sh_size; @@ -1333,9 +1409,9 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/module.c linux-2.6.29.6/arch/parisc DEBUGP("register_unwind_table(), sect = %d at 0x%p - 0x%p (gp=0x%lx)\n", me->arch.unwind_section, table, end, gp); -diff -urNp linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c ---- linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c 2009-07-23 17:34:32.042928337 -0400 +diff -urNp linux-2.6.30.4/arch/parisc/kernel/sys_parisc.c linux-2.6.30.4/arch/parisc/kernel/sys_parisc.c +--- linux-2.6.30.4/arch/parisc/kernel/sys_parisc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/kernel/sys_parisc.c 2009-07-30 09:48:09.899565255 -0400 @@ -98,7 +98,7 @@ unsigned long arch_get_unmapped_area(str if (flags & MAP_FIXED) return addr; @@ -1345,10 +1421,10 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/sys_parisc.c linux-2.6.29.6/arch/pa if (filp) { addr = get_shared_area(filp->f_mapping, addr, len, pgoff); -diff -urNp linux-2.6.29.6/arch/parisc/kernel/traps.c linux-2.6.29.6/arch/parisc/kernel/traps.c ---- linux-2.6.29.6/arch/parisc/kernel/traps.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/kernel/traps.c 2009-07-23 17:34:32.042928337 -0400 -@@ -731,9 +731,7 @@ void handle_interruption(int code, struc +diff -urNp linux-2.6.30.4/arch/parisc/kernel/traps.c linux-2.6.30.4/arch/parisc/kernel/traps.c +--- linux-2.6.30.4/arch/parisc/kernel/traps.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/kernel/traps.c 2009-07-30 09:48:09.900676754 -0400 +@@ -734,9 +734,7 @@ void notrace handle_interruption(int cod down_read(¤t->mm->mmap_sem); vma = find_vma(current->mm,regs->iaoq[0]); @@ -1359,9 +1435,9 @@ diff -urNp linux-2.6.29.6/arch/parisc/kernel/traps.c linux-2.6.29.6/arch/parisc/ fault_address = regs->iaoq[0]; fault_space = regs->iasq[0]; -diff -urNp linux-2.6.29.6/arch/parisc/mm/fault.c linux-2.6.29.6/arch/parisc/mm/fault.c ---- linux-2.6.29.6/arch/parisc/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/parisc/mm/fault.c 2009-07-23 17:34:32.042928337 -0400 +diff -urNp linux-2.6.30.4/arch/parisc/mm/fault.c linux-2.6.30.4/arch/parisc/mm/fault.c +--- linux-2.6.30.4/arch/parisc/mm/fault.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/parisc/mm/fault.c 2009-07-30 09:48:09.900676754 -0400 @@ -16,6 +16,7 @@ #include <linux/sched.h> #include <linux/interrupt.h> @@ -1531,9 +1607,9 @@ diff -urNp linux-2.6.29.6/arch/parisc/mm/fault.c linux-2.6.29.6/arch/parisc/mm/f /* * If for any reason at all we couldn't handle the fault, make -diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/atomic.h linux-2.6.29.6/arch/powerpc/include/asm/atomic.h ---- linux-2.6.29.6/arch/powerpc/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/include/asm/atomic.h 2009-07-23 17:34:32.042928337 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/include/asm/atomic.h linux-2.6.30.4/arch/powerpc/include/asm/atomic.h +--- linux-2.6.30.4/arch/powerpc/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/include/asm/atomic.h 2009-07-30 09:48:09.900676754 -0400 @@ -244,6 +244,10 @@ static __inline__ int atomic_dec_if_posi return t; } @@ -1545,13 +1621,17 @@ diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/atomic.h linux-2.6.29.6/arch/ #define smp_mb__before_atomic_dec() smp_mb() #define smp_mb__after_atomic_dec() smp_mb() #define smp_mb__before_atomic_inc() smp_mb() -diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/elf.h linux-2.6.29.6/arch/powerpc/include/asm/elf.h ---- linux-2.6.29.6/arch/powerpc/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/include/asm/elf.h 2009-07-23 17:34:32.043871989 -0400 -@@ -180,6 +180,18 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E - - #define ELF_ET_DYN_BASE (0x20000000) +diff -urNp linux-2.6.30.4/arch/powerpc/include/asm/elf.h linux-2.6.30.4/arch/powerpc/include/asm/elf.h +--- linux-2.6.30.4/arch/powerpc/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/include/asm/elf.h 2009-07-30 09:48:09.901536944 -0400 +@@ -179,8 +179,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E + the loader. We need to make sure that it is out of the way of the program + that it will "exec", and that there is sufficient room for the brk. */ +-extern unsigned long randomize_et_dyn(unsigned long base); +-#define ELF_ET_DYN_BASE (randomize_et_dyn(0x20000000)) ++#define ELF_ET_DYN_BASE (0x20000000) ++ +#ifdef CONFIG_PAX_ASLR +#define PAX_ELF_ET_DYN_BASE (0x10000000UL) + @@ -1563,13 +1643,12 @@ diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/elf.h linux-2.6.29.6/arch/pow +#define PAX_DELTA_STACK_LEN 15 +#endif +#endif -+ + /* * Our registers are always unsigned longs, whether we're a 32 bit - * process or 64 bit, on either a 64 bit or 32 bit kernel. -diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h 2009-07-23 17:34:32.043871989 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/include/asm/kmap_types.h linux-2.6.30.4/arch/powerpc/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/powerpc/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/include/asm/kmap_types.h 2009-07-30 09:48:09.901536944 -0400 @@ -26,6 +26,7 @@ enum km_type { KM_SOFTIRQ1, KM_PPC_SYNC_PAGE, @@ -1578,9 +1657,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/kmap_types.h linux-2.6.29.6/a KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/page_64.h linux-2.6.29.6/arch/powerpc/include/asm/page_64.h ---- linux-2.6.29.6/arch/powerpc/include/asm/page_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/include/asm/page_64.h 2009-07-23 17:34:32.043871989 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/include/asm/page_64.h linux-2.6.30.4/arch/powerpc/include/asm/page_64.h +--- linux-2.6.30.4/arch/powerpc/include/asm/page_64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/include/asm/page_64.h 2009-07-30 09:48:09.902599231 -0400 @@ -170,15 +170,18 @@ do { \ * stack by default, so in the absense of a PT_GNU_STACK program header * we turn execute permission off. @@ -1602,10 +1681,10 @@ diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/page_64.h linux-2.6.29.6/arch #include <asm-generic/page.h> -diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/page.h linux-2.6.29.6/arch/powerpc/include/asm/page.h ---- linux-2.6.29.6/arch/powerpc/include/asm/page.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/include/asm/page.h 2009-07-23 17:34:32.043871989 -0400 -@@ -114,8 +114,9 @@ extern phys_addr_t kernstart_addr; +diff -urNp linux-2.6.30.4/arch/powerpc/include/asm/page.h linux-2.6.30.4/arch/powerpc/include/asm/page.h +--- linux-2.6.30.4/arch/powerpc/include/asm/page.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/include/asm/page.h 2009-07-30 09:48:09.902599231 -0400 +@@ -116,8 +116,9 @@ extern phys_addr_t kernstart_addr; * and needs to be executable. This means the whole heap ends * up being executable. */ @@ -1617,9 +1696,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/page.h linux-2.6.29.6/arch/po #define VM_DATA_DEFAULT_FLAGS64 (VM_READ | VM_WRITE | \ VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) -diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h ---- linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h 2009-07-23 17:34:32.043871989 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/include/asm/uaccess.h linux-2.6.30.4/arch/powerpc/include/asm/uaccess.h +--- linux-2.6.30.4/arch/powerpc/include/asm/uaccess.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/include/asm/uaccess.h 2009-07-30 11:10:48.774534063 -0400 @@ -334,6 +334,9 @@ static inline unsigned long copy_from_us { unsigned long over; @@ -1640,9 +1719,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/include/asm/uaccess.h linux-2.6.29.6/arch if (access_ok(VERIFY_WRITE, to, n)) return __copy_tofrom_user(to, (__force void __user *)from, n); if ((unsigned long)to < TASK_SIZE) { -diff -urNp linux-2.6.29.6/arch/powerpc/kernel/module_32.c linux-2.6.29.6/arch/powerpc/kernel/module_32.c ---- linux-2.6.29.6/arch/powerpc/kernel/module_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/kernel/module_32.c 2009-07-23 17:34:32.043871989 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/kernel/module_32.c linux-2.6.30.4/arch/powerpc/kernel/module_32.c +--- linux-2.6.30.4/arch/powerpc/kernel/module_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/kernel/module_32.c 2009-07-30 09:48:09.903567873 -0400 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr me->arch.core_plt_section = i; } @@ -1672,10 +1751,50 @@ diff -urNp linux-2.6.29.6/arch/powerpc/kernel/module_32.c linux-2.6.29.6/arch/po /* Find this entry, or if that fails, the next avail. entry */ while (entry->jump[0]) { -diff -urNp linux-2.6.29.6/arch/powerpc/kernel/setup-common.c linux-2.6.29.6/arch/powerpc/kernel/setup-common.c ---- linux-2.6.29.6/arch/powerpc/kernel/setup-common.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/kernel/setup-common.c 2009-07-23 18:40:27.492312305 -0400 -@@ -327,7 +327,7 @@ static void c_stop(struct seq_file *m, v +diff -urNp linux-2.6.30.4/arch/powerpc/kernel/process.c linux-2.6.30.4/arch/powerpc/kernel/process.c +--- linux-2.6.30.4/arch/powerpc/kernel/process.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/kernel/process.c 2009-07-30 09:48:09.903567873 -0400 +@@ -1147,36 +1147,3 @@ unsigned long arch_align_stack(unsigned + sp -= get_random_int() & ~PAGE_MASK; + return sp & ~0xf; + } +- +-static inline unsigned long brk_rnd(void) +-{ +- unsigned long rnd = 0; +- +- /* 8MB for 32bit, 1GB for 64bit */ +- if (is_32bit_task()) +- rnd = (long)(get_random_int() % (1<<(23-PAGE_SHIFT))); +- else +- rnd = (long)(get_random_int() % (1<<(30-PAGE_SHIFT))); +- +- return rnd << PAGE_SHIFT; +-} +- +-unsigned long arch_randomize_brk(struct mm_struct *mm) +-{ +- unsigned long ret = PAGE_ALIGN(mm->brk + brk_rnd()); +- +- if (ret < mm->brk) +- return mm->brk; +- +- return ret; +-} +- +-unsigned long randomize_et_dyn(unsigned long base) +-{ +- unsigned long ret = PAGE_ALIGN(base + brk_rnd()); +- +- if (ret < base) +- return base; +- +- return ret; +-} +diff -urNp linux-2.6.30.4/arch/powerpc/kernel/setup-common.c linux-2.6.30.4/arch/powerpc/kernel/setup-common.c +--- linux-2.6.30.4/arch/powerpc/kernel/setup-common.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/kernel/setup-common.c 2009-07-30 09:48:09.903567873 -0400 +@@ -328,7 +328,7 @@ static void c_stop(struct seq_file *m, v { } @@ -1684,9 +1803,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/kernel/setup-common.c linux-2.6.29.6/arch .start =c_start, .next = c_next, .stop = c_stop, -diff -urNp linux-2.6.29.6/arch/powerpc/kernel/signal_32.c linux-2.6.29.6/arch/powerpc/kernel/signal_32.c ---- linux-2.6.29.6/arch/powerpc/kernel/signal_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/kernel/signal_32.c 2009-07-23 17:34:32.044827554 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/kernel/signal_32.c linux-2.6.30.4/arch/powerpc/kernel/signal_32.c +--- linux-2.6.30.4/arch/powerpc/kernel/signal_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/kernel/signal_32.c 2009-07-30 09:48:09.903567873 -0400 @@ -857,7 +857,7 @@ int handle_rt_signal32(unsigned long sig /* Save user registers on the stack */ frame = &rt_sf->uc.uc_mcontext; @@ -1696,9 +1815,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/kernel/signal_32.c linux-2.6.29.6/arch/po if (save_user_regs(regs, frame, 0, 1)) goto badframe; regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp; -diff -urNp linux-2.6.29.6/arch/powerpc/kernel/signal_64.c linux-2.6.29.6/arch/powerpc/kernel/signal_64.c ---- linux-2.6.29.6/arch/powerpc/kernel/signal_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/kernel/signal_64.c 2009-07-23 17:34:32.044827554 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/kernel/signal_64.c linux-2.6.30.4/arch/powerpc/kernel/signal_64.c +--- linux-2.6.30.4/arch/powerpc/kernel/signal_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/kernel/signal_64.c 2009-07-30 09:48:09.905069777 -0400 @@ -429,7 +429,7 @@ int handle_rt_signal64(int signr, struct current->thread.fpscr.val = 0; @@ -1708,9 +1827,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/kernel/signal_64.c linux-2.6.29.6/arch/po regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp; } else { err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]); -diff -urNp linux-2.6.29.6/arch/powerpc/kernel/vdso.c linux-2.6.29.6/arch/powerpc/kernel/vdso.c ---- linux-2.6.29.6/arch/powerpc/kernel/vdso.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/kernel/vdso.c 2009-07-23 17:34:32.044827554 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/kernel/vdso.c linux-2.6.30.4/arch/powerpc/kernel/vdso.c +--- linux-2.6.30.4/arch/powerpc/kernel/vdso.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/kernel/vdso.c 2009-07-30 09:48:09.905069777 -0400 @@ -211,7 +211,7 @@ int arch_setup_additional_pages(struct l vdso_base = VDSO32_MBASE; #endif @@ -1729,9 +1848,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/kernel/vdso.c linux-2.6.29.6/arch/powerpc if (IS_ERR_VALUE(vdso_base)) { rc = vdso_base; goto fail_mmapsem; -diff -urNp linux-2.6.29.6/arch/powerpc/kvm/timing.c linux-2.6.29.6/arch/powerpc/kvm/timing.c ---- linux-2.6.29.6/arch/powerpc/kvm/timing.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/kvm/timing.c 2009-07-23 18:40:27.493263868 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/kvm/timing.c linux-2.6.30.4/arch/powerpc/kvm/timing.c +--- linux-2.6.30.4/arch/powerpc/kvm/timing.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/kvm/timing.c 2009-07-30 09:48:09.905069777 -0400 @@ -201,7 +201,7 @@ static int kvmppc_exit_timing_open(struc return single_open(file, kvmppc_exit_timing_show, inode->i_private); } @@ -1741,9 +1860,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/kvm/timing.c linux-2.6.29.6/arch/powerpc/ .owner = THIS_MODULE, .open = kvmppc_exit_timing_open, .read = seq_read, -diff -urNp linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c ---- linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c 2009-07-23 17:34:32.044827554 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/lib/usercopy_64.c linux-2.6.30.4/arch/powerpc/lib/usercopy_64.c +--- linux-2.6.30.4/arch/powerpc/lib/usercopy_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/lib/usercopy_64.c 2009-07-30 11:10:48.798471204 -0400 @@ -11,6 +11,9 @@ unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) @@ -1764,9 +1883,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/lib/usercopy_64.c linux-2.6.29.6/arch/pow if (likely(access_ok(VERIFY_WRITE, to, n))) n = __copy_to_user(to, from, n); return n; -diff -urNp linux-2.6.29.6/arch/powerpc/mm/fault.c linux-2.6.29.6/arch/powerpc/mm/fault.c ---- linux-2.6.29.6/arch/powerpc/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/mm/fault.c 2009-07-23 18:40:27.465457938 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/mm/fault.c linux-2.6.30.4/arch/powerpc/mm/fault.c +--- linux-2.6.30.4/arch/powerpc/mm/fault.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/mm/fault.c 2009-07-30 09:48:09.905534132 -0400 @@ -29,6 +29,10 @@ #include <linux/module.h> #include <linux/kprobes.h> @@ -2151,7 +2270,7 @@ diff -urNp linux-2.6.29.6/arch/powerpc/mm/fault.c linux-2.6.29.6/arch/powerpc/mm else is_write = error_code & DSISR_ISSTORE; #else -@@ -339,6 +700,37 @@ bad_area: +@@ -327,6 +688,37 @@ bad_area: bad_area_nosemaphore: /* User mode accesses cause a SIGSEGV */ if (user_mode(regs)) { @@ -2189,10 +2308,10 @@ diff -urNp linux-2.6.29.6/arch/powerpc/mm/fault.c linux-2.6.29.6/arch/powerpc/mm _exception(SIGSEGV, regs, code, address); return 0; } -diff -urNp linux-2.6.29.6/arch/powerpc/mm/mmap.c linux-2.6.29.6/arch/powerpc/mm/mmap.c ---- linux-2.6.29.6/arch/powerpc/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/mm/mmap.c 2009-07-23 17:34:32.045826057 -0400 -@@ -75,10 +75,22 @@ void arch_pick_mmap_layout(struct mm_str +diff -urNp linux-2.6.30.4/arch/powerpc/mm/mmap_64.c linux-2.6.30.4/arch/powerpc/mm/mmap_64.c +--- linux-2.6.30.4/arch/powerpc/mm/mmap_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/mm/mmap_64.c 2009-07-30 09:48:09.905534132 -0400 +@@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str */ if (mmap_is_legacy()) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -2215,9 +2334,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/mm/mmap.c linux-2.6.29.6/arch/powerpc/mm/ mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c ---- linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c 2009-07-23 18:40:27.494291214 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.30.4/arch/powerpc/platforms/cell/spufs/file.c +--- linux-2.6.30.4/arch/powerpc/platforms/cell/spufs/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/platforms/cell/spufs/file.c 2009-07-30 09:48:09.906622773 -0400 @@ -147,7 +147,7 @@ static int __fops ## _open(struct inode __simple_attr_check_format(__fmt, 0ull); \ return spufs_attr_open(inode, file, __get, __set, __fmt); \ @@ -2245,7 +2364,7 @@ diff -urNp linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.29. .fault = spufs_cntl_mmap_fault, }; -@@ -1141,7 +1141,7 @@ spufs_signal1_mmap_fault(struct vm_area_ +@@ -1143,7 +1143,7 @@ spufs_signal1_mmap_fault(struct vm_area_ #endif } @@ -2254,7 +2373,7 @@ diff -urNp linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.29. .fault = spufs_signal1_mmap_fault, }; -@@ -1277,7 +1277,7 @@ spufs_signal2_mmap_fault(struct vm_area_ +@@ -1279,7 +1279,7 @@ spufs_signal2_mmap_fault(struct vm_area_ #endif } @@ -2263,7 +2382,7 @@ diff -urNp linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.29. .fault = spufs_signal2_mmap_fault, }; -@@ -1395,7 +1395,7 @@ spufs_mss_mmap_fault(struct vm_area_stru +@@ -1397,7 +1397,7 @@ spufs_mss_mmap_fault(struct vm_area_stru return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_MSS_MAP_SIZE); } @@ -2272,7 +2391,7 @@ diff -urNp linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.29. .fault = spufs_mss_mmap_fault, }; -@@ -1456,7 +1456,7 @@ spufs_psmap_mmap_fault(struct vm_area_st +@@ -1458,7 +1458,7 @@ spufs_psmap_mmap_fault(struct vm_area_st return spufs_ps_fault(vma, vmf, 0x0000, SPUFS_PS_MAP_SIZE); } @@ -2281,7 +2400,7 @@ diff -urNp linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.29. .fault = spufs_psmap_mmap_fault, }; -@@ -1515,7 +1515,7 @@ spufs_mfc_mmap_fault(struct vm_area_stru +@@ -1517,7 +1517,7 @@ spufs_mfc_mmap_fault(struct vm_area_stru return spufs_ps_fault(vma, vmf, 0x3000, SPUFS_MFC_MAP_SIZE); } @@ -2290,9 +2409,21 @@ diff -urNp linux-2.6.29.6/arch/powerpc/platforms/cell/spufs/file.c linux-2.6.29. .fault = spufs_mfc_mmap_fault, }; -diff -urNp linux-2.6.29.6/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6.29.6/arch/powerpc/platforms/pseries/hvCall_inst.c ---- linux-2.6.29.6/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-07-23 18:40:27.495305970 -0400 +diff -urNp linux-2.6.30.4/arch/powerpc/platforms/pseries/dtl.c linux-2.6.30.4/arch/powerpc/platforms/pseries/dtl.c +--- linux-2.6.30.4/arch/powerpc/platforms/pseries/dtl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/platforms/pseries/dtl.c 2009-07-30 12:06:52.084821916 -0400 +@@ -209,7 +209,7 @@ static ssize_t dtl_file_read(struct file + return n_read * sizeof(struct dtl_entry); + } + +-static struct file_operations dtl_fops = { ++static const struct file_operations dtl_fops = { + .open = dtl_file_open, + .release = dtl_file_release, + .read = dtl_file_read, +diff -urNp linux-2.6.30.4/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6.30.4/arch/powerpc/platforms/pseries/hvCall_inst.c +--- linux-2.6.30.4/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/powerpc/platforms/pseries/hvCall_inst.c 2009-07-30 09:48:09.906622773 -0400 @@ -71,7 +71,7 @@ static int hc_show(struct seq_file *m, v return 0; } @@ -2302,9 +2433,9 @@ diff -urNp linux-2.6.29.6/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6 .start = hc_start, .next = hc_next, .stop = hc_stop, -diff -urNp linux-2.6.29.6/arch/s390/hypfs/inode.c linux-2.6.29.6/arch/s390/hypfs/inode.c ---- linux-2.6.29.6/arch/s390/hypfs/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/s390/hypfs/inode.c 2009-07-23 18:40:27.495305970 -0400 +diff -urNp linux-2.6.30.4/arch/s390/hypfs/inode.c linux-2.6.30.4/arch/s390/hypfs/inode.c +--- linux-2.6.30.4/arch/s390/hypfs/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/s390/hypfs/inode.c 2009-07-30 09:48:09.907613298 -0400 @@ -41,7 +41,7 @@ struct hypfs_sb_info { static const struct file_operations hypfs_file_ops; @@ -2323,9 +2454,9 @@ diff -urNp linux-2.6.29.6/arch/s390/hypfs/inode.c linux-2.6.29.6/arch/s390/hypfs .statfs = simple_statfs, .drop_inode = hypfs_drop_inode, .show_options = hypfs_show_options, -diff -urNp linux-2.6.29.6/arch/s390/include/asm/atomic.h linux-2.6.29.6/arch/s390/include/asm/atomic.h ---- linux-2.6.29.6/arch/s390/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/s390/include/asm/atomic.h 2009-07-23 17:34:32.045826057 -0400 +diff -urNp linux-2.6.30.4/arch/s390/include/asm/atomic.h linux-2.6.30.4/arch/s390/include/asm/atomic.h +--- linux-2.6.30.4/arch/s390/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/s390/include/asm/atomic.h 2009-07-30 09:48:09.908552392 -0400 @@ -82,8 +82,10 @@ static __inline__ int atomic_add_return( return __CS_LOOP(v, i, "ar"); } @@ -2345,9 +2476,9 @@ diff -urNp linux-2.6.29.6/arch/s390/include/asm/atomic.h linux-2.6.29.6/arch/s39 #define atomic_sub_and_test(_i, _v) (atomic_sub_return(_i, _v) == 0) #define atomic_dec(_v) atomic_sub_return(1, _v) #define atomic_dec_return(_v) atomic_sub_return(1, _v) -diff -urNp linux-2.6.29.6/arch/s390/include/asm/kmap_types.h linux-2.6.29.6/arch/s390/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/s390/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/s390/include/asm/kmap_types.h 2009-07-23 17:34:32.045826057 -0400 +diff -urNp linux-2.6.30.4/arch/s390/include/asm/kmap_types.h linux-2.6.30.4/arch/s390/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/s390/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/s390/include/asm/kmap_types.h 2009-07-30 09:48:09.908552392 -0400 @@ -16,6 +16,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -2356,21 +2487,44 @@ diff -urNp linux-2.6.29.6/arch/s390/include/asm/kmap_types.h linux-2.6.29.6/arch KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/s390/include/asm/uaccess.h linux-2.6.29.6/arch/s390/include/asm/uaccess.h ---- linux-2.6.29.6/arch/s390/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/s390/include/asm/uaccess.h 2009-07-23 17:34:32.045826057 -0400 -@@ -285,7 +285,7 @@ copy_from_user(void *to, const void __us +diff -urNp linux-2.6.30.4/arch/s390/include/asm/uaccess.h linux-2.6.30.4/arch/s390/include/asm/uaccess.h +--- linux-2.6.30.4/arch/s390/include/asm/uaccess.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/s390/include/asm/uaccess.h 2009-07-30 09:48:09.908552392 -0400 +@@ -232,6 +232,10 @@ static inline unsigned long __must_check + copy_to_user(void __user *to, const void *from, unsigned long n) + { + might_sleep(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (access_ok(VERIFY_WRITE, to, n)) + n = __copy_to_user(to, from, n); + return n; +@@ -257,6 +261,9 @@ copy_to_user(void __user *to, const void + static inline unsigned long __must_check + __copy_from_user(void *to, const void __user *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n) && (n <= 256)) + return uaccess.copy_from_user_small(n, from, to); + else +@@ -283,6 +290,10 @@ static inline unsigned long __must_check + copy_from_user(void *to, const void __user *from, unsigned long n) + { might_sleep(); ++ ++ if ((long)n < 0) ++ return n; ++ if (access_ok(VERIFY_READ, from, n)) n = __copy_from_user(to, from, n); -- else -+ else if ((long)n > 0) - memset(to, 0, n); - return n; - } -diff -urNp linux-2.6.29.6/arch/s390/kernel/module.c linux-2.6.29.6/arch/s390/kernel/module.c ---- linux-2.6.29.6/arch/s390/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/s390/kernel/module.c 2009-07-23 17:34:32.045826057 -0400 + else +diff -urNp linux-2.6.30.4/arch/s390/kernel/module.c linux-2.6.30.4/arch/s390/kernel/module.c +--- linux-2.6.30.4/arch/s390/kernel/module.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/s390/kernel/module.c 2009-07-30 09:48:09.908552392 -0400 @@ -166,11 +166,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr, /* Increase core size by size of got & plt and set start @@ -2415,16 +2569,16 @@ diff -urNp linux-2.6.29.6/arch/s390/kernel/module.c linux-2.6.29.6/arch/s390/ker info->plt_offset; #ifndef CONFIG_64BIT ip[0] = 0x0d105810; /* basr 1,0; l 1,6(1); br 1 */ -@@ -316,7 +316,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base - val = me->arch.plt_offset - me->arch.got_offset + - info->plt_offset + rela->r_addend; - else -- val = (Elf_Addr) me->module_core + -+ val = (Elf_Addr) me->module_core_rx + - me->arch.plt_offset + info->plt_offset + - rela->r_addend - loc; - if (r_type == R_390_PLT16DBL) -@@ -336,7 +336,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -319,7 +319,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base + val - loc + 0xffffUL < 0x1ffffeUL) || + (r_type == R_390_PLT32DBL && + val - loc + 0xffffffffULL < 0x1fffffffeULL))) +- val = (Elf_Addr) me->module_core + ++ val = (Elf_Addr) me->module_core_rx + + me->arch.plt_offset + + info->plt_offset; + val += rela->r_addend - loc; +@@ -341,7 +341,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base case R_390_GOTOFF32: /* 32 bit offset to GOT. */ case R_390_GOTOFF64: /* 64 bit offset to GOT. */ val = val + rela->r_addend - @@ -2433,7 +2587,7 @@ diff -urNp linux-2.6.29.6/arch/s390/kernel/module.c linux-2.6.29.6/arch/s390/ker if (r_type == R_390_GOTOFF16) *(unsigned short *) loc = val; else if (r_type == R_390_GOTOFF32) -@@ -346,7 +346,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base +@@ -351,7 +351,7 @@ apply_rela(Elf_Rela *rela, Elf_Addr base break; case R_390_GOTPC: /* 32 bit PC relative offset to GOT. */ case R_390_GOTPCDBL: /* 32 bit PC rel. off. to GOT shifted by 1. */ @@ -2442,9 +2596,9 @@ diff -urNp linux-2.6.29.6/arch/s390/kernel/module.c linux-2.6.29.6/arch/s390/ker rela->r_addend - loc; if (r_type == R_390_GOTPC) *(unsigned int *) loc = val; -diff -urNp linux-2.6.29.6/arch/sh/include/asm/atomic.h linux-2.6.29.6/arch/sh/include/asm/atomic.h ---- linux-2.6.29.6/arch/sh/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sh/include/asm/atomic.h 2009-07-23 17:34:32.047807130 -0400 +diff -urNp linux-2.6.30.4/arch/sh/include/asm/atomic.h linux-2.6.30.4/arch/sh/include/asm/atomic.h +--- linux-2.6.30.4/arch/sh/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sh/include/asm/atomic.h 2009-07-30 09:48:09.909647067 -0400 @@ -43,6 +43,9 @@ #define atomic_dec_and_test(v) (atomic_sub_return(1, (v)) == 0) @@ -2455,9 +2609,9 @@ diff -urNp linux-2.6.29.6/arch/sh/include/asm/atomic.h linux-2.6.29.6/arch/sh/in #define atomic_dec(v) atomic_sub(1,(v)) #ifndef CONFIG_GUSA_RB -diff -urNp linux-2.6.29.6/arch/sh/include/asm/kmap_types.h linux-2.6.29.6/arch/sh/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/sh/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sh/include/asm/kmap_types.h 2009-07-23 17:34:32.047807130 -0400 +diff -urNp linux-2.6.30.4/arch/sh/include/asm/kmap_types.h linux-2.6.30.4/arch/sh/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/sh/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sh/include/asm/kmap_types.h 2009-07-30 09:48:09.909647067 -0400 @@ -24,7 +24,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -2468,10 +2622,10 @@ diff -urNp linux-2.6.29.6/arch/sh/include/asm/kmap_types.h linux-2.6.29.6/arch/s }; #undef D -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h ---- linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h 2009-07-23 17:34:32.047807130 -0400 -@@ -26,8 +26,11 @@ extern void atomic_set(atomic_t *, int); +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/atomic_32.h linux-2.6.30.4/arch/sparc/include/asm/atomic_32.h +--- linux-2.6.30.4/arch/sparc/include/asm/atomic_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/atomic_32.h 2009-07-30 09:48:09.910522181 -0400 +@@ -28,8 +28,11 @@ extern void atomic_set(atomic_t *, int); #define atomic_read(v) ((v)->counter) #define atomic_add(i, v) ((void)__atomic_add_return( (int)(i), (v))) @@ -2483,9 +2637,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/atomic_32.h linux-2.6.29.6/arch #define atomic_dec(v) ((void)__atomic_add_return( -1, (v))) #define atomic_add_return(i, v) (__atomic_add_return( (int)(i), (v))) -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h ---- linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h 2009-07-23 17:34:32.047807130 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/atomic_64.h linux-2.6.30.4/arch/sparc/include/asm/atomic_64.h +--- linux-2.6.30.4/arch/sparc/include/asm/atomic_64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/atomic_64.h 2009-07-30 09:48:09.910522181 -0400 @@ -20,8 +20,10 @@ #define atomic64_set(v, i) (((v)->counter) = i) @@ -2505,9 +2659,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/atomic_64.h linux-2.6.29.6/arch #define atomic64_inc(v) atomic64_add(1, v) #define atomic_dec(v) atomic_sub(1, v) -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/elf_32.h linux-2.6.29.6/arch/sparc/include/asm/elf_32.h ---- linux-2.6.29.6/arch/sparc/include/asm/elf_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/elf_32.h 2009-07-23 17:34:32.047807130 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/elf_32.h linux-2.6.30.4/arch/sparc/include/asm/elf_32.h +--- linux-2.6.30.4/arch/sparc/include/asm/elf_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/elf_32.h 2009-07-30 09:48:09.910522181 -0400 @@ -116,6 +116,13 @@ typedef struct { #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE) @@ -2522,9 +2676,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/elf_32.h linux-2.6.29.6/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. This can NOT be done in userspace on Sparc. */ -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/elf_64.h linux-2.6.29.6/arch/sparc/include/asm/elf_64.h ---- linux-2.6.29.6/arch/sparc/include/asm/elf_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/elf_64.h 2009-07-23 17:34:32.047807130 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/elf_64.h linux-2.6.30.4/arch/sparc/include/asm/elf_64.h +--- linux-2.6.30.4/arch/sparc/include/asm/elf_64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/elf_64.h 2009-07-30 09:48:09.910522181 -0400 @@ -163,6 +163,12 @@ typedef struct { #define ELF_ET_DYN_BASE 0x0000010000000000UL #define COMPAT_ELF_ET_DYN_BASE 0x0000000070000000UL @@ -2538,9 +2692,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/elf_64.h linux-2.6.29.6/arch/sp /* This yields a mask that user programs can use to figure out what instruction set this cpu supports. */ -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h 2009-07-23 17:34:32.048766932 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/kmap_types.h linux-2.6.30.4/arch/sparc/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/sparc/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/kmap_types.h 2009-07-30 09:48:09.910522181 -0400 @@ -19,6 +19,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -2549,9 +2703,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/kmap_types.h linux-2.6.29.6/arc KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h ---- linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h 2009-07-23 17:34:32.048766932 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/pgtable_32.h linux-2.6.30.4/arch/sparc/include/asm/pgtable_32.h +--- linux-2.6.30.4/arch/sparc/include/asm/pgtable_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/pgtable_32.h 2009-07-30 09:48:09.910522181 -0400 @@ -43,6 +43,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd) BTFIXUPDEF_INT(page_none) BTFIXUPDEF_INT(page_copy) @@ -2583,9 +2737,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/pgtable_32.h linux-2.6.29.6/arc extern unsigned long page_kernel; #ifdef MODULE -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h ---- linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h 2009-07-23 17:34:32.048766932 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.30.4/arch/sparc/include/asm/pgtsrmmu.h +--- linux-2.6.30.4/arch/sparc/include/asm/pgtsrmmu.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/pgtsrmmu.h 2009-07-30 09:48:09.911921584 -0400 @@ -115,6 +115,13 @@ SRMMU_EXEC | SRMMU_REF) #define SRMMU_PAGE_RDONLY __pgprot(SRMMU_VALID | SRMMU_CACHE | \ @@ -2600,30 +2754,42 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/pgtsrmmu.h linux-2.6.29.6/arch/ #define SRMMU_PAGE_KERNEL __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \ SRMMU_DIRTY | SRMMU_REF) -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h ---- linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/uaccess_32.h 2009-07-23 17:34:32.048766932 -0400 -@@ -246,7 +246,7 @@ extern unsigned long __copy_user(void __ +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/uaccess_32.h linux-2.6.30.4/arch/sparc/include/asm/uaccess_32.h +--- linux-2.6.30.4/arch/sparc/include/asm/uaccess_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/uaccess_32.h 2009-07-30 09:48:09.911921584 -0400 +@@ -246,6 +246,9 @@ extern unsigned long __copy_user(void __ static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n) { -- if (n && __access_ok((unsigned long) to, n)) -+ if (((int)n > 0) && __access_ok((unsigned long) to, n)) ++ if ((long)n < 0) ++ return n; ++ + if (n && __access_ok((unsigned long) to, n)) return __copy_user(to, (__force void __user *) from, n); else - return n; -@@ -259,7 +259,7 @@ static inline unsigned long __copy_to_us +@@ -259,6 +262,9 @@ static inline unsigned long __copy_to_us static inline unsigned long copy_from_user(void *to, const void __user *from, unsigned long n) { -- if (n && __access_ok((unsigned long) from, n)) -+ if (((int)n > 0) && __access_ok((unsigned long) from, n)) ++ if ((long)n < 0) ++ return n; ++ + if (n && __access_ok((unsigned long) from, n)) return __copy_user((__force void __user *) to, from, n); else - return n; -diff -urNp linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h ---- linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h 2009-07-23 17:34:32.048766932 -0400 +@@ -267,6 +273,9 @@ static inline unsigned long copy_from_us + + static inline unsigned long __copy_from_user(void *to, const void __user *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + return __copy_user((__force void __user *) to, from, n); + } + +diff -urNp linux-2.6.30.4/arch/sparc/include/asm/uaccess_64.h linux-2.6.30.4/arch/sparc/include/asm/uaccess_64.h +--- linux-2.6.30.4/arch/sparc/include/asm/uaccess_64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/include/asm/uaccess_64.h 2009-07-30 11:10:48.823569054 -0400 @@ -212,7 +212,12 @@ extern unsigned long copy_from_user_fixu static inline unsigned long __must_check copy_from_user(void *to, const void __user *from, unsigned long size) @@ -2652,9 +2818,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/include/asm/uaccess_64.h linux-2.6.29.6/arc if (unlikely(ret)) ret = copy_to_user_fixup(to, from, size); -diff -urNp linux-2.6.29.6/arch/sparc/kernel/Makefile linux-2.6.29.6/arch/sparc/kernel/Makefile ---- linux-2.6.29.6/arch/sparc/kernel/Makefile 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/kernel/Makefile 2009-07-23 17:34:32.049741165 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/kernel/Makefile linux-2.6.30.4/arch/sparc/kernel/Makefile +--- linux-2.6.30.4/arch/sparc/kernel/Makefile 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/kernel/Makefile 2009-07-30 09:48:09.911921584 -0400 @@ -3,7 +3,7 @@ # @@ -2664,9 +2830,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/kernel/Makefile linux-2.6.29.6/arch/sparc/k extra-y := head_$(BITS).o extra-y += init_task.o -diff -urNp linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c ---- linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c 2009-07-23 17:34:32.049741165 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/kernel/sys_sparc_32.c linux-2.6.30.4/arch/sparc/kernel/sys_sparc_32.c +--- linux-2.6.30.4/arch/sparc/kernel/sys_sparc_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/kernel/sys_sparc_32.c 2009-07-30 09:48:09.912653453 -0400 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str if (ARCH_SUN4C && len > 0x20000000) return -ENOMEM; @@ -2676,9 +2842,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/kernel/sys_sparc_32.c linux-2.6.29.6/arch/s if (flags & MAP_SHARED) addr = COLOUR_ALIGN(addr); -diff -urNp linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c ---- linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c 2009-07-23 17:34:32.049741165 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/kernel/sys_sparc_64.c linux-2.6.30.4/arch/sparc/kernel/sys_sparc_64.c +--- linux-2.6.30.4/arch/sparc/kernel/sys_sparc_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/kernel/sys_sparc_64.c 2009-07-30 09:48:09.912653453 -0400 @@ -125,7 +125,7 @@ unsigned long arch_get_unmapped_area(str /* We do not accept a shared mapping if it would violate * cache aliasing constraints. @@ -2757,9 +2923,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/kernel/sys_sparc_64.c linux-2.6.29.6/arch/s mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.29.6/arch/sparc/Makefile linux-2.6.29.6/arch/sparc/Makefile ---- linux-2.6.29.6/arch/sparc/Makefile 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/Makefile 2009-07-23 17:34:32.049741165 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/Makefile linux-2.6.30.4/arch/sparc/Makefile +--- linux-2.6.30.4/arch/sparc/Makefile 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/Makefile 2009-07-30 11:10:48.852135371 -0400 @@ -81,7 +81,7 @@ drivers-$(CONFIG_OPROFILE) += arch/sparc # Export what is needed by arch/sparc/boot/Makefile export VMLINUX_INIT VMLINUX_MAIN @@ -2769,9 +2935,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/Makefile linux-2.6.29.6/arch/sparc/Makefile VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y) VMLINUX_MAIN += $(drivers-y) $(net-y) -diff -urNp linux-2.6.29.6/arch/sparc/mm/fault_32.c linux-2.6.29.6/arch/sparc/mm/fault_32.c ---- linux-2.6.29.6/arch/sparc/mm/fault_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/mm/fault_32.c 2009-07-23 18:40:27.465457938 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/mm/fault_32.c linux-2.6.30.4/arch/sparc/mm/fault_32.c +--- linux-2.6.30.4/arch/sparc/mm/fault_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/mm/fault_32.c 2009-07-30 09:48:09.913853340 -0400 @@ -21,6 +21,9 @@ #include <linux/interrupt.h> #include <linux/module.h> @@ -3057,9 +3223,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/mm/fault_32.c linux-2.6.29.6/arch/sparc/mm/ /* Allow reads even for write-only mappings */ if(!(vma->vm_flags & (VM_READ | VM_EXEC))) goto bad_area; -diff -urNp linux-2.6.29.6/arch/sparc/mm/fault_64.c linux-2.6.29.6/arch/sparc/mm/fault_64.c ---- linux-2.6.29.6/arch/sparc/mm/fault_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/mm/fault_64.c 2009-07-23 18:40:27.466429820 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/mm/fault_64.c linux-2.6.30.4/arch/sparc/mm/fault_64.c +--- linux-2.6.30.4/arch/sparc/mm/fault_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/mm/fault_64.c 2009-07-30 09:48:09.913853340 -0400 @@ -20,6 +20,9 @@ #include <linux/kprobes.h> #include <linux/kdebug.h> @@ -3468,9 +3634,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/mm/fault_64.c linux-2.6.29.6/arch/sparc/mm/ /* Pure DTLB misses do not tell us whether the fault causing * load/store/atomic was a write or not, it only says that there * was no match. So in such a case we (carefully) read the -diff -urNp linux-2.6.29.6/arch/sparc/mm/init_32.c linux-2.6.29.6/arch/sparc/mm/init_32.c ---- linux-2.6.29.6/arch/sparc/mm/init_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/mm/init_32.c 2009-07-23 17:34:32.050703291 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/mm/init_32.c linux-2.6.30.4/arch/sparc/mm/init_32.c +--- linux-2.6.30.4/arch/sparc/mm/init_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/mm/init_32.c 2009-07-30 09:48:09.914627627 -0400 @@ -316,6 +316,9 @@ extern void device_scan(void); pgprot_t PAGE_SHARED __read_mostly; EXPORT_SYMBOL(PAGE_SHARED); @@ -3505,9 +3671,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/mm/init_32.c linux-2.6.29.6/arch/sparc/mm/i protection_map[12] = PAGE_READONLY; protection_map[13] = PAGE_READONLY; protection_map[14] = PAGE_SHARED; -diff -urNp linux-2.6.29.6/arch/sparc/mm/Makefile linux-2.6.29.6/arch/sparc/mm/Makefile ---- linux-2.6.29.6/arch/sparc/mm/Makefile 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/mm/Makefile 2009-07-23 17:34:32.050703291 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/mm/Makefile linux-2.6.30.4/arch/sparc/mm/Makefile +--- linux-2.6.30.4/arch/sparc/mm/Makefile 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/mm/Makefile 2009-07-30 09:48:09.912653453 -0400 @@ -2,7 +2,7 @@ # @@ -3517,9 +3683,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/mm/Makefile linux-2.6.29.6/arch/sparc/mm/Ma obj-$(CONFIG_SPARC64) += ultra.o tlb.o tsb.o obj-y += fault_$(BITS).o -diff -urNp linux-2.6.29.6/arch/sparc/mm/srmmu.c linux-2.6.29.6/arch/sparc/mm/srmmu.c ---- linux-2.6.29.6/arch/sparc/mm/srmmu.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/sparc/mm/srmmu.c 2009-07-23 17:34:32.051762759 -0400 +diff -urNp linux-2.6.30.4/arch/sparc/mm/srmmu.c linux-2.6.30.4/arch/sparc/mm/srmmu.c +--- linux-2.6.30.4/arch/sparc/mm/srmmu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/sparc/mm/srmmu.c 2009-07-30 09:48:09.914627627 -0400 @@ -2148,6 +2148,13 @@ void __init ld_mmu_srmmu(void) PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED); BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY)); @@ -3534,9 +3700,9 @@ diff -urNp linux-2.6.29.6/arch/sparc/mm/srmmu.c linux-2.6.29.6/arch/sparc/mm/srm BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL)); page_kernel = pgprot_val(SRMMU_PAGE_KERNEL); -diff -urNp linux-2.6.29.6/arch/um/include/asm/kmap_types.h linux-2.6.29.6/arch/um/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/um/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/um/include/asm/kmap_types.h 2009-07-23 17:34:32.051762759 -0400 +diff -urNp linux-2.6.30.4/arch/um/include/asm/kmap_types.h linux-2.6.30.4/arch/um/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/um/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/um/include/asm/kmap_types.h 2009-07-30 09:48:09.914627627 -0400 @@ -23,6 +23,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -3545,9 +3711,9 @@ diff -urNp linux-2.6.29.6/arch/um/include/asm/kmap_types.h linux-2.6.29.6/arch/u KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/arch/um/include/asm/page.h linux-2.6.29.6/arch/um/include/asm/page.h ---- linux-2.6.29.6/arch/um/include/asm/page.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/um/include/asm/page.h 2009-07-23 17:34:32.051762759 -0400 +diff -urNp linux-2.6.30.4/arch/um/include/asm/page.h linux-2.6.30.4/arch/um/include/asm/page.h +--- linux-2.6.30.4/arch/um/include/asm/page.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/um/include/asm/page.h 2009-07-30 09:48:09.915798567 -0400 @@ -14,6 +14,9 @@ #define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT) #define PAGE_MASK (~(PAGE_SIZE-1)) @@ -3558,9 +3724,9 @@ diff -urNp linux-2.6.29.6/arch/um/include/asm/page.h linux-2.6.29.6/arch/um/incl #ifndef __ASSEMBLY__ struct page; -diff -urNp linux-2.6.29.6/arch/um/sys-i386/syscalls.c linux-2.6.29.6/arch/um/sys-i386/syscalls.c ---- linux-2.6.29.6/arch/um/sys-i386/syscalls.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/um/sys-i386/syscalls.c 2009-07-23 17:34:32.051762759 -0400 +diff -urNp linux-2.6.30.4/arch/um/sys-i386/syscalls.c linux-2.6.30.4/arch/um/sys-i386/syscalls.c +--- linux-2.6.30.4/arch/um/sys-i386/syscalls.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/um/sys-i386/syscalls.c 2009-07-30 09:48:09.915798567 -0400 @@ -11,6 +11,21 @@ #include "asm/uaccess.h" #include "asm/unistd.h" @@ -3583,9 +3749,9 @@ diff -urNp linux-2.6.29.6/arch/um/sys-i386/syscalls.c linux-2.6.29.6/arch/um/sys /* * Perform the select(nd, in, out, ex, tv) and mmap() system * calls. Linux/i386 didn't use to be able to handle more than -diff -urNp linux-2.6.29.6/arch/x86/boot/bitops.h linux-2.6.29.6/arch/x86/boot/bitops.h ---- linux-2.6.29.6/arch/x86/boot/bitops.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/bitops.h 2009-07-23 17:34:32.052702854 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/bitops.h linux-2.6.30.4/arch/x86/boot/bitops.h +--- linux-2.6.30.4/arch/x86/boot/bitops.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/bitops.h 2009-07-30 09:48:09.917626356 -0400 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int u8 v; const u32 *p = (const u32 *)addr; @@ -3604,9 +3770,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/bitops.h linux-2.6.29.6/arch/x86/boot/bi } #endif /* BOOT_BITOPS_H */ -diff -urNp linux-2.6.29.6/arch/x86/boot/boot.h linux-2.6.29.6/arch/x86/boot/boot.h ---- linux-2.6.29.6/arch/x86/boot/boot.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/boot.h 2009-07-23 17:34:32.052702854 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/boot.h linux-2.6.30.4/arch/x86/boot/boot.h +--- linux-2.6.30.4/arch/x86/boot/boot.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/boot.h 2009-07-30 09:48:09.917626356 -0400 @@ -80,7 +80,7 @@ static inline void io_delay(void) static inline u16 ds(void) { @@ -3625,10 +3791,10 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/boot.h linux-2.6.29.6/arch/x86/boot/boot : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len)); return diff; } -diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/head_32.S linux-2.6.29.6/arch/x86/boot/compressed/head_32.S ---- linux-2.6.29.6/arch/x86/boot/compressed/head_32.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/compressed/head_32.S 2009-07-23 17:34:32.052702854 -0400 -@@ -70,7 +70,7 @@ startup_32: +diff -urNp linux-2.6.30.4/arch/x86/boot/compressed/head_32.S linux-2.6.30.4/arch/x86/boot/compressed/head_32.S +--- linux-2.6.30.4/arch/x86/boot/compressed/head_32.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/compressed/head_32.S 2009-07-30 09:48:09.917626356 -0400 +@@ -68,7 +68,7 @@ ENTRY(startup_32) addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebx andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebx #else @@ -3637,7 +3803,7 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/head_32.S linux-2.6.29.6/arch #endif /* Replace the compressed data size with the uncompressed size */ -@@ -80,8 +80,8 @@ startup_32: +@@ -78,8 +78,8 @@ ENTRY(startup_32) /* Add 8 bytes for every 32K input block */ shrl $12, %eax addl %eax, %ebx @@ -3648,7 +3814,7 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/head_32.S linux-2.6.29.6/arch /* Align on a 4K boundary */ addl $4095, %ebx andl $~4095, %ebx -@@ -105,7 +105,7 @@ startup_32: +@@ -103,7 +103,7 @@ ENTRY(startup_32) addl $(CONFIG_PHYSICAL_ALIGN - 1), %ebp andl $(~(CONFIG_PHYSICAL_ALIGN - 1)), %ebp #else @@ -3677,10 +3843,10 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/head_32.S linux-2.6.29.6/arch addl %ebx, -__PAGE_OFFSET(%ebx, %ecx) jmp 1b 2: -diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/misc.c linux-2.6.29.6/arch/x86/boot/compressed/misc.c ---- linux-2.6.29.6/arch/x86/boot/compressed/misc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/compressed/misc.c 2009-07-23 17:34:32.052702854 -0400 -@@ -373,7 +373,7 @@ static void parse_elf(void *output) +diff -urNp linux-2.6.30.4/arch/x86/boot/compressed/misc.c linux-2.6.30.4/arch/x86/boot/compressed/misc.c +--- linux-2.6.30.4/arch/x86/boot/compressed/misc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/compressed/misc.c 2009-07-30 09:48:09.917626356 -0400 +@@ -288,7 +288,7 @@ static void parse_elf(void *output) case PT_LOAD: #ifdef CONFIG_RELOCATABLE dest = output; @@ -3689,7 +3855,7 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/misc.c linux-2.6.29.6/arch/x8 #else dest = (void *)(phdr->p_paddr); #endif -@@ -425,7 +425,7 @@ asmlinkage void decompress_kernel(void * +@@ -336,7 +336,7 @@ asmlinkage void decompress_kernel(void * if (heap > ((-__PAGE_OFFSET-(512<<20)-1) & 0x7fffffff)) error("Destination address too large"); #ifndef CONFIG_RELOCATABLE @@ -3698,9 +3864,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/misc.c linux-2.6.29.6/arch/x8 error("Wrong destination address"); #endif #endif -diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/relocs.c linux-2.6.29.6/arch/x86/boot/compressed/relocs.c ---- linux-2.6.29.6/arch/x86/boot/compressed/relocs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/compressed/relocs.c 2009-07-23 17:34:32.052702854 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/compressed/relocs.c linux-2.6.30.4/arch/x86/boot/compressed/relocs.c +--- linux-2.6.30.4/arch/x86/boot/compressed/relocs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/compressed/relocs.c 2009-07-30 09:48:09.918715361 -0400 @@ -10,8 +10,11 @@ #define USE_BSD #include <endian.h> @@ -3784,7 +3950,7 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/relocs.c linux-2.6.29.6/arch/ continue; } + /* Don't relocate actual per-cpu variables, they are absolute indices, not addresses */ -+ if (!strcmp(sec_name(sym->st_shndx), ".data.percpu") && strncmp(sym_name(sym_strtab, sym), "__per_cpu_", 10)) ++ if (!strcmp(sec_name(sym->st_shndx), ".data.percpu") && strcmp(sym_name(sym_strtab, sym), "__per_cpu_load")) + continue; +#if defined(CONFIG_PAX_KERNEXEC) && defined(CONFIG_X86_32) + /* Don't relocate actual code, they are relocated implicitly by the base address of KERNEL_CS */ @@ -3800,10 +3966,10 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/relocs.c linux-2.6.29.6/arch/ + if (!strcmp(sec_name(sym->st_shndx), ".text")) + continue; +#endif - if (r_type == R_386_PC32) { - /* PC relative relocations don't need to be adjusted */ - } -@@ -631,6 +692,7 @@ int main(int argc, char **argv) + if (r_type == R_386_NONE || r_type == R_386_PC32) { + /* + * NONE can be ignored and and PC relative +@@ -634,6 +695,7 @@ int main(int argc, char **argv) fname, strerror(errno)); } read_ehdr(fp); @@ -3811,9 +3977,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/compressed/relocs.c linux-2.6.29.6/arch/ read_shdrs(fp); read_strtabs(fp); read_symtabs(fp); -diff -urNp linux-2.6.29.6/arch/x86/boot/cpucheck.c linux-2.6.29.6/arch/x86/boot/cpucheck.c ---- linux-2.6.29.6/arch/x86/boot/cpucheck.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/cpucheck.c 2009-07-23 17:34:32.052702854 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/cpucheck.c linux-2.6.30.4/arch/x86/boot/cpucheck.c +--- linux-2.6.30.4/arch/x86/boot/cpucheck.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/cpucheck.c 2009-07-30 09:48:09.918715361 -0400 @@ -74,7 +74,7 @@ static int has_fpu(void) u16 fcw = -1, fsw = -1; u32 cr0; @@ -3909,9 +4075,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/cpucheck.c linux-2.6.29.6/arch/x86/boot/ err = check_flags(); } -diff -urNp linux-2.6.29.6/arch/x86/boot/edd.c linux-2.6.29.6/arch/x86/boot/edd.c ---- linux-2.6.29.6/arch/x86/boot/edd.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/edd.c 2009-07-23 17:34:32.053815554 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/edd.c linux-2.6.30.4/arch/x86/boot/edd.c +--- linux-2.6.30.4/arch/x86/boot/edd.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/edd.c 2009-07-30 09:48:09.919627263 -0400 @@ -81,7 +81,7 @@ static int get_edd_info(u8 devno, struct ax = 0x4100; bx = EDDMAGIC1; @@ -3939,9 +4105,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/edd.c linux-2.6.29.6/arch/x86/boot/edd.c "movw %%di,%%es; " "pushfl; stc; int $0x13; setc %%al; popfl; " "popw %%es" -diff -urNp linux-2.6.29.6/arch/x86/boot/main.c linux-2.6.29.6/arch/x86/boot/main.c ---- linux-2.6.29.6/arch/x86/boot/main.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/main.c 2009-07-23 17:34:32.053815554 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/main.c linux-2.6.30.4/arch/x86/boot/main.c +--- linux-2.6.30.4/arch/x86/boot/main.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/main.c 2009-07-30 09:48:09.919627263 -0400 @@ -78,7 +78,7 @@ static void query_ist(void) if (cpu.level < 6) return; @@ -3951,9 +4117,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/main.c linux-2.6.29.6/arch/x86/boot/main : "=a" (boot_params.ist_info.signature), "=b" (boot_params.ist_info.command), "=c" (boot_params.ist_info.event), -diff -urNp linux-2.6.29.6/arch/x86/boot/mca.c linux-2.6.29.6/arch/x86/boot/mca.c ---- linux-2.6.29.6/arch/x86/boot/mca.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/mca.c 2009-07-23 17:34:32.053815554 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/mca.c linux-2.6.30.4/arch/x86/boot/mca.c +--- linux-2.6.30.4/arch/x86/boot/mca.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/mca.c 2009-07-30 09:48:09.919627263 -0400 @@ -19,7 +19,7 @@ int query_mca(void) u8 err; u16 es, bx, len; @@ -3963,19 +4129,19 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/mca.c linux-2.6.29.6/arch/x86/boot/mca.c "int $0x15 ; " "setc %0 ; " "movw %%es, %1 ; " -diff -urNp linux-2.6.29.6/arch/x86/boot/memory.c linux-2.6.29.6/arch/x86/boot/memory.c ---- linux-2.6.29.6/arch/x86/boot/memory.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/memory.c 2009-07-23 17:34:32.053815554 -0400 -@@ -30,7 +30,7 @@ static int detect_memory_e820(void) - /* Important: %edx and %esi are clobbered by some BIOSes, +diff -urNp linux-2.6.30.4/arch/x86/boot/memory.c linux-2.6.30.4/arch/x86/boot/memory.c +--- linux-2.6.30.4/arch/x86/boot/memory.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/memory.c 2009-07-30 09:48:09.919627263 -0400 +@@ -47,7 +47,7 @@ static int detect_memory_e820(void) so they must be either used for the error output - or explicitly marked clobbered. */ -- asm("int $0x15; setc %0" -+ asm volatile("int $0x15; setc %0" + or explicitly marked clobbered. Given that, assume there + is something out there clobbering %ebp and %edi, too. */ +- asm("pushl %%ebp; int $0x15; popl %%ebp; setc %0" ++ asm volatile("pushl %%ebp; int $0x15; popl %%ebp; setc %0" : "=d" (err), "+b" (next), "=a" (id), "+c" (size), - "=m" (*desc) - : "D" (desc), "d" (SMAP), "a" (0xe820) -@@ -66,7 +66,7 @@ static int detect_memory_e801(void) + "=D" (edi), "+m" (buf) + : "D" (&buf), "d" (SMAP), "a" (0xe820) +@@ -83,7 +83,7 @@ static int detect_memory_e801(void) bx = cx = dx = 0; ax = 0xe801; @@ -3984,7 +4150,7 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/memory.c linux-2.6.29.6/arch/x86/boot/me : "=m" (err), "+a" (ax), "+b" (bx), "+c" (cx), "+d" (dx)); if (err) -@@ -96,7 +96,7 @@ static int detect_memory_88(void) +@@ -113,7 +113,7 @@ static int detect_memory_88(void) u8 err; ax = 0x8800; @@ -3993,9 +4159,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/memory.c linux-2.6.29.6/arch/x86/boot/me boot_params.screen_info.ext_mem_k = ax; -diff -urNp linux-2.6.29.6/arch/x86/boot/video.c linux-2.6.29.6/arch/x86/boot/video.c ---- linux-2.6.29.6/arch/x86/boot/video.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/video.c 2009-07-23 17:34:32.053815554 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/video.c linux-2.6.30.4/arch/x86/boot/video.c +--- linux-2.6.30.4/arch/x86/boot/video.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/video.c 2009-07-30 09:48:09.920627513 -0400 @@ -23,7 +23,7 @@ static void store_cursor_position(void) ax = 0x0300; @@ -4014,9 +4180,9 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/video.c linux-2.6.29.6/arch/x86/boot/vid : "+a" (ax), "=b" (page) : : "ecx", "edx", "esi", "edi"); -diff -urNp linux-2.6.29.6/arch/x86/boot/video-vesa.c linux-2.6.29.6/arch/x86/boot/video-vesa.c ---- linux-2.6.29.6/arch/x86/boot/video-vesa.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/video-vesa.c 2009-07-23 17:34:32.053815554 -0400 +diff -urNp linux-2.6.30.4/arch/x86/boot/video-vesa.c linux-2.6.30.4/arch/x86/boot/video-vesa.c +--- linux-2.6.30.4/arch/x86/boot/video-vesa.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/boot/video-vesa.c 2009-07-30 09:48:09.920627513 -0400 @@ -41,7 +41,7 @@ static int vesa_probe(void) ax = 0x4f00; @@ -4088,19 +4254,19 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/video-vesa.c linux-2.6.29.6/arch/x86/boo : "+a" (ax), "+b" (bx), "+d" (dx), "=m" (boot_params.edid_info), "+c" (cx), "+D" (di) : : "esi"); -diff -urNp linux-2.6.29.6/arch/x86/boot/video-vga.c linux-2.6.29.6/arch/x86/boot/video-vga.c ---- linux-2.6.29.6/arch/x86/boot/video-vga.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/video-vga.c 2009-07-23 17:34:32.054707168 -0400 -@@ -225,7 +225,7 @@ static int vga_probe(void) - }; +diff -urNp linux-2.6.30.4/arch/x86/boot/video-vga.c linux-2.6.30.4/arch/x86/boot/video-vga.c +--- linux-2.6.30.4/arch/x86/boot/video-vga.c 2009-07-30 20:32:40.362766121 -0400 ++++ linux-2.6.30.4/arch/x86/boot/video-vga.c 2009-07-30 20:35:05.409914191 -0400 +@@ -260,7 +260,7 @@ static int vga_probe(void) u8 vga_flag; + ax = 0x1200; - asm(INT10 + asm volatile(INT10 - : "=b" (ega_bx) - : "a" (0x1200), "b" (0x10) /* Check EGA/VGA */ + : "+a" (ax), "=b" (ega_bx) + : "b" (0x10) /* Check EGA/VGA */ : "ecx", "edx", "esi", "edi"); -@@ -237,7 +237,7 @@ static int vga_probe(void) +@@ -272,7 +272,7 @@ static int vga_probe(void) /* If we have MDA/CGA/HGC then BL will be unchanged at 0x10 */ if ((u8)ega_bx != 0x10) { /* EGA/VGA */ @@ -4109,22 +4275,10 @@ diff -urNp linux-2.6.29.6/arch/x86/boot/video-vga.c linux-2.6.29.6/arch/x86/boot : "=a" (vga_flag) : "a" (0x1a00) : "ebx", "ecx", "edx", "esi", "edi"); -diff -urNp linux-2.6.29.6/arch/x86/boot/voyager.c linux-2.6.29.6/arch/x86/boot/voyager.c ---- linux-2.6.29.6/arch/x86/boot/voyager.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/boot/voyager.c 2009-07-23 17:34:32.054707168 -0400 -@@ -23,7 +23,7 @@ int query_voyager(void) - - data_ptr[0] = 0xff; /* Flag on config not found(?) */ - -- asm("pushw %%es ; " -+ asm volatile("pushw %%es ; " - "int $0x15 ; " - "setc %0 ; " - "movw %%es, %1 ; " -diff -urNp linux-2.6.29.6/arch/x86/ia32/ia32_signal.c linux-2.6.29.6/arch/x86/ia32/ia32_signal.c ---- linux-2.6.29.6/arch/x86/ia32/ia32_signal.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/ia32/ia32_signal.c 2009-07-23 17:34:32.054707168 -0400 -@@ -387,7 +387,7 @@ static void __user *get_sigframe(struct +diff -urNp linux-2.6.30.4/arch/x86/ia32/ia32_signal.c linux-2.6.30.4/arch/x86/ia32/ia32_signal.c +--- linux-2.6.30.4/arch/x86/ia32/ia32_signal.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/ia32/ia32_signal.c 2009-07-30 09:48:09.921498916 -0400 +@@ -403,7 +403,7 @@ static void __user *get_sigframe(struct sp -= frame_size; /* Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. */ @@ -4133,16 +4287,7 @@ diff -urNp linux-2.6.29.6/arch/x86/ia32/ia32_signal.c linux-2.6.29.6/arch/x86/ia return (void __user *) sp; } -@@ -464,7 +464,7 @@ int ia32_setup_frame(int sig, struct k_s - - #if DEBUG_SIG - printk(KERN_DEBUG "SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n", -- current->comm, current->pid, frame, regs->ip, frame->pretcode); -+ current->comm, task_pid_nr(current), frame, regs->ip, frame->pretcode); - #endif - - return 0; -@@ -488,7 +488,7 @@ int ia32_setup_rt_frame(int sig, struct +@@ -503,7 +503,7 @@ int ia32_setup_rt_frame(int sig, struct 0xb8, __NR_ia32_rt_sigreturn, 0x80cd, @@ -4151,18 +4296,9 @@ diff -urNp linux-2.6.29.6/arch/x86/ia32/ia32_signal.c linux-2.6.29.6/arch/x86/ia }; frame = get_sigframe(ka, regs, sizeof(*frame), &fpstate); -@@ -551,7 +551,7 @@ int ia32_setup_rt_frame(int sig, struct - - #if DEBUG_SIG - printk(KERN_DEBUG "SIG deliver (%s:%d): sp=%p pc=%lx ra=%u\n", -- current->comm, current->pid, frame, regs->ip, frame->pretcode); -+ current->comm, task_pid_nr(current), frame, regs->ip, frame->pretcode); - #endif - - return 0; -diff -urNp linux-2.6.29.6/arch/x86/include/asm/alternative.h linux-2.6.29.6/arch/x86/include/asm/alternative.h ---- linux-2.6.29.6/arch/x86/include/asm/alternative.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/alternative.h 2009-07-23 17:34:32.054707168 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/alternative.h linux-2.6.30.4/arch/x86/include/asm/alternative.h +--- linux-2.6.30.4/arch/x86/include/asm/alternative.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/alternative.h 2009-07-30 09:48:09.921498916 -0400 @@ -96,7 +96,7 @@ const unsigned char *const *find_nop_tab " .byte 662b-661b\n" /* sourcelen */ \ " .byte 664f-663f\n" /* replacementlen */ \ @@ -4190,9 +4326,30 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/alternative.h linux-2.6.29.6/arch "663:\n\t" newinstr "\n664:\n" /* replacement */ \ ".previous" : output : [feat] "i" (feature), ##input) -diff -urNp linux-2.6.29.6/arch/x86/include/asm/atomic_32.h linux-2.6.29.6/arch/x86/include/asm/atomic_32.h ---- linux-2.6.29.6/arch/x86/include/asm/atomic_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/atomic_32.h 2009-07-23 17:34:32.054707168 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/apm.h linux-2.6.30.4/arch/x86/include/asm/apm.h +--- linux-2.6.30.4/arch/x86/include/asm/apm.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/apm.h 2009-07-30 09:48:09.921498916 -0400 +@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 + __asm__ __volatile__(APM_DO_ZERO_SEGS + "pushl %%edi\n\t" + "pushl %%ebp\n\t" +- "lcall *%%cs:apm_bios_entry\n\t" ++ "lcall *%%ss:apm_bios_entry\n\t" + "setc %%al\n\t" + "popl %%ebp\n\t" + "popl %%edi\n\t" +@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_as + __asm__ __volatile__(APM_DO_ZERO_SEGS + "pushl %%edi\n\t" + "pushl %%ebp\n\t" +- "lcall *%%cs:apm_bios_entry\n\t" ++ "lcall *%%ss:apm_bios_entry\n\t" + "setc %%bl\n\t" + "popl %%ebp\n\t" + "popl %%edi\n\t" +diff -urNp linux-2.6.30.4/arch/x86/include/asm/atomic_32.h linux-2.6.30.4/arch/x86/include/asm/atomic_32.h +--- linux-2.6.30.4/arch/x86/include/asm/atomic_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/atomic_32.h 2009-07-30 09:48:09.921498916 -0400 @@ -39,7 +39,29 @@ */ static inline void atomic_add(int i, atomic_t *v) @@ -4435,9 +4592,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/atomic_32.h linux-2.6.29.6/arch/x } #define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0) -diff -urNp linux-2.6.29.6/arch/x86/include/asm/atomic_64.h linux-2.6.29.6/arch/x86/include/asm/atomic_64.h ---- linux-2.6.29.6/arch/x86/include/asm/atomic_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/atomic_64.h 2009-07-23 17:34:32.054707168 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/atomic_64.h linux-2.6.30.4/arch/x86/include/asm/atomic_64.h +--- linux-2.6.30.4/arch/x86/include/asm/atomic_64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/atomic_64.h 2009-07-30 09:48:09.922664908 -0400 @@ -38,7 +38,29 @@ */ static inline void atomic_add(int i, atomic_t *v) @@ -4893,11 +5050,11 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/atomic_64.h linux-2.6.29.6/arch/x } /** -diff -urNp linux-2.6.29.6/arch/x86/include/asm/boot.h linux-2.6.29.6/arch/x86/include/asm/boot.h ---- linux-2.6.29.6/arch/x86/include/asm/boot.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/boot.h 2009-07-23 17:34:32.055953640 -0400 -@@ -11,10 +11,15 @@ - #define ASK_VGA 0xfffd /* ask for it at bootup */ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/boot.h linux-2.6.30.4/arch/x86/include/asm/boot.h +--- linux-2.6.30.4/arch/x86/include/asm/boot.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/boot.h 2009-07-30 09:48:09.922664908 -0400 +@@ -9,10 +9,15 @@ + #ifdef __KERNEL__ /* Physical address where kernel should be loaded. */ -#define LOAD_PHYSICAL_ADDR ((CONFIG_PHYSICAL_START \ @@ -4910,12 +5067,12 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/boot.h linux-2.6.29.6/arch/x86/in +#define LOAD_PHYSICAL_ADDR ((unsigned long)__LOAD_PHYSICAL_ADDR) +#endif + - #ifdef CONFIG_X86_64 - #define BOOT_HEAP_SIZE 0x7000 - #define BOOT_STACK_SIZE 0x4000 -diff -urNp linux-2.6.29.6/arch/x86/include/asm/cache.h linux-2.6.29.6/arch/x86/include/asm/cache.h ---- linux-2.6.29.6/arch/x86/include/asm/cache.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/cache.h 2009-07-23 17:34:32.055953640 -0400 + #ifdef CONFIG_KERNEL_BZIP2 + #define BOOT_HEAP_SIZE 0x400000 + #else /* !CONFIG_KERNEL_BZIP2 */ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/cache.h linux-2.6.30.4/arch/x86/include/asm/cache.h +--- linux-2.6.30.4/arch/x86/include/asm/cache.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/cache.h 2009-07-30 09:48:09.923412137 -0400 @@ -6,6 +6,7 @@ #define L1_CACHE_BYTES (1 << L1_CACHE_SHIFT) @@ -4924,9 +5081,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/cache.h linux-2.6.29.6/arch/x86/i #ifdef CONFIG_X86_VSMP /* vSMP Internode cacheline shift */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/checksum_32.h linux-2.6.29.6/arch/x86/include/asm/checksum_32.h ---- linux-2.6.29.6/arch/x86/include/asm/checksum_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/checksum_32.h 2009-07-23 17:34:32.055953640 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/checksum_32.h linux-2.6.30.4/arch/x86/include/asm/checksum_32.h +--- linux-2.6.30.4/arch/x86/include/asm/checksum_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/checksum_32.h 2009-07-30 09:48:09.923412137 -0400 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene int len, __wsum sum, int *src_err_ptr, int *dst_err_ptr); @@ -4960,9 +5117,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/checksum_32.h linux-2.6.29.6/arch len, sum, NULL, err_ptr); if (len) -diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/include/asm/desc.h ---- linux-2.6.29.6/arch/x86/include/asm/desc.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/desc.h 2009-07-23 17:34:32.055953640 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/desc.h linux-2.6.30.4/arch/x86/include/asm/desc.h +--- linux-2.6.30.4/arch/x86/include/asm/desc.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/desc.h 2009-07-30 09:48:09.923412137 -0400 @@ -16,6 +16,7 @@ static inline void fill_ldt(struct desc_ desc->base1 = (info->base_addr & 0x00ff0000) >> 16; desc->type = (info->read_exec_only ^ 1) << 1; @@ -4980,7 +5137,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/in -struct gdt_page { - struct desc_struct gdt[GDT_ENTRIES]; -} __attribute__((aligned(PAGE_SIZE))); --DECLARE_PER_CPU(struct gdt_page, gdt_page); +-DECLARE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page); +extern gate_desc idt_table[256]; +extern struct desc_struct cpu_gdt_table[NR_CPUS][PAGE_SIZE / sizeof(struct desc_struct)]; @@ -4991,7 +5148,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/in } #ifdef CONFIG_X86_64 -@@ -115,19 +112,48 @@ static inline void paravirt_free_ldt(str +@@ -116,19 +113,48 @@ static inline void paravirt_free_ldt(str static inline void native_write_idt_entry(gate_desc *idt, int entry, const gate_desc *gate) { @@ -5040,7 +5197,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/in switch (type) { case DESC_TSS: size = sizeof(tss_desc); -@@ -139,7 +165,17 @@ static inline void native_write_gdt_entr +@@ -140,7 +166,17 @@ static inline void native_write_gdt_entr size = sizeof(struct desc_struct); break; } @@ -5058,7 +5215,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/in } static inline void pack_descriptor(struct desc_struct *desc, unsigned long base, -@@ -211,7 +247,19 @@ static inline void native_set_ldt(const +@@ -212,7 +248,19 @@ static inline void native_set_ldt(const static inline void native_load_tr_desc(void) { @@ -5078,7 +5235,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/in } static inline void native_load_gdt(const struct desc_ptr *dtr) -@@ -246,8 +294,19 @@ static inline void native_load_tls(struc +@@ -247,8 +295,19 @@ static inline void native_load_tls(struc unsigned int i; struct desc_struct *gdt = get_cpu_gdt_table(cpu); @@ -5098,7 +5255,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/in } #define _LDT_empty(info) \ -@@ -379,6 +438,18 @@ static inline void set_system_intr_gate_ +@@ -380,6 +439,18 @@ static inline void set_system_intr_gate_ _set_gate(n, GATE_INTERRUPT, addr, 0x3, ist, __KERNEL_CS); } @@ -5117,9 +5274,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/desc.h linux-2.6.29.6/arch/x86/in #else /* * GET_DESC_BASE reads the descriptor base of the specified segment. -diff -urNp linux-2.6.29.6/arch/x86/include/asm/e820.h linux-2.6.29.6/arch/x86/include/asm/e820.h ---- linux-2.6.29.6/arch/x86/include/asm/e820.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/e820.h 2009-07-23 17:34:32.055953640 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/e820.h linux-2.6.30.4/arch/x86/include/asm/e820.h +--- linux-2.6.30.4/arch/x86/include/asm/e820.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/e820.h 2009-07-30 09:48:09.924429298 -0400 @@ -135,7 +135,7 @@ extern char *memory_setup(void); #define ISA_END_ADDRESS 0x100000 #define is_ISA_range(s, e) ((s) >= ISA_START_ADDRESS && (e) < ISA_END_ADDRESS) @@ -5129,10 +5286,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/e820.h linux-2.6.29.6/arch/x86/in #define BIOS_END 0x00100000 #ifdef __KERNEL__ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/elf.h linux-2.6.29.6/arch/x86/include/asm/elf.h ---- linux-2.6.29.6/arch/x86/include/asm/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/elf.h 2009-07-23 17:34:32.056803140 -0400 -@@ -252,7 +252,25 @@ extern int force_personality32; +diff -urNp linux-2.6.30.4/arch/x86/include/asm/elf.h linux-2.6.30.4/arch/x86/include/asm/elf.h +--- linux-2.6.30.4/arch/x86/include/asm/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/elf.h 2009-07-30 09:48:09.927602624 -0400 +@@ -263,7 +263,25 @@ extern int force_personality32; the loader. We need to make sure that it is out of the way of the program that it will "exec", and that there is sufficient room for the brk. */ @@ -5158,7 +5315,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/elf.h linux-2.6.29.6/arch/x86/inc /* This yields a mask that user programs can use to figure out what instruction set this CPU supports. This could be done in user space, -@@ -304,8 +322,7 @@ do { \ +@@ -315,8 +333,7 @@ do { \ #define ARCH_DLINFO \ do { \ if (vdso_enabled) \ @@ -5168,7 +5325,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/elf.h linux-2.6.29.6/arch/x86/inc } while (0) #define AT_SYSINFO 32 -@@ -316,7 +333,7 @@ do { \ +@@ -327,7 +344,7 @@ do { \ #endif /* !CONFIG_X86_32 */ @@ -5177,7 +5334,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/elf.h linux-2.6.29.6/arch/x86/inc #define VDSO_ENTRY \ ((unsigned long)VDSO32_SYMBOL(VDSO_CURRENT_BASE, vsyscall)) -@@ -330,7 +347,4 @@ extern int arch_setup_additional_pages(s +@@ -341,7 +358,4 @@ extern int arch_setup_additional_pages(s extern int syscall32_setup_pages(struct linux_binprm *, int exstack); #define compat_arch_setup_additional_pages syscall32_setup_pages @@ -5185,9 +5342,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/elf.h linux-2.6.29.6/arch/x86/inc -#define arch_randomize_brk arch_randomize_brk - #endif /* _ASM_X86_ELF_H */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/futex.h linux-2.6.29.6/arch/x86/include/asm/futex.h ---- linux-2.6.29.6/arch/x86/include/asm/futex.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/futex.h 2009-07-23 17:34:32.056803140 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/futex.h linux-2.6.30.4/arch/x86/include/asm/futex.h +--- linux-2.6.30.4/arch/x86/include/asm/futex.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/futex.h 2009-07-30 09:48:09.927602624 -0400 @@ -11,6 +11,40 @@ #include <asm/processor.h> #include <asm/system.h> @@ -5299,9 +5456,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/futex.h linux-2.6.29.6/arch/x86/i : "memory" ); -diff -urNp linux-2.6.29.6/arch/x86/include/asm/i387.h linux-2.6.29.6/arch/x86/include/asm/i387.h ---- linux-2.6.29.6/arch/x86/include/asm/i387.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/i387.h 2009-07-23 17:34:32.056803140 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/i387.h linux-2.6.30.4/arch/x86/include/asm/i387.h +--- linux-2.6.30.4/arch/x86/include/asm/i387.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/i387.h 2009-07-30 09:48:09.927602624 -0400 @@ -203,13 +203,8 @@ static inline void restore_fpu(struct ta } @@ -5318,12 +5475,12 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/i387.h linux-2.6.29.6/arch/x86/in /* * These must be called with preempt disabled -diff -urNp linux-2.6.29.6/arch/x86/include/asm/io_64.h linux-2.6.29.6/arch/x86/include/asm/io_64.h ---- linux-2.6.29.6/arch/x86/include/asm/io_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/io_64.h 2009-07-23 17:34:32.056803140 -0400 -@@ -158,6 +158,17 @@ static inline void *phys_to_virt(unsigne - } - #endif +diff -urNp linux-2.6.30.4/arch/x86/include/asm/io_64.h linux-2.6.30.4/arch/x86/include/asm/io_64.h +--- linux-2.6.30.4/arch/x86/include/asm/io_64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/io_64.h 2009-07-30 09:48:09.927602624 -0400 +@@ -140,6 +140,17 @@ __OUTS(l) + + #include <linux/vmalloc.h> +#define ARCH_HAS_VALID_PHYS_ADDR_RANGE +static inline int valid_phys_addr_range (unsigned long addr, size_t count) @@ -5336,12 +5493,12 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/io_64.h linux-2.6.29.6/arch/x86/i + return (pfn + (count >> PAGE_SHIFT)) < (1 << (boot_cpu_data.x86_phys_bits - PAGE_SHIFT)) ? 1 : 0; +} + - /* - * Change "struct page" to physical address. - */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/irqflags.h linux-2.6.29.6/arch/x86/include/asm/irqflags.h ---- linux-2.6.29.6/arch/x86/include/asm/irqflags.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/irqflags.h 2009-07-23 17:34:32.056803140 -0400 + #include <asm-generic/iomap.h> + + void __memcpy_fromio(void *, unsigned long, unsigned); +diff -urNp linux-2.6.30.4/arch/x86/include/asm/irqflags.h linux-2.6.30.4/arch/x86/include/asm/irqflags.h +--- linux-2.6.30.4/arch/x86/include/asm/irqflags.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/irqflags.h 2009-07-30 09:48:09.928623877 -0400 @@ -141,6 +141,8 @@ static inline unsigned long __raw_local_ #define INTERRUPT_RETURN iret #define ENABLE_INTERRUPTS_SYSEXIT sti; sysexit @@ -5351,9 +5508,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/irqflags.h linux-2.6.29.6/arch/x8 #endif -diff -urNp linux-2.6.29.6/arch/x86/include/asm/kmap_types.h linux-2.6.29.6/arch/x86/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/x86/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/kmap_types.h 2009-07-23 17:34:32.056803140 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/kmap_types.h linux-2.6.30.4/arch/x86/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/x86/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/kmap_types.h 2009-07-30 09:48:09.928623877 -0400 @@ -21,7 +21,8 @@ D(9) KM_IRQ0, D(10) KM_IRQ1, D(11) KM_SOFTIRQ0, @@ -5364,10 +5521,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/kmap_types.h linux-2.6.29.6/arch/ }; #undef D -diff -urNp linux-2.6.29.6/arch/x86/include/asm/kvm_host.h linux-2.6.29.6/arch/x86/include/asm/kvm_host.h ---- linux-2.6.29.6/arch/x86/include/asm/kvm_host.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/kvm_host.h 2009-07-23 17:34:32.057848214 -0400 -@@ -494,7 +494,7 @@ struct kvm_x86_ops { +diff -urNp linux-2.6.30.4/arch/x86/include/asm/kvm_host.h linux-2.6.30.4/arch/x86/include/asm/kvm_host.h +--- linux-2.6.30.4/arch/x86/include/asm/kvm_host.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/kvm_host.h 2009-07-30 09:48:09.928623877 -0400 +@@ -529,7 +529,7 @@ struct kvm_x86_ops { int (*get_mt_mask_shift)(void); }; @@ -5376,36 +5533,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/kvm_host.h linux-2.6.29.6/arch/x8 int kvm_mmu_module_init(void); void kvm_mmu_module_exit(void); -diff -urNp linux-2.6.29.6/arch/x86/include/asm/linkage.h linux-2.6.29.6/arch/x86/include/asm/linkage.h ---- linux-2.6.29.6/arch/x86/include/asm/linkage.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/linkage.h 2009-07-23 17:34:32.057848214 -0400 -@@ -7,6 +7,11 @@ - #ifdef CONFIG_X86_64 - #define __ALIGN .p2align 4,,15 - #define __ALIGN_STR ".p2align 4,,15" -+#else -+#ifdef CONFIG_X86_ALIGNMENT_16 -+#define __ALIGN .align 16,0x90 -+#define __ALIGN_STR ".align 16,0x90" -+#endif - #endif - - #ifdef CONFIG_X86_32 -@@ -52,11 +57,6 @@ - - #endif - --#ifdef CONFIG_X86_ALIGNMENT_16 --#define __ALIGN .align 16,0x90 --#define __ALIGN_STR ".align 16,0x90" --#endif -- - /* - * to check ENTRY_X86/END_X86 and - * KPROBE_ENTRY_X86/KPROBE_END_X86 -diff -urNp linux-2.6.29.6/arch/x86/include/asm/local.h linux-2.6.29.6/arch/x86/include/asm/local.h ---- linux-2.6.29.6/arch/x86/include/asm/local.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/local.h 2009-07-23 17:34:32.057848214 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/local.h linux-2.6.30.4/arch/x86/include/asm/local.h +--- linux-2.6.30.4/arch/x86/include/asm/local.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/local.h 2009-07-30 09:48:09.929617473 -0400 @@ -18,26 +18,90 @@ typedef struct { static inline void local_inc(local_t *l) @@ -5630,30 +5760,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/local.h linux-2.6.29.6/arch/x86/i : "+r" (i), "+m" (l->a.counter) : : "memory"); return i + __i; -diff -urNp linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h ---- linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/mach-default/apm.h 2009-07-23 17:34:32.057848214 -0400 -@@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32 - __asm__ __volatile__(APM_DO_ZERO_SEGS - "pushl %%edi\n\t" - "pushl %%ebp\n\t" -- "lcall *%%cs:apm_bios_entry\n\t" -+ "lcall *%%ss:apm_bios_entry\n\t" - "setc %%al\n\t" - "popl %%ebp\n\t" - "popl %%edi\n\t" -@@ -58,7 +58,7 @@ static inline u8 apm_bios_call_simple_as - __asm__ __volatile__(APM_DO_ZERO_SEGS - "pushl %%edi\n\t" - "pushl %%ebp\n\t" -- "lcall *%%cs:apm_bios_entry\n\t" -+ "lcall *%%ss:apm_bios_entry\n\t" - "setc %%bl\n\t" - "popl %%ebp\n\t" - "popl %%edi\n\t" -diff -urNp linux-2.6.29.6/arch/x86/include/asm/mman.h linux-2.6.29.6/arch/x86/include/asm/mman.h ---- linux-2.6.29.6/arch/x86/include/asm/mman.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/mman.h 2009-07-23 17:34:32.058713430 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/mman.h linux-2.6.30.4/arch/x86/include/asm/mman.h +--- linux-2.6.30.4/arch/x86/include/asm/mman.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/mman.h 2009-07-30 09:48:09.929617473 -0400 @@ -17,4 +17,14 @@ #define MCL_CURRENT 1 /* lock all current mappings */ #define MCL_FUTURE 2 /* lock all future mappings */ @@ -5669,14 +5778,14 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/mman.h linux-2.6.29.6/arch/x86/in +#endif + #endif /* _ASM_X86_MMAN_H */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h ---- linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h 2009-07-23 17:34:32.058713430 -0400 -@@ -14,11 +14,15 @@ static inline void switch_mm(struct mm_s +diff -urNp linux-2.6.30.4/arch/x86/include/asm/mmu_context.h linux-2.6.30.4/arch/x86/include/asm/mmu_context.h +--- linux-2.6.30.4/arch/x86/include/asm/mmu_context.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/mmu_context.h 2009-07-30 09:48:09.929617473 -0400 +@@ -34,11 +34,17 @@ static inline void switch_mm(struct mm_s struct task_struct *tsk) { - int cpu = smp_processor_id(); -+#ifdef CONFIG_SMP + unsigned cpu = smp_processor_id(); ++#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) + int tlbstate = TLBSTATE_OK; +#endif @@ -5684,16 +5793,18 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.6/a /* stop flush ipis for the previous mm */ cpu_clear(cpu, prev->cpu_vm_mask); #ifdef CONFIG_SMP -+ tlbstate = x86_read_percpu(cpu_tlbstate.state); - x86_write_percpu(cpu_tlbstate.state, TLBSTATE_OK); - x86_write_percpu(cpu_tlbstate.active_mm, next); ++#ifdef CONFIG_X86_32 ++ tlbstate = percpu_read(cpu_tlbstate.state); ++#endif + percpu_write(cpu_tlbstate.state, TLBSTATE_OK); + percpu_write(cpu_tlbstate.active_mm, next); #endif -@@ -32,6 +36,26 @@ static inline void switch_mm(struct mm_s +@@ -52,6 +58,26 @@ static inline void switch_mm(struct mm_s */ if (unlikely(prev->context.ldt != next->context.ldt)) load_LDT_nolock(&next->context); + -+#if defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) && defined(CONFIG_SMP) + if (!nx_enabled) { + smp_mb__before_clear_bit(); + cpu_clear(cpu, prev->context.cpu_user_cs_mask); @@ -5702,7 +5813,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.6/a + } +#endif + -+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) + if (unlikely(prev->context.user_cs_base != next->context.user_cs_base || + prev->context.user_cs_limit != next->context.user_cs_limit +#ifdef CONFIG_SMP @@ -5715,17 +5826,17 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.6/a } #ifdef CONFIG_SMP else { -@@ -44,6 +68,19 @@ static inline void switch_mm(struct mm_s +@@ -65,6 +91,19 @@ static inline void switch_mm(struct mm_s */ load_cr3(next->pgd); load_LDT_nolock(&next->context); + -+#ifdef CONFIG_PAX_PAGEEXEC ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) + if (!nx_enabled) + cpu_set(cpu, next->context.cpu_user_cs_mask); +#endif + -+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++#if defined(CONFIG_X86_32) && (defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC)) +#ifdef CONFIG_PAX_PAGEEXEC + if (!((next->pax_flags & MF_PAX_PAGEEXEC) && nx_enabled)) +#endif @@ -5735,9 +5846,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu_context_32.h linux-2.6.29.6/a } } #endif -diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu.h linux-2.6.29.6/arch/x86/include/asm/mmu.h ---- linux-2.6.29.6/arch/x86/include/asm/mmu.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/mmu.h 2009-07-23 17:34:32.058713430 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/mmu.h linux-2.6.30.4/arch/x86/include/asm/mmu.h +--- linux-2.6.30.4/arch/x86/include/asm/mmu.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/mmu.h 2009-07-30 09:48:09.929617473 -0400 @@ -9,10 +9,23 @@ * we put the segment information here. */ @@ -5764,9 +5875,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/mmu.h linux-2.6.29.6/arch/x86/inc } mm_context_t; #ifdef CONFIG_SMP -diff -urNp linux-2.6.29.6/arch/x86/include/asm/module.h linux-2.6.29.6/arch/x86/include/asm/module.h ---- linux-2.6.29.6/arch/x86/include/asm/module.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/module.h 2009-07-23 17:34:32.058713430 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/module.h linux-2.6.30.4/arch/x86/include/asm/module.h +--- linux-2.6.30.4/arch/x86/include/asm/module.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/module.h 2009-07-30 11:10:48.877547128 -0400 @@ -74,7 +74,12 @@ struct mod_arch_specific {}; # else # define MODULE_STACKSIZE "" @@ -5781,10 +5892,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/module.h linux-2.6.29.6/arch/x86/ #endif #endif /* _ASM_X86_MODULE_H */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/page_32.h linux-2.6.29.6/arch/x86/include/asm/page_32.h ---- linux-2.6.29.6/arch/x86/include/asm/page_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/page_32.h 2009-07-23 17:34:32.058713430 -0400 -@@ -13,6 +13,23 @@ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/page_32_types.h linux-2.6.30.4/arch/x86/include/asm/page_32_types.h +--- linux-2.6.30.4/arch/x86/include/asm/page_32_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/page_32_types.h 2009-07-30 09:48:09.930625879 -0400 +@@ -15,6 +15,23 @@ */ #define __PAGE_OFFSET _AC(CONFIG_PAGE_OFFSET, UL) @@ -5808,10 +5919,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/page_32.h linux-2.6.29.6/arch/x86 #ifdef CONFIG_4KSTACKS #define THREAD_ORDER 0 #else -diff -urNp linux-2.6.29.6/arch/x86/include/asm/page_64.h linux-2.6.29.6/arch/x86/include/asm/page_64.h ---- linux-2.6.29.6/arch/x86/include/asm/page_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/page_64.h 2009-07-23 17:34:32.058713430 -0400 -@@ -49,6 +49,9 @@ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/page_64_types.h linux-2.6.30.4/arch/x86/include/asm/page_64_types.h +--- linux-2.6.30.4/arch/x86/include/asm/page_64_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/page_64_types.h 2009-07-30 09:48:09.930625879 -0400 +@@ -47,6 +47,9 @@ #define __START_KERNEL (__START_KERNEL_map + __PHYSICAL_START) #define __START_KERNEL_map _AC(0xffffffff80000000, UL) @@ -5821,18 +5932,11 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/page_64.h linux-2.6.29.6/arch/x86 /* See Documentation/x86_64/mm.txt for a description of the memory map. */ #define __PHYSICAL_MASK_SHIFT 46 #define __VIRTUAL_MASK_SHIFT 48 -@@ -101,5 +104,6 @@ extern void init_extra_mapping_wb(unsign - #define pfn_valid(pfn) ((pfn) < max_pfn) - #endif +diff -urNp linux-2.6.30.4/arch/x86/include/asm/paravirt.h linux-2.6.30.4/arch/x86/include/asm/paravirt.h +--- linux-2.6.30.4/arch/x86/include/asm/paravirt.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/paravirt.h 2009-07-30 09:48:09.931536832 -0400 +@@ -1688,7 +1688,7 @@ static inline unsigned long __raw_local_ -+#define nx_enabled (1) - - #endif /* _ASM_X86_PAGE_64_H */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/paravirt.h linux-2.6.29.6/arch/x86/include/asm/paravirt.h ---- linux-2.6.29.6/arch/x86/include/asm/paravirt.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/paravirt.h 2009-07-23 17:34:32.058713430 -0400 -@@ -1558,7 +1558,7 @@ static inline unsigned long __raw_local_ - #define PV_RESTORE_REGS popl %edx; popl %ecx; popl %edi; popl %eax #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4) -#define PARA_INDIRECT(addr) *%cs:addr @@ -5840,40 +5944,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/paravirt.h linux-2.6.29.6/arch/x8 #endif #define INTERRUPT_RETURN \ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/pda.h linux-2.6.29.6/arch/x86/include/asm/pda.h ---- linux-2.6.29.6/arch/x86/include/asm/pda.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/pda.h 2009-07-23 17:34:32.059930875 -0400 -@@ -16,11 +16,9 @@ struct x8664_pda { - unsigned long oldrsp; /* 24 user rsp for system call */ - int irqcount; /* 32 Irq nesting counter. Starts -1 */ - unsigned int cpunumber; /* 36 Logical CPU number */ --#ifdef CONFIG_CC_STACKPROTECTOR - unsigned long stack_canary; /* 40 stack canary value */ - /* gcc-ABI: this canary MUST be at - offset 40!!! */ --#endif - char *irqstackptr; - short nodenumber; /* number of current node (32k max) */ - short in_bootmem; /* pda lives in bootmem */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/percpu.h linux-2.6.29.6/arch/x86/include/asm/percpu.h ---- linux-2.6.29.6/arch/x86/include/asm/percpu.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/percpu.h 2009-07-23 17:34:32.059930875 -0400 -@@ -93,6 +93,12 @@ DECLARE_PER_CPU(struct x8664_pda, pda); - - #define __my_cpu_offset x86_read_percpu(this_cpu_off) - -+#include <asm-generic/sections.h> -+#include <linux/threads.h> -+#define __per_cpu_offset __per_cpu_offset -+extern unsigned long __per_cpu_offset[NR_CPUS]; -+#define per_cpu_offset(x) (__per_cpu_offset[x] + (unsigned long)__per_cpu_start) -+ - /* fs segment starts at (positive) offset == __per_cpu_offset[cpu] */ - #define __percpu_seg "%%fs:" - -diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgalloc.h linux-2.6.29.6/arch/x86/include/asm/pgalloc.h ---- linux-2.6.29.6/arch/x86/include/asm/pgalloc.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/pgalloc.h 2009-07-23 17:34:32.059930875 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/pgalloc.h linux-2.6.30.4/arch/x86/include/asm/pgalloc.h +--- linux-2.6.30.4/arch/x86/include/asm/pgalloc.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/pgalloc.h 2009-07-30 09:48:09.931536832 -0400 @@ -52,7 +52,7 @@ static inline void pmd_populate_kernel(s pmd_t *pmd, pte_t *pte) { @@ -5883,9 +5956,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgalloc.h linux-2.6.29.6/arch/x86 } static inline void pmd_populate(struct mm_struct *mm, pmd_t *pmd, -diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h ---- linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h 2009-07-23 17:34:32.059930875 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/pgtable-2level.h linux-2.6.30.4/arch/x86/include/asm/pgtable-2level.h +--- linux-2.6.30.4/arch/x86/include/asm/pgtable-2level.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/pgtable-2level.h 2009-07-30 09:48:09.931536832 -0400 @@ -18,7 +18,19 @@ static inline void native_set_pte(pte_t static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) @@ -5906,10 +5979,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable-2level.h linux-2.6.29.6/a } static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte) -diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h ---- linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h 2009-07-23 17:34:37.457730203 -0400 -@@ -25,8 +25,6 @@ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/pgtable_32.h linux-2.6.30.4/arch/x86/include/asm/pgtable_32.h +--- linux-2.6.30.4/arch/x86/include/asm/pgtable_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/pgtable_32.h 2009-07-30 09:48:09.932929020 -0400 +@@ -26,8 +26,6 @@ struct mm_struct; struct vm_area_struct; @@ -5918,8 +5991,8 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h linux-2.6.29.6/arch/ static inline void pgtable_cache_init(void) { } static inline void check_pgt_cache(void) { } void paging_init(void); -@@ -46,6 +44,12 @@ extern void set_pmd_pfn(unsigned long, u - # include <asm/pgtable-2level-defs.h> +@@ -48,6 +46,12 @@ extern void set_pmd_pfn(unsigned long, u + # include <asm/pgtable-2level.h> #endif +extern pgd_t swapper_pg_dir[PTRS_PER_PGD]; @@ -5928,19 +6001,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h linux-2.6.29.6/arch/ +#endif +extern pte_t swapper_pg_fixmap[PTRS_PER_PMD]; + - #define PGDIR_SIZE (1UL << PGDIR_SHIFT) - #define PGDIR_MASK (~(PGDIR_SIZE - 1)) - -@@ -83,7 +87,7 @@ extern void set_pmd_pfn(unsigned long, u - #undef TEST_ACCESS_OK - - /* The boot page tables (all created as a single array) */ --extern unsigned long pg0[]; -+extern pte_t pg0[]; - - #define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE)) - -@@ -166,6 +170,9 @@ do { \ + #if defined(CONFIG_HIGHPTE) + #define pte_offset_map(dir, address) \ + ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \ +@@ -80,6 +84,9 @@ do { \ #endif /* !__ASSEMBLY__ */ @@ -5950,10 +6014,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_32.h linux-2.6.29.6/arch/ /* * kern_addr_valid() is (1) for FLATMEM and (0) for * SPARSEMEM and DISCONTIGMEM -diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h ---- linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h 2009-07-23 17:34:32.060764502 -0400 -@@ -70,12 +70,36 @@ static inline void native_set_pte_atomic +diff -urNp linux-2.6.30.4/arch/x86/include/asm/pgtable-3level.h linux-2.6.30.4/arch/x86/include/asm/pgtable-3level.h +--- linux-2.6.30.4/arch/x86/include/asm/pgtable-3level.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/pgtable-3level.h 2009-07-30 09:48:09.931536832 -0400 +@@ -38,12 +38,36 @@ static inline void native_set_pte_atomic static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) { @@ -5990,10 +6054,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable-3level.h linux-2.6.29.6/a } /* -diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h ---- linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h 2009-07-23 17:34:32.060764502 -0400 -@@ -15,9 +15,12 @@ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/pgtable_64.h linux-2.6.30.4/arch/x86/include/asm/pgtable_64.h +--- linux-2.6.30.4/arch/x86/include/asm/pgtable_64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/pgtable_64.h 2009-07-30 09:48:09.932929020 -0400 +@@ -16,9 +16,12 @@ extern pud_t level3_kernel_pgt[512]; extern pud_t level3_ident_pgt[512]; @@ -6007,7 +6071,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h linux-2.6.29.6/arch/ extern pgd_t init_level4_pgt[]; #define swapper_pg_dir init_level4_pgt -@@ -106,7 +109,19 @@ static inline pte_t native_ptep_get_and_ +@@ -78,7 +81,19 @@ static inline pte_t native_ptep_get_and_ static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd) { @@ -6027,31 +6091,86 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable_64.h linux-2.6.29.6/arch/ } static inline void native_pmd_clear(pmd_t *pmd) -@@ -158,17 +173,17 @@ static inline void native_pgd_clear(pgd_ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/pgtable.h linux-2.6.30.4/arch/x86/include/asm/pgtable.h +--- linux-2.6.30.4/arch/x86/include/asm/pgtable.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/pgtable.h 2009-07-30 09:48:09.932929020 -0400 +@@ -87,6 +87,11 @@ static inline void __init paravirt_paget + * The following only work if pte_present() is true. + * Undefined behaviour if not.. + */ ++static inline int pte_user(pte_t pte) ++{ ++ return pte_val(pte) & _PAGE_USER; ++} ++ + static inline int pte_dirty(pte_t pte) + { + return pte_flags(pte) & _PAGE_DIRTY; +@@ -169,9 +174,29 @@ static inline pte_t pte_wrprotect(pte_t + return pte_clear_flags(pte, _PAGE_RW); + } - static inline int pgd_bad(pgd_t pgd) ++static inline pte_t pte_mkread(pte_t pte) ++{ ++ return __pte(pte_val(pte) | _PAGE_USER); ++} ++ + static inline pte_t pte_mkexec(pte_t pte) { -- return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE; -+ return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE; +- return pte_clear_flags(pte, _PAGE_NX); ++#ifdef CONFIG_X86_PAE ++ if (__supported_pte_mask & _PAGE_NX) ++ return pte_clear_flags(pte, _PAGE_NX); ++ else ++#endif ++ return pte_set_flags(pte, _PAGE_USER); ++} ++ ++static inline pte_t pte_exprotect(pte_t pte) ++{ ++#ifdef CONFIG_X86_PAE ++ if (__supported_pte_mask & _PAGE_NX) ++ return pte_set_flags(pte, _PAGE_NX); ++ else ++#endif ++ return pte_clear_flags(pte, _PAGE_USER); } - static inline int pud_bad(pud_t pud) + static inline pte_t pte_mkdirty(pte_t pte) +@@ -467,7 +492,7 @@ static inline pud_t *pud_offset(pgd_t *p + + static inline int pgd_bad(pgd_t pgd) { -- return (pud_val(pud) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE; -+ return (pud_val(pud) & ~(PTE_PFN_MASK | _PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE; +- return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE; ++ return (pgd_flags(pgd) & ~(_PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE; } - static inline int pmd_bad(pmd_t pmd) + static inline int pgd_none(pgd_t pgd) +@@ -606,7 +631,19 @@ static inline void ptep_set_wrprotect(st + */ + static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) { -- return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE; -+ return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER | _PAGE_NX)) != _KERNPG_TABLE; +- memcpy(dst, src, count * sizeof(pgd_t)); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ unsigned long cr0; ++ ++ pax_open_kernel(cr0); ++#endif ++ ++ memcpy(dst, src, count * sizeof(pgd_t)); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ pax_close_kernel(cr0); ++#endif ++ } - #define pte_none(x) (!pte_val((x))) -diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86/include/asm/pgtable.h ---- linux-2.6.29.6/arch/x86/include/asm/pgtable.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/pgtable.h 2009-07-23 17:35:05.043783588 -0400 -@@ -13,12 +13,11 @@ + +diff -urNp linux-2.6.30.4/arch/x86/include/asm/pgtable_types.h linux-2.6.30.4/arch/x86/include/asm/pgtable_types.h +--- linux-2.6.30.4/arch/x86/include/asm/pgtable_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/pgtable_types.h 2009-07-30 19:56:23.227966500 -0400 +@@ -16,12 +16,11 @@ #define _PAGE_BIT_PSE 7 /* 4 MB (or 2MB) page */ #define _PAGE_BIT_PAT 7 /* on 4KB pages */ #define _PAGE_BIT_GLOBAL 8 /* Global TLB entry PPro+ */ @@ -6066,7 +6185,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86 #define _PAGE_BIT_NX 63 /* No execute: only valid after cpuid check */ /* If _PAGE_BIT_PRESENT is clear, we use these: */ -@@ -36,7 +35,6 @@ +@@ -39,7 +38,6 @@ #define _PAGE_DIRTY (_AT(pteval_t, 1) << _PAGE_BIT_DIRTY) #define _PAGE_PSE (_AT(pteval_t, 1) << _PAGE_BIT_PSE) #define _PAGE_GLOBAL (_AT(pteval_t, 1) << _PAGE_BIT_GLOBAL) @@ -6074,7 +6193,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86 #define _PAGE_IOMAP (_AT(pteval_t, 1) << _PAGE_BIT_IOMAP) #define _PAGE_UNUSED3 (_AT(pteval_t, 1) << _PAGE_BIT_UNUSED3) #define _PAGE_PAT (_AT(pteval_t, 1) << _PAGE_BIT_PAT) -@@ -48,7 +46,7 @@ +@@ -51,7 +49,7 @@ #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) #define _PAGE_NX (_AT(pteval_t, 1) << _PAGE_BIT_NX) #else @@ -6083,7 +6202,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86 #endif #define _PAGE_FILE (_AT(pteval_t, 1) << _PAGE_BIT_FILE) -@@ -85,6 +83,9 @@ +@@ -88,6 +86,9 @@ #define PAGE_READONLY_EXEC __pgprot(_PAGE_PRESENT | _PAGE_USER | \ _PAGE_ACCESSED) @@ -6093,7 +6212,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86 #define __PAGE_KERNEL_EXEC \ (_PAGE_PRESENT | _PAGE_RW | _PAGE_DIRTY | _PAGE_ACCESSED | _PAGE_GLOBAL) #define __PAGE_KERNEL (__PAGE_KERNEL_EXEC | _PAGE_NX) -@@ -95,8 +96,8 @@ +@@ -98,8 +99,8 @@ #define __PAGE_KERNEL_WC (__PAGE_KERNEL | _PAGE_CACHE_WC) #define __PAGE_KERNEL_NOCACHE (__PAGE_KERNEL | _PAGE_PCD | _PAGE_PWT) #define __PAGE_KERNEL_UC_MINUS (__PAGE_KERNEL | _PAGE_PCD) @@ -6104,7 +6223,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86 #define __PAGE_KERNEL_LARGE (__PAGE_KERNEL | _PAGE_PSE) #define __PAGE_KERNEL_LARGE_NOCACHE (__PAGE_KERNEL | _PAGE_CACHE_UC | _PAGE_PSE) #define __PAGE_KERNEL_LARGE_EXEC (__PAGE_KERNEL_EXEC | _PAGE_PSE) -@@ -155,8 +156,8 @@ +@@ -158,8 +159,8 @@ * bits are combined, this will alow user to access the high address mapped * VDSO in the presence of CONFIG_COMPAT_VDSO */ @@ -6115,101 +6234,34 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/pgtable.h linux-2.6.29.6/arch/x86 #define PGD_IDENT_ATTR 0x001 /* PRESENT (no other attributes) */ #endif -@@ -183,10 +184,17 @@ extern unsigned long empty_zero_page[PAG - extern spinlock_t pgd_lock; - extern struct list_head pgd_list; - -+extern pteval_t __supported_pte_mask; -+ - /* - * The following only work if pte_present() is true. - * Undefined behaviour if not.. - */ -+static inline int pte_user(pte_t pte) -+{ -+ return pte_val(pte) & _PAGE_USER; -+} -+ - static inline int pte_dirty(pte_t pte) - { - return pte_flags(pte) & _PAGE_DIRTY; -@@ -255,9 +263,29 @@ static inline pte_t pte_wrprotect(pte_t - return __pte(pte_val(pte) & ~_PAGE_RW); - } +@@ -272,7 +273,11 @@ static inline pteval_t pte_flags(pte_t p + typedef struct page *pgtable_t; -+static inline pte_t pte_mkread(pte_t pte) -+{ -+ return __pte(pte_val(pte) | _PAGE_USER); -+} -+ - static inline pte_t pte_mkexec(pte_t pte) - { -- return __pte(pte_val(pte) & ~_PAGE_NX); -+#ifdef CONFIG_X86_PAE -+ if (__supported_pte_mask & _PAGE_NX) -+ return __pte(pte_val(pte) & ~(pteval_t)_PAGE_NX); -+ else -+#endif -+ return __pte(pte_val(pte) | _PAGE_USER); -+} -+ -+static inline pte_t pte_exprotect(pte_t pte) -+{ -+#ifdef CONFIG_X86_PAE -+ if (__supported_pte_mask & _PAGE_NX) -+ return __pte(pte_val(pte) | _PAGE_NX); -+ else -+#endif -+ return __pte(pte_val(pte) & ~_PAGE_USER); - } - - static inline pte_t pte_mkdirty(pte_t pte) -@@ -300,8 +328,6 @@ static inline pte_t pte_mkspecial(pte_t - return __pte(pte_val(pte) | _PAGE_SPECIAL); - } - --extern pteval_t __supported_pte_mask; -- - /* - * Mask out unsupported bits in a present pgprot. Non-present pgprots - * can use those bits for other purposes, so leave them be. -@@ -601,7 +627,19 @@ static inline void ptep_set_wrprotect(st - */ - static inline void clone_pgd_range(pgd_t *dst, pgd_t *src, int count) - { -- memcpy(dst, src, count * sizeof(pgd_t)); -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ unsigned long cr0; -+ -+ pax_open_kernel(cr0); -+#endif -+ -+ memcpy(dst, src, count * sizeof(pgd_t)); -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ pax_close_kernel(cr0); + extern pteval_t __supported_pte_mask; ++#ifdef CONFIG_X86_32 + extern int nx_enabled; ++#else ++#define nx_enabled (1) +#endif -+ - } - + extern void set_nx(void); -diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x86/include/asm/processor.h ---- linux-2.6.29.6/arch/x86/include/asm/processor.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/processor.h 2009-07-23 17:34:32.060764502 -0400 -@@ -275,7 +275,7 @@ struct tss_struct { + #define pgprot_writecombine pgprot_writecombine +diff -urNp linux-2.6.30.4/arch/x86/include/asm/processor.h linux-2.6.30.4/arch/x86/include/asm/processor.h +--- linux-2.6.30.4/arch/x86/include/asm/processor.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/processor.h 2009-07-30 09:48:09.933533479 -0400 +@@ -270,7 +270,7 @@ struct tss_struct { } ____cacheline_aligned; --DECLARE_PER_CPU(struct tss_struct, init_tss); +-DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss); +extern struct tss_struct init_tss[NR_CPUS]; /* * Save the original ist values for checking stack pointers during debugging -@@ -839,11 +839,20 @@ static inline void spin_lock_prefetch(co - * User space process size: 3GB (default). +@@ -866,8 +866,17 @@ static inline void spin_lock_prefetch(co */ #define TASK_SIZE PAGE_OFFSET + #define TASK_SIZE_MAX TASK_SIZE + +#ifdef CONFIG_PAX_SEGMEXEC +#define SEGMEXEC_TASK_SIZE (TASK_SIZE / 2) @@ -6224,12 +6276,8 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x +#define STACK_TOP_MAX TASK_SIZE #define INIT_THREAD { \ -- .sp0 = sizeof(init_stack) + (long)&init_stack, \ -+ .sp0 = sizeof(init_stack) + (long)&init_stack - 8, \ - .vm86_info = NULL, \ - .sysenter_cs = __KERNEL_CS, \ - .io_bitmap_ptr = NULL, \ -@@ -858,7 +867,7 @@ static inline void spin_lock_prefetch(co + .sp0 = sizeof(init_stack) + (long)&init_stack, \ +@@ -885,7 +894,7 @@ static inline void spin_lock_prefetch(co */ #define INIT_TSS { \ .x86_tss = { \ @@ -6238,7 +6286,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x .ss0 = __KERNEL_DS, \ .ss1 = __KERNEL_CS, \ .io_bitmap_base = INVALID_IO_BITMAP_OFFSET, \ -@@ -869,11 +878,7 @@ static inline void spin_lock_prefetch(co +@@ -896,11 +905,7 @@ static inline void spin_lock_prefetch(co extern unsigned long thread_saved_pc(struct task_struct *tsk); #define THREAD_SIZE_LONGS (THREAD_SIZE/sizeof(unsigned long)) @@ -6251,7 +6299,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x /* * The below -8 is to reserve 8 bytes on top of the ring0 stack. -@@ -888,7 +893,7 @@ extern unsigned long thread_saved_pc(str +@@ -915,7 +920,7 @@ extern unsigned long thread_saved_pc(str #define task_pt_regs(task) \ ({ \ struct pt_regs *__regs__; \ @@ -6260,7 +6308,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x __regs__ - 1; \ }) -@@ -904,7 +909,7 @@ extern unsigned long thread_saved_pc(str +@@ -931,7 +936,7 @@ extern unsigned long thread_saved_pc(str * space during mmap's. */ #define IA32_PAGE_OFFSET ((current->personality & ADDR_LIMIT_3GB) ? \ @@ -6268,8 +6316,8 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x + 0xc0000000 : 0xFFFFf000) #define TASK_SIZE (test_thread_flag(TIF_IA32) ? \ - IA32_PAGE_OFFSET : TASK_SIZE64) -@@ -941,6 +946,10 @@ extern void start_thread(struct pt_regs + IA32_PAGE_OFFSET : TASK_SIZE_MAX) +@@ -968,6 +973,10 @@ extern void start_thread(struct pt_regs */ #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) @@ -6280,9 +6328,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/processor.h linux-2.6.29.6/arch/x #define KSTK_EIP(task) (task_pt_regs(task)->ip) /* Get/set a process' ability to use the timestamp counter instruction */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/ptrace.h linux-2.6.29.6/arch/x86/include/asm/ptrace.h ---- linux-2.6.29.6/arch/x86/include/asm/ptrace.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/ptrace.h 2009-07-23 17:34:32.060764502 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/ptrace.h linux-2.6.30.4/arch/x86/include/asm/ptrace.h +--- linux-2.6.30.4/arch/x86/include/asm/ptrace.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/ptrace.h 2009-07-30 09:48:09.933533479 -0400 @@ -151,28 +151,29 @@ static inline unsigned long regs_return_ } @@ -6319,9 +6367,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/ptrace.h linux-2.6.29.6/arch/x86/ #endif } -diff -urNp linux-2.6.29.6/arch/x86/include/asm/reboot.h linux-2.6.29.6/arch/x86/include/asm/reboot.h ---- linux-2.6.29.6/arch/x86/include/asm/reboot.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/reboot.h 2009-07-23 17:34:32.060764502 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/reboot.h linux-2.6.30.4/arch/x86/include/asm/reboot.h +--- linux-2.6.30.4/arch/x86/include/asm/reboot.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/reboot.h 2009-07-30 09:48:09.933533479 -0400 @@ -18,7 +18,7 @@ extern struct machine_ops machine_ops; void native_machine_crash_shutdown(struct pt_regs *regs); @@ -6331,9 +6379,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/reboot.h linux-2.6.29.6/arch/x86/ typedef void (*nmi_shootdown_cb)(int, struct die_args*); void nmi_shootdown_cpus(nmi_shootdown_cb callback); -diff -urNp linux-2.6.29.6/arch/x86/include/asm/rwsem.h linux-2.6.29.6/arch/x86/include/asm/rwsem.h ---- linux-2.6.29.6/arch/x86/include/asm/rwsem.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/rwsem.h 2009-07-23 17:34:32.061944075 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/rwsem.h linux-2.6.30.4/arch/x86/include/asm/rwsem.h +--- linux-2.6.30.4/arch/x86/include/asm/rwsem.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/rwsem.h 2009-07-30 09:48:09.934667198 -0400 @@ -106,10 +106,26 @@ static inline void __down_read(struct rw { asm volatile("# beginning down_read\n\t" @@ -6566,10 +6614,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/rwsem.h linux-2.6.29.6/arch/x86/i : "+r" (tmp), "+m" (sem->count) : : "memory"); -diff -urNp linux-2.6.29.6/arch/x86/include/asm/segment.h linux-2.6.29.6/arch/x86/include/asm/segment.h ---- linux-2.6.29.6/arch/x86/include/asm/segment.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/segment.h 2009-07-23 17:34:32.061944075 -0400 -@@ -88,13 +88,19 @@ +diff -urNp linux-2.6.30.4/arch/x86/include/asm/segment.h linux-2.6.30.4/arch/x86/include/asm/segment.h +--- linux-2.6.30.4/arch/x86/include/asm/segment.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/segment.h 2009-07-30 09:48:09.934667198 -0400 +@@ -88,7 +88,7 @@ #define GDT_ENTRY_ESPFIX_SS (GDT_ENTRY_KERNEL_BASE + 14) #define __ESPFIX_SS (GDT_ENTRY_ESPFIX_SS * 8) @@ -6578,19 +6626,20 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/segment.h linux-2.6.29.6/arch/x86 #ifdef CONFIG_SMP #define __KERNEL_PERCPU (GDT_ENTRY_PERCPU * 8) #else - #define __KERNEL_PERCPU 0 +@@ -102,6 +102,12 @@ + #define __KERNEL_STACK_CANARY 0 #endif -+#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE + 16) ++#define GDT_ENTRY_PCIBIOS_CS (GDT_ENTRY_KERNEL_BASE + 17) +#define __PCIBIOS_CS (GDT_ENTRY_PCIBIOS_CS * 8) + -+#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE + 17) ++#define GDT_ENTRY_PCIBIOS_DS (GDT_ENTRY_KERNEL_BASE + 18) +#define __PCIBIOS_DS (GDT_ENTRY_PCIBIOS_DS * 8) + #define GDT_ENTRY_DOUBLEFAULT_TSS 31 /* -@@ -132,7 +138,7 @@ +@@ -139,7 +145,7 @@ */ /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */ @@ -6599,10 +6648,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/segment.h linux-2.6.29.6/arch/x86 #else -diff -urNp linux-2.6.29.6/arch/x86/include/asm/spinlock.h linux-2.6.29.6/arch/x86/include/asm/spinlock.h ---- linux-2.6.29.6/arch/x86/include/asm/spinlock.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/spinlock.h 2009-07-23 17:34:32.061944075 -0400 -@@ -311,18 +311,50 @@ static inline int __raw_write_can_lock(r +diff -urNp linux-2.6.30.4/arch/x86/include/asm/spinlock.h linux-2.6.30.4/arch/x86/include/asm/spinlock.h +--- linux-2.6.30.4/arch/x86/include/asm/spinlock.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/spinlock.h 2009-07-30 09:48:09.934667198 -0400 +@@ -249,18 +249,50 @@ static inline int __raw_write_can_lock(r static inline void __raw_read_lock(raw_rwlock_t *rw) { asm volatile(LOCK_PREFIX " subl $1,(%0)\n\t" @@ -6657,7 +6706,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/spinlock.h linux-2.6.29.6/arch/x8 ::LOCK_PTR_REG (rw), "i" (RW_LOCK_BIAS) : "memory"); } -@@ -349,12 +381,45 @@ static inline int __raw_write_trylock(ra +@@ -286,12 +318,45 @@ static inline int __raw_write_trylock(ra static inline void __raw_read_unlock(raw_rwlock_t *rw) { @@ -6705,30 +6754,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/spinlock.h linux-2.6.29.6/arch/x8 : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory"); } -diff -urNp linux-2.6.29.6/arch/x86/include/asm/system.h linux-2.6.29.6/arch/x86/include/asm/system.h ---- linux-2.6.29.6/arch/x86/include/asm/system.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/system.h 2009-07-23 17:34:37.457730203 -0400 -@@ -95,6 +95,8 @@ do { \ - ".globl thread_return\n" \ - "thread_return:\n\t" \ - "movq %%gs:%P[pda_pcurrent],%%rsi\n\t" \ -+ "movq %P[task_canary](%%rsi),%%r8\n\t" \ -+ "movq %%r8,%%gs:%P[pda_canary]\n\t" \ - "movq %P[thread_info](%%rsi),%%r8\n\t" \ - LOCK_PREFIX "btr %[tif_fork],%P[ti_flags](%%r8)\n\t" \ - "movq %%rax,%%rdi\n\t" \ -@@ -106,7 +108,9 @@ do { \ - [ti_flags] "i" (offsetof(struct thread_info, flags)), \ - [tif_fork] "i" (TIF_FORK), \ - [thread_info] "i" (offsetof(struct task_struct, stack)), \ -- [pda_pcurrent] "i" (offsetof(struct x8664_pda, pcurrent)) \ -+ [task_canary] "i" (offsetof(struct task_struct, stack_canary)), \ -+ [pda_pcurrent] "i" (offsetof(struct x8664_pda, pcurrent)), \ -+ [pda_canary] "i" (offsetof(struct x8664_pda, stack_canary))\ - : "memory", "cc" __EXTRA_CLOBBER) - #endif - -@@ -169,7 +173,7 @@ static inline unsigned long get_limit(un +diff -urNp linux-2.6.30.4/arch/x86/include/asm/system.h linux-2.6.30.4/arch/x86/include/asm/system.h +--- linux-2.6.30.4/arch/x86/include/asm/system.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/system.h 2009-07-30 09:48:09.935636803 -0400 +@@ -227,7 +227,7 @@ static inline unsigned long get_limit(un { unsigned long __limit; asm("lsll %1,%0" : "=r" (__limit) : "r" (segment)); @@ -6737,7 +6766,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/system.h linux-2.6.29.6/arch/x86/ } static inline void native_clts(void) -@@ -295,6 +299,23 @@ static inline void native_wbinvd(void) +@@ -353,6 +353,23 @@ static inline void native_wbinvd(void) #define stts() write_cr0(read_cr0() | X86_CR0_TS) @@ -6761,7 +6790,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/system.h linux-2.6.29.6/arch/x86/ #endif /* __KERNEL__ */ static inline void clflush(volatile void *__p) -@@ -309,7 +330,7 @@ void enable_hlt(void); +@@ -367,7 +384,7 @@ void enable_hlt(void); void cpu_idle_wait(void); @@ -6770,10 +6799,20 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/system.h linux-2.6.29.6/arch/x86/ extern void free_init_pages(char *what, unsigned long begin, unsigned long end); void default_idle(void); -diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h ---- linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h 2009-07-23 17:34:32.062941291 -0400 -@@ -62,6 +62,8 @@ __copy_to_user_inatomic(void __user *to, +diff -urNp linux-2.6.30.4/arch/x86/include/asm/uaccess_32.h linux-2.6.30.4/arch/x86/include/asm/uaccess_32.h +--- linux-2.6.30.4/arch/x86/include/asm/uaccess_32.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/uaccess_32.h 2009-07-30 09:48:09.936413079 -0400 +@@ -44,6 +44,9 @@ unsigned long __must_check __copy_from_u + static __always_inline unsigned long __must_check + __copy_to_user_inatomic(void __user *to, const void *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n)) { + unsigned long ret; + +@@ -62,6 +65,8 @@ __copy_to_user_inatomic(void __user *to, return ret; } } @@ -6782,7 +6821,28 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h linux-2.6.29.6/arch/ return __copy_to_user_ll(to, from, n); } -@@ -153,6 +155,8 @@ __copy_from_user(void *to, const void __ +@@ -89,6 +94,9 @@ __copy_to_user(void __user *to, const vo + static __always_inline unsigned long + __copy_from_user_inatomic(void *to, const void __user *from, unsigned long n) + { ++ if ((long)n < 0) ++ return n; ++ + /* Avoid zeroing the tail if the copy fails.. + * If 'n' is constant and 1, 2, or 4, we do still zero on a failure, + * but as the zeroing behaviour is only significant when n is not +@@ -138,6 +146,10 @@ static __always_inline unsigned long + __copy_from_user(void *to, const void __user *from, unsigned long n) + { + might_fault(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n)) { + unsigned long ret; + +@@ -153,6 +165,8 @@ __copy_from_user(void *to, const void __ return ret; } } @@ -6791,15 +6851,28 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h linux-2.6.29.6/arch/ return __copy_from_user_ll(to, from, n); } -@@ -185,11 +189,56 @@ __copy_from_user_inatomic_nocache(void * - return __copy_from_user_ll_nocache_nozero(to, from, n); - } +@@ -160,6 +174,10 @@ static __always_inline unsigned long __c + const void __user *from, unsigned long n) + { + might_fault(); ++ ++ if ((long)n < 0) ++ return n; ++ + if (__builtin_constant_p(n)) { + unsigned long ret; --unsigned long __must_check copy_to_user(void __user *to, -- const void *from, unsigned long n); --unsigned long __must_check copy_from_user(void *to, -- const void __user *from, -- unsigned long n); +@@ -182,14 +200,62 @@ static __always_inline unsigned long + __copy_from_user_inatomic_nocache(void *to, const void __user *from, + unsigned long n) + { +- return __copy_from_user_ll_nocache_nozero(to, from, n); ++ if ((long)n < 0) ++ return n; ++ ++ return __copy_from_user_ll_nocache_nozero(to, from, n); ++} ++ +/** + * copy_to_user: - Copy a block of data into user space. + * @to: Destination address, in user space. @@ -6848,14 +6921,19 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_32.h linux-2.6.29.6/arch/ + memset(to, 0, n); + } + return n; -+} -+ + } + +-unsigned long __must_check copy_to_user(void __user *to, +- const void *from, unsigned long n); +-unsigned long __must_check copy_from_user(void *to, +- const void __user *from, +- unsigned long n); long __must_check strncpy_from_user(char *dst, const char __user *src, long count); long __must_check __strncpy_from_user(char *dst, -diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h ---- linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h 2009-07-23 17:34:32.062941291 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/uaccess_64.h linux-2.6.30.4/arch/x86/include/asm/uaccess_64.h +--- linux-2.6.30.4/arch/x86/include/asm/uaccess_64.h 2009-07-30 20:32:40.365617606 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/uaccess_64.h 2009-07-30 20:32:47.927601167 -0400 @@ -10,6 +10,8 @@ #include <linux/lockdep.h> #include <asm/page.h> @@ -6865,7 +6943,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ /* * Copy To/From Userspace */ -@@ -19,20 +21,18 @@ __must_check unsigned long +@@ -19,20 +21,22 @@ __must_check unsigned long copy_user_generic(void *to, const void *from, unsigned len); __must_check unsigned long @@ -6884,6 +6962,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ might_fault(); - if (!__builtin_constant_p(size)) ++ ++ if ((int)size < 0) ++ return size; ++ + if (!__builtin_constant_p(size)) { + check_object_size(dst, size, false); return copy_user_generic(dst, (__force void *)src, size); @@ -6891,7 +6973,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ switch (size) { case 1:__get_user_asm(*(u8 *)dst, (u8 __user *)src, ret, "b", "b", "=q", 1); -@@ -70,13 +70,15 @@ int __copy_from_user(void *dst, const vo +@@ -70,13 +74,19 @@ int __copy_from_user(void *dst, const vo } static __always_inline __must_check @@ -6903,6 +6985,10 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ might_fault(); - if (!__builtin_constant_p(size)) ++ ++ if ((int)size < 0) ++ return size; ++ + if (!__builtin_constant_p(size)) { + check_object_size(src, size, true); return copy_user_generic((__force void *)dst, src, size); @@ -6910,13 +6996,14 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ switch (size) { case 1:__put_user_asm(*(u8 *)src, (u8 __user *)dst, ret, "b", "b", "iq", 1); -@@ -114,9 +116,30 @@ int __copy_to_user(void __user *dst, con +@@ -114,11 +124,39 @@ int __copy_to_user(void __user *dst, con } static __always_inline __must_check -int __copy_in_user(void __user *dst, const void __user *src, unsigned size) +unsigned long copy_to_user(void __user *to, const void *from, unsigned len) -+{ + { +- int ret = 0; + if (access_ok(VERIFY_WRITE, to, len)) + len = __copy_to_user(to, from, len); + return len; @@ -6925,6 +7012,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ +static __always_inline __must_check +unsigned long copy_from_user(void *to, const void __user *from, unsigned len) +{ ++ if ((int)len < 0) ++ return len; ++ + if (access_ok(VERIFY_READ, from, len)) + len = __copy_from_user(to, from, len); + else if ((int)len > 0) { @@ -6937,13 +7027,18 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ + +static __always_inline __must_check +unsigned long __copy_in_user(void __user *dst, const void __user *src, unsigned size) - { -- int ret = 0; ++{ + unsigned ret = 0; might_fault(); ++ ++ if ((int)size < 0) ++ return size; ++ if (!__builtin_constant_p(size)) -@@ -179,30 +202,30 @@ __must_check unsigned long __clear_user( + return copy_user_generic((__force void *)dst, + (__force void *)src, size); +@@ -179,30 +217,38 @@ __must_check unsigned long __clear_user( __must_check long __copy_from_user_inatomic(void *dst, const void __user *src, unsigned size); @@ -6951,6 +7046,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ +static __must_check __always_inline unsigned long __copy_to_user_inatomic(void __user *dst, const void *src, unsigned size) { ++ if ((int)size < 0) ++ return size; ++ return copy_user_generic((__force void *)dst, src, size); } @@ -6958,19 +7056,26 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ +extern unsigned long __copy_user_nocache(void *dst, const void __user *src, unsigned size, int zerorest); --static inline int __copy_from_user_nocache(void *dst, const void __user *src, -+static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, - unsigned size) +-static inline int +-__copy_from_user_nocache(void *dst, const void __user *src, unsigned size) ++static inline unsigned long __copy_from_user_nocache(void *dst, const void __user *src, unsigned size) { might_sleep(); ++ ++ if ((int)size < 0) ++ return size; ++ return __copy_user_nocache(dst, src, size, 1); } --static inline int __copy_from_user_inatomic_nocache(void *dst, -+static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, - const void __user *src, - unsigned size) +-static inline int +-__copy_from_user_inatomic_nocache(void *dst, const void __user *src, ++static inline unsigned long __copy_from_user_inatomic_nocache(void *dst, const void __user *src, + unsigned size) { ++ if ((int)size < 0) ++ return size; ++ return __copy_user_nocache(dst, src, size, 0); } @@ -6979,9 +7084,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess_64.h linux-2.6.29.6/arch/ copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest); #endif /* _ASM_X86_UACCESS_64_H */ -diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess.h linux-2.6.29.6/arch/x86/include/asm/uaccess.h ---- linux-2.6.29.6/arch/x86/include/asm/uaccess.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/uaccess.h 2009-07-23 17:34:32.062941291 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/uaccess.h linux-2.6.30.4/arch/x86/include/asm/uaccess.h +--- linux-2.6.30.4/arch/x86/include/asm/uaccess.h 2009-07-30 20:32:40.364705510 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/uaccess.h 2009-07-30 20:32:47.926577259 -0400 @@ -8,8 +8,10 @@ #include <linux/thread_info.h> #include <linux/prefetch.h> @@ -7009,7 +7114,7 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess.h linux-2.6.29.6/arch/x86 @@ -187,9 +194,12 @@ extern int __get_user_bad(void); #ifdef CONFIG_X86_32 - #define __put_user_u64(x, addr, err) \ + #define __put_user_asm_u64(x, addr, err, errret) \ - asm volatile("1: movl %%eax,0(%2)\n" \ - "2: movl %%edx,4(%2)\n" \ + asm volatile(" movw %w5,%%ds\n" \ @@ -7025,13 +7130,13 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess.h linux-2.6.29.6/arch/x86 _ASM_EXTABLE(1b, 4b) \ _ASM_EXTABLE(2b, 4b) \ : "=r" (err) \ -- : "A" (x), "r" (addr), "i" (-EFAULT), "0" (err)) -+ : "A" (x), "r" (addr), "i" (-EFAULT), "0" (err), \ +- : "A" (x), "r" (addr), "i" (errret), "0" (err)) ++ : "A" (x), "r" (addr), "i" (errret), "0" (err), \ + "r"(__USER_DS)) - #define __put_user_x8(x, ptr, __ret_pu) \ - asm volatile("call __put_user_8" : "=a" (__ret_pu) \ -@@ -338,6 +349,22 @@ do { \ + #define __put_user_asm_ex_u64(x, addr) \ + asm volatile("1: movl %%eax,0(%1)\n" \ +@@ -373,6 +384,22 @@ do { \ } \ } while (0) @@ -7054,15 +7159,38 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess.h linux-2.6.29.6/arch/x86 #define __get_user_asm(x, addr, err, itype, rtype, ltype, errret) \ asm volatile("1: mov"itype" %2,%"rtype"1\n" \ "2:\n" \ -@@ -349,6 +376,7 @@ do { \ +@@ -384,6 +411,7 @@ do { \ _ASM_EXTABLE(1b, 3b) \ : "=r" (err), ltype(x) \ : "m" (__m(addr)), "i" (errret), "0" (err)) +#endif + #define __get_user_size_ex(x, ptr, size) \ + do { \ +@@ -406,11 +434,22 @@ do { \ + } \ + } while (0) + ++#ifdef CONFIG_X86_32 ++#define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ ++ asm volatile(" movw %w2,%%ds\n" \ ++ "1: mov"itype" %%ds:%1,%"rtype"0\n" \ ++ "2:\n" \ ++ " pushl %%ss\n" \ ++ " popl %%ds\n" \ ++ _ASM_EXTABLE(1b, 2b - 1b) \ ++ : ltype(x) : "m" (__m(addr)), "r"(__USER_DS)) ++#else + #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ + asm volatile("1: mov"itype" %1,%"rtype"0\n" \ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : ltype(x) : "m" (__m(addr))) ++#endif + #define __put_user_nocheck(x, ptr, size) \ ({ \ -@@ -375,6 +403,22 @@ struct __large_struct { unsigned long bu +@@ -437,6 +476,22 @@ struct __large_struct { unsigned long bu * we do not write to any memory gcc knows about, so there are no * aliasing issues. */ @@ -7085,15 +7213,32 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess.h linux-2.6.29.6/arch/x86 #define __put_user_asm(x, addr, err, itype, rtype, ltype, errret) \ asm volatile("1: mov"itype" %"rtype"1,%2\n" \ "2:\n" \ -@@ -385,6 +429,7 @@ struct __large_struct { unsigned long bu +@@ -447,12 +502,24 @@ struct __large_struct { unsigned long bu _ASM_EXTABLE(1b, 3b) \ : "=r"(err) \ : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err)) +#endif - /** - * __get_user: - Get a simple variable from user space, with less checking. - * @x: Variable to store result. -@@ -445,6 +490,7 @@ extern struct movsl_mask { + ++#ifdef CONFIG_X86_32 ++#define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ ++ asm volatile(" movw %w2,%%ds\n" \ ++ "1: mov"itype" %"rtype"0,%%ds:%1\n" \ ++ "2:\n" \ ++ " pushl %%ss\n" \ ++ " popl %%ds\n" \ ++ _ASM_EXTABLE(1b, 2b - 1b) \ ++ : : ltype(x), "m" (__m(addr)), "r"(__USER_DS)) ++#else + #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ + asm volatile("1: mov"itype" %"rtype"0,%1\n" \ + "2:\n" \ + _ASM_EXTABLE(1b, 2b - 1b) \ + : : ltype(x), "m" (__m(addr))) ++#endif + + /* + * uaccess_try and catch +@@ -567,6 +634,7 @@ extern struct movsl_mask { #define ARCH_HAS_NOCACHE_UACCESS 1 @@ -7101,9 +7246,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/uaccess.h linux-2.6.29.6/arch/x86 #ifdef CONFIG_X86_32 # include "uaccess_32.h" #else -diff -urNp linux-2.6.29.6/arch/x86/include/asm/vgtod.h linux-2.6.29.6/arch/x86/include/asm/vgtod.h ---- linux-2.6.29.6/arch/x86/include/asm/vgtod.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/vgtod.h 2009-07-23 17:34:32.062941291 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/vgtod.h linux-2.6.30.4/arch/x86/include/asm/vgtod.h +--- linux-2.6.30.4/arch/x86/include/asm/vgtod.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/vgtod.h 2009-07-30 09:48:09.936413079 -0400 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data { int sysctl_enabled; struct timezone sys_tz; @@ -7112,9 +7257,9 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/vgtod.h linux-2.6.29.6/arch/x86/i cycle_t (*vread)(void); cycle_t cycle_last; cycle_t mask; -diff -urNp linux-2.6.29.6/arch/x86/include/asm/vsyscall.h linux-2.6.29.6/arch/x86/include/asm/vsyscall.h ---- linux-2.6.29.6/arch/x86/include/asm/vsyscall.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/include/asm/vsyscall.h 2009-07-23 17:34:32.062941291 -0400 +diff -urNp linux-2.6.30.4/arch/x86/include/asm/vsyscall.h linux-2.6.30.4/arch/x86/include/asm/vsyscall.h +--- linux-2.6.30.4/arch/x86/include/asm/vsyscall.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/include/asm/vsyscall.h 2009-07-30 09:48:09.937413620 -0400 @@ -15,9 +15,10 @@ enum vsyscall_num { #ifdef __KERNEL__ @@ -7145,10 +7290,50 @@ diff -urNp linux-2.6.29.6/arch/x86/include/asm/vsyscall.h linux-2.6.29.6/arch/x8 #endif /* __KERNEL__ */ #endif /* _ASM_X86_VSYSCALL_H */ -diff -urNp linux-2.6.29.6/arch/x86/Kconfig linux-2.6.29.6/arch/x86/Kconfig ---- linux-2.6.29.6/arch/x86/Kconfig 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/Kconfig 2009-07-23 17:34:32.063803736 -0400 -@@ -993,7 +993,7 @@ config PAGE_OFFSET +diff -urNp linux-2.6.30.4/arch/x86/Kconfig linux-2.6.30.4/arch/x86/Kconfig +--- linux-2.6.30.4/arch/x86/Kconfig 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/Kconfig 2009-08-04 17:52:34.387861424 -0400 +@@ -345,6 +345,7 @@ config X86_VSMP + select PARAVIRT + depends on X86_64 && PCI + depends on X86_EXTENDED_PLATFORM ++ depends on !PAX_KERNEXEC + ---help--- + Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is + supposed to run on these EM64T-based machines. Only choose this option +@@ -464,6 +465,7 @@ config VMI + bool "VMI Guest support" + select PARAVIRT + depends on X86_32 ++ depends on !PAX_KERNEXEC + ---help--- + VMI provides a paravirtualized interface to the VMware ESX server + (it could be used by other hypervisors in theory too, but is not +@@ -474,6 +476,7 @@ config KVM_CLOCK + bool "KVM paravirtualized clock" + select PARAVIRT + select PARAVIRT_CLOCK ++ depends on !PAX_KERNEXEC + ---help--- + Turning on this option will allow you to run a paravirtualized clock + when running over the KVM hypervisor. Instead of relying on a PIT +@@ -484,6 +487,7 @@ config KVM_CLOCK + config KVM_GUEST + bool "KVM Guest support" + select PARAVIRT ++ depends on !PAX_KERNEXEC + ---help--- + This option enables various optimizations for running under the KVM + hypervisor. +@@ -492,6 +496,7 @@ source "arch/x86/lguest/Kconfig" + + config PARAVIRT + bool "Enable paravirtualization code" ++ depends on !PAX_KERNEXEC + ---help--- + This changes the kernel so it can modify itself when it is run + under a hypervisor, potentially improving performance significantly +@@ -1058,7 +1063,7 @@ config PAGE_OFFSET hex default 0xB0000000 if VMSPLIT_3G_OPT default 0x80000000 if VMSPLIT_2G @@ -7157,32 +7342,52 @@ diff -urNp linux-2.6.29.6/arch/x86/Kconfig linux-2.6.29.6/arch/x86/Kconfig default 0x40000000 if VMSPLIT_1G default 0xC0000000 depends on X86_32 -@@ -1408,8 +1408,7 @@ config KEXEC_JUMP +@@ -1376,7 +1381,7 @@ config X86_PAT + + config EFI + bool "EFI runtime service support" +- depends on ACPI ++ depends on ACPI && !PAX_KERNEXEC + ---help--- + This enables the kernel to use EFI runtime services that are + available (such as the EFI variable services). +@@ -1466,9 +1471,7 @@ config KEXEC_JUMP + config PHYSICAL_START hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP) - default "0x1000000" if X86_NUMAQ +- default "0x1000000" if X86_NUMAQ - default "0x200000" if X86_64 - default "0x100000" -+ default "0x200000" - help ++ default "0x1000000" + ---help--- This gives the physical address where the kernel is loaded. -@@ -1501,9 +1500,9 @@ config HOTPLUG_CPU +@@ -1527,8 +1530,7 @@ config RELOCATABLE + config PHYSICAL_ALIGN + hex + prompt "Alignment value to which kernel should be aligned" if X86_32 +- default "0x100000" if X86_32 +- default "0x200000" if X86_64 ++ default "0x200000" + range 0x2000 0x400000 + ---help--- + This value puts the alignment restrictions on physical address +@@ -1560,9 +1562,10 @@ config HOTPLUG_CPU Say N if you want to disable CPU hotplug. config COMPAT_VDSO - def_bool y + def_bool n prompt "Compat VDSO support" -- depends on X86_32 || IA32_EMULATION -+ depends on (X86_32 || IA32_EMULATION) && !PAX_NOEXEC - help + depends on X86_32 || IA32_EMULATION ++ depends on !PAX_NOEXEC && !PAX_MEMORY_UDEREF + ---help--- Map the 32-bit VDSO to the predictable old-style address too. ---help--- -diff -urNp linux-2.6.29.6/arch/x86/Kconfig.cpu linux-2.6.29.6/arch/x86/Kconfig.cpu ---- linux-2.6.29.6/arch/x86/Kconfig.cpu 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/Kconfig.cpu 2009-07-23 17:34:32.063803736 -0400 -@@ -333,7 +333,7 @@ config X86_PPRO_FENCE +diff -urNp linux-2.6.30.4/arch/x86/Kconfig.cpu linux-2.6.30.4/arch/x86/Kconfig.cpu +--- linux-2.6.30.4/arch/x86/Kconfig.cpu 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/Kconfig.cpu 2009-07-30 09:48:09.916592662 -0400 +@@ -331,7 +331,7 @@ config X86_PPRO_FENCE config X86_F00F_BUG def_bool y @@ -7191,7 +7396,7 @@ diff -urNp linux-2.6.29.6/arch/x86/Kconfig.cpu linux-2.6.29.6/arch/x86/Kconfig.c config X86_WP_WORKS_OK def_bool y -@@ -353,7 +353,7 @@ config X86_POPAD_OK +@@ -351,7 +351,7 @@ config X86_POPAD_OK config X86_ALIGNMENT_16 def_bool y @@ -7200,7 +7405,7 @@ diff -urNp linux-2.6.29.6/arch/x86/Kconfig.cpu linux-2.6.29.6/arch/x86/Kconfig.c config X86_INTEL_USERCOPY def_bool y -@@ -399,7 +399,7 @@ config X86_CMPXCHG64 +@@ -397,7 +397,7 @@ config X86_CMPXCHG64 # generates cmov. config X86_CMOV def_bool y @@ -7209,22 +7414,22 @@ diff -urNp linux-2.6.29.6/arch/x86/Kconfig.cpu linux-2.6.29.6/arch/x86/Kconfig.c config X86_MINIMUM_CPU_FAMILY int -diff -urNp linux-2.6.29.6/arch/x86/Kconfig.debug linux-2.6.29.6/arch/x86/Kconfig.debug ---- linux-2.6.29.6/arch/x86/Kconfig.debug 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/Kconfig.debug 2009-07-23 17:34:32.063803736 -0400 -@@ -107,7 +107,7 @@ config X86_PTDUMP +diff -urNp linux-2.6.30.4/arch/x86/Kconfig.debug linux-2.6.30.4/arch/x86/Kconfig.debug +--- linux-2.6.30.4/arch/x86/Kconfig.debug 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/Kconfig.debug 2009-07-30 09:48:09.916592662 -0400 +@@ -99,7 +99,7 @@ config X86_PTDUMP config DEBUG_RODATA bool "Write protect kernel read-only data structures" default y - depends on DEBUG_KERNEL + depends on DEBUG_KERNEL && BROKEN - help + ---help--- Mark the kernel read-only data as write-protected in the pagetables, in order to catch accidental (and incorrect) writes to such const -diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/boot.c linux-2.6.29.6/arch/x86/kernel/acpi/boot.c ---- linux-2.6.29.6/arch/x86/kernel/acpi/boot.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/acpi/boot.c 2009-07-23 17:34:32.064889971 -0400 -@@ -1705,7 +1705,7 @@ static struct dmi_system_id __initdata a +diff -urNp linux-2.6.30.4/arch/x86/kernel/acpi/boot.c linux-2.6.30.4/arch/x86/kernel/acpi/boot.c +--- linux-2.6.30.4/arch/x86/kernel/acpi/boot.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/acpi/boot.c 2009-07-30 09:48:09.938432163 -0400 +@@ -1737,7 +1737,7 @@ static struct dmi_system_id __initdata a DMI_MATCH(DMI_PRODUCT_NAME, "HP Compaq 6715b"), }, }, @@ -7233,9 +7438,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/boot.c linux-2.6.29.6/arch/x86/ke }; /* -diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S ---- linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S 2009-07-23 17:34:32.064889971 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.30.4/arch/x86/kernel/acpi/realmode/wakeup.S +--- linux-2.6.30.4/arch/x86/kernel/acpi/realmode/wakeup.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/acpi/realmode/wakeup.S 2009-07-30 09:48:09.938432163 -0400 @@ -104,7 +104,7 @@ _start: movl %eax, %ecx orl %edx, %ecx @@ -7245,9 +7450,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/realmode/wakeup.S linux-2.6.29.6/ wrmsr 1: -diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c ---- linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c 2009-07-23 17:34:32.064889971 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/acpi/sleep.c linux-2.6.30.4/arch/x86/kernel/acpi/sleep.c +--- linux-2.6.30.4/arch/x86/kernel/acpi/sleep.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/acpi/sleep.c 2009-07-30 09:48:09.938432163 -0400 @@ -11,11 +11,12 @@ #include <linux/cpumask.h> #include <asm/segment.h> @@ -7289,10 +7494,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c linux-2.6.29.6/arch/x86/k + pax_close_kernel(cr0); +#endif + + initial_gs = per_cpu_offset(smp_processor_id()); #endif initial_code = (unsigned long)wakeup_long64; - saved_magic = 0x123456789abcdef0; -@@ -133,14 +148,8 @@ void __init acpi_reserve_bootmem(void) +@@ -134,14 +149,8 @@ void __init acpi_reserve_bootmem(void) return; } @@ -7309,9 +7514,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/sleep.c linux-2.6.29.6/arch/x86/k } -diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S ---- linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S 2009-07-23 17:34:32.064889971 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.30.4/arch/x86/kernel/acpi/wakeup_32.S +--- linux-2.6.30.4/arch/x86/kernel/acpi/wakeup_32.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/acpi/wakeup_32.S 2009-07-30 09:48:09.938432163 -0400 @@ -30,13 +30,11 @@ wakeup_pmode_return: # and restore the stack ... but you need gdt for this to work movl saved_context_esp, %esp @@ -7328,10 +7533,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/acpi/wakeup_32.S linux-2.6.29.6/arch/x bogus_magic: jmp bogus_magic -diff -urNp linux-2.6.29.6/arch/x86/kernel/alternative.c linux-2.6.29.6/arch/x86/kernel/alternative.c ---- linux-2.6.29.6/arch/x86/kernel/alternative.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/alternative.c 2009-07-23 17:34:32.064889971 -0400 -@@ -393,7 +393,7 @@ void apply_paravirt(struct paravirt_patc +diff -urNp linux-2.6.30.4/arch/x86/kernel/alternative.c linux-2.6.30.4/arch/x86/kernel/alternative.c +--- linux-2.6.30.4/arch/x86/kernel/alternative.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/alternative.c 2009-07-30 09:48:09.939725122 -0400 +@@ -400,7 +400,7 @@ void apply_paravirt(struct paravirt_patc BUG_ON(p->len > MAX_PATCH_LEN); /* prep the buffer with the original instructions */ @@ -7340,7 +7545,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/alternative.c linux-2.6.29.6/arch/x86/ used = pv_init_ops.patch(p->instrtype, p->clobbers, insnbuf, (unsigned long)p->instr, p->len); -@@ -473,11 +473,26 @@ void __init alternative_instructions(voi +@@ -485,11 +485,26 @@ void __init alternative_instructions(voi * instructions. And on the local CPU you need to be protected again NMI or MCE * handlers seeing an inconsistent instruction while you patch. */ @@ -7369,13 +7574,12 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/alternative.c linux-2.6.29.6/arch/x86/ local_irq_restore(flags); sync_core(); /* Could also do a CLFLUSH here to speed up CPU recovery; but -@@ -498,33 +513,27 @@ void *text_poke_early(void *addr, const +@@ -512,35 +527,27 @@ void *text_poke_early(void *addr, const */ void *__kprobes text_poke(void *addr, const void *opcode, size_t len) { - unsigned long flags; - char *vaddr; -- int nr_pages = 2; + unsigned char *vaddr = ktla_ktva(addr); struct page *pages[2]; - int i; @@ -7401,26 +7605,29 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/alternative.c linux-2.6.29.6/arch/x86/ + pages[1] = virt_to_page(vaddr + PAGE_SIZE); } BUG_ON(!pages[0]); -- if (!pages[1]) -- nr_pages = 1; -- vaddr = vmap(pages, nr_pages, VM_MAP, PAGE_KERNEL); -- BUG_ON(!vaddr); - local_irq_save(flags); +- set_fixmap(FIX_TEXT_POKE0, page_to_phys(pages[0])); +- if (pages[1]) +- set_fixmap(FIX_TEXT_POKE1, page_to_phys(pages[1])); +- vaddr = (char *)fix_to_virt(FIX_TEXT_POKE0); - memcpy(&vaddr[(unsigned long)addr & ~PAGE_MASK], opcode, len); -- local_irq_restore(flags); -- vunmap(vaddr); +- clear_fixmap(FIX_TEXT_POKE0); +- if (pages[1]) +- clear_fixmap(FIX_TEXT_POKE1); +- local_flush_tlb(); - sync_core(); - /* Could also do a CLFLUSH here to speed up CPU recovery; but - that causes hangs on some VIA CPUs. */ + text_poke_early(addr, opcode, len); for (i = 0; i < len; i++) - BUG_ON(((char *)addr)[i] != ((char *)opcode)[i]); -+ BUG_ON((vaddr)[i] != ((unsigned char *)opcode)[i]); +- local_irq_restore(flags); ++ BUG_ON(((char *)vaddr)[i] != ((char *)opcode)[i]); return addr; } -diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kernel/apm_32.c ---- linux-2.6.29.6/arch/x86/kernel/apm_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/apm_32.c 2009-07-23 17:34:32.065870632 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/apm_32.c linux-2.6.30.4/arch/x86/kernel/apm_32.c +--- linux-2.6.30.4/arch/x86/kernel/apm_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/apm_32.c 2009-07-30 09:48:09.939725122 -0400 @@ -403,7 +403,7 @@ static DECLARE_WAIT_QUEUE_HEAD(apm_waitq static DECLARE_WAIT_QUEUE_HEAD(apm_suspend_waitqueue); static struct apm_user *user_list; @@ -7430,17 +7637,16 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne static const char driver_version[] = "1.16ac"; /* no spaces */ -@@ -598,19 +598,42 @@ static u8 apm_bios_call(u32 func, u32 eb - struct desc_struct save_desc_40; +@@ -576,12 +576,25 @@ static long __apm_bios_call(void *_call) struct desc_struct *gdt; + struct apm_bios_call *call = _call; +#ifdef CONFIG_PAX_KERNEXEC + unsigned long cr0; +#endif + - cpus = apm_save_cpus(); - cpu = get_cpu(); + BUG_ON(cpu != 0); gdt = get_cpu_gdt_table(cpu); save_desc_40 = gdt[0x40 / 8]; + @@ -7456,7 +7662,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne + apm_irq_save(flags); APM_DO_SAVE_SEGS; - apm_bios_call_asm(func, ebx_in, ecx_in, eax, ebx, ecx, edx, esi); + apm_bios_call_asm(call->func, call->ebx, call->ecx, +@@ -589,7 +602,17 @@ static long __apm_bios_call(void *_call) + &call->esi); APM_DO_RESTORE_SEGS; apm_irq_restore(flags); + @@ -7471,19 +7679,18 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne +#endif + put_cpu(); - apm_restore_cpus(cpus); -@@ -641,19 +664,42 @@ static u8 apm_bios_call_simple(u32 func, - struct desc_struct save_desc_40; + return call->eax & 0xff; +@@ -652,19 +675,42 @@ static long __apm_bios_call_simple(void struct desc_struct *gdt; + struct apm_bios_call *call = _call; +#ifdef CONFIG_PAX_KERNEXEC + unsigned long cr0; +#endif + - cpus = apm_save_cpus(); - cpu = get_cpu(); + BUG_ON(cpu != 0); gdt = get_cpu_gdt_table(cpu); save_desc_40 = gdt[0x40 / 8]; + @@ -7499,7 +7706,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne + apm_irq_save(flags); APM_DO_SAVE_SEGS; - error = apm_bios_call_simple_asm(func, ebx_in, ecx_in, eax); + error = apm_bios_call_simple_asm(call->func, call->ebx, call->ecx, + &call->eax); APM_DO_RESTORE_SEGS; apm_irq_restore(flags); + @@ -7514,9 +7722,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne +#endif + put_cpu(); - apm_restore_cpus(cpus); return error; -@@ -925,7 +971,7 @@ recalc: + } +@@ -967,7 +1013,7 @@ recalc: static void apm_power_off(void) { @@ -7525,7 +7733,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne 0xb8, 0x00, 0x10, /* movw $0x1000,ax */ 0x8e, 0xd0, /* movw ax,ss */ 0xbc, 0x00, 0xf0, /* movw $0xf000,sp */ -@@ -1876,7 +1922,10 @@ static const struct file_operations apm_ +@@ -1925,7 +1971,10 @@ static const struct file_operations apm_ static struct miscdevice apm_device = { APM_MINOR_DEV, "apm_bios", @@ -7537,7 +7745,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne }; -@@ -2197,7 +2246,7 @@ static struct dmi_system_id __initdata a +@@ -2246,7 +2295,7 @@ static struct dmi_system_id __initdata a { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, }, @@ -7546,7 +7754,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne }; /* -@@ -2215,6 +2264,10 @@ static int __init apm_init(void) +@@ -2264,6 +2313,10 @@ static int __init apm_init(void) struct desc_struct *gdt; int err; @@ -7557,7 +7765,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne dmi_check_system(apm_dmi_table); if (apm_info.bios.version == 0 || paravirt_enabled() || machine_is_olpc()) { -@@ -2288,9 +2341,18 @@ static int __init apm_init(void) +@@ -2337,9 +2390,18 @@ static int __init apm_init(void) * This is for buggy BIOS's that refer to (real mode) segment 0x40 * even though they are called in protected mode. */ @@ -7576,7 +7784,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne /* * Set up the long jump entry point to the APM BIOS, which is called * from inline assembly. -@@ -2309,6 +2371,11 @@ static int __init apm_init(void) +@@ -2358,6 +2420,11 @@ static int __init apm_init(void) * code to that CPU. */ gdt = get_cpu_gdt_table(0); @@ -7588,7 +7796,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne set_base(gdt[APM_CS >> 3], __va((unsigned long)apm_info.bios.cseg << 4)); set_base(gdt[APM_CS_16 >> 3], -@@ -2316,6 +2383,10 @@ static int __init apm_init(void) +@@ -2365,6 +2432,10 @@ static int __init apm_init(void) set_base(gdt[APM_DS >> 3], __va((unsigned long)apm_info.bios.dseg << 4)); @@ -7599,18 +7807,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/apm_32.c linux-2.6.29.6/arch/x86/kerne proc_create("apm", 0, NULL, &apm_file_ops); kapmd_task = kthread_create(apm, NULL, "kapmd"); -diff -urNp linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c ---- linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c 2009-07-23 17:34:32.065870632 -0400 -@@ -100,6 +100,7 @@ void foo(void) - DEFINE(PTRS_PER_PTE, PTRS_PER_PTE); - DEFINE(PTRS_PER_PMD, PTRS_PER_PMD); - DEFINE(PTRS_PER_PGD, PTRS_PER_PGD); -+ DEFINE(PERCPU_MODULE_RESERVE, PERCPU_MODULE_RESERVE); - - OFFSET(crypto_tfm_ctx_offset, crypto_tfm, __crt_ctx); - -@@ -113,6 +114,7 @@ void foo(void) +diff -urNp linux-2.6.30.4/arch/x86/kernel/asm-offsets_32.c linux-2.6.30.4/arch/x86/kernel/asm-offsets_32.c +--- linux-2.6.30.4/arch/x86/kernel/asm-offsets_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/asm-offsets_32.c 2009-07-30 09:48:09.939725122 -0400 +@@ -115,6 +115,7 @@ void foo(void) OFFSET(PV_CPU_iret, pv_cpu_ops, iret); OFFSET(PV_CPU_irq_enable_sysexit, pv_cpu_ops, irq_enable_sysexit); OFFSET(PV_CPU_read_cr0, pv_cpu_ops, read_cr0); @@ -7618,10 +7818,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/asm-offsets_32.c linux-2.6.29.6/arch/x #endif #ifdef CONFIG_XEN -diff -urNp linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c ---- linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c 2009-07-23 17:34:32.065870632 -0400 -@@ -124,6 +124,7 @@ int main(void) +diff -urNp linux-2.6.30.4/arch/x86/kernel/asm-offsets_64.c linux-2.6.30.4/arch/x86/kernel/asm-offsets_64.c +--- linux-2.6.30.4/arch/x86/kernel/asm-offsets_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/asm-offsets_64.c 2009-07-30 09:48:09.939725122 -0400 +@@ -114,6 +114,7 @@ int main(void) ENTRY(cr8); BLANK(); #undef ENTRY @@ -7629,89 +7829,82 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/asm-offsets_64.c linux-2.6.29.6/arch/x DEFINE(TSS_ist, offsetof(struct tss_struct, x86_tss.ist)); BLANK(); DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx)); -diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/common.c linux-2.6.29.6/arch/x86/kernel/cpu/common.c ---- linux-2.6.29.6/arch/x86/kernel/cpu/common.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/cpu/common.c 2009-07-23 17:34:32.066840916 -0400 -@@ -2,7 +2,6 @@ - #include <linux/kernel.h> - #include <linux/sched.h> - #include <linux/string.h> --#include <linux/bootmem.h> - #include <linux/bitops.h> - #include <linux/module.h> - #include <linux/kgdb.h> -@@ -62,59 +61,6 @@ cpumask_t cpu_sibling_setup_map; +diff -urNp linux-2.6.30.4/arch/x86/kernel/cpu/common.c linux-2.6.30.4/arch/x86/kernel/cpu/common.c +--- linux-2.6.30.4/arch/x86/kernel/cpu/common.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/cpu/common.c 2009-07-30 09:48:09.941068037 -0400 +@@ -60,60 +60,6 @@ void __init setup_cpu_local_masks(void) - static struct cpu_dev *this_cpu __cpuinitdata; + static const struct cpu_dev *this_cpu __cpuinitdata; +-DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { -#ifdef CONFIG_X86_64 --/* We need valid kernel segments for data and code in long mode too -- * IRET will check the segment types kkeil 2000/10/28 -- * Also sysret mandates a special GDT layout -- */ --/* The TLS descriptors are currently at a different place compared to i386. -- Hopefully nobody expects them at a fixed place (Wine?) */ --DEFINE_PER_CPU(struct gdt_page, gdt_page) = { .gdt = { -- [GDT_ENTRY_KERNEL32_CS] = { { { 0x0000ffff, 0x00cf9b00 } } }, -- [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00af9b00 } } }, -- [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9300 } } }, -- [GDT_ENTRY_DEFAULT_USER32_CS] = { { { 0x0000ffff, 0x00cffb00 } } }, -- [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff300 } } }, -- [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00affb00 } } }, --} }; +- /* +- * We need valid kernel segments for data and code in long mode too +- * IRET will check the segment types kkeil 2000/10/28 +- * Also sysret mandates a special GDT layout +- * +- * TLS descriptors are currently at a different place compared to i386. +- * Hopefully nobody expects them at a fixed place (Wine?) +- */ +- [GDT_ENTRY_KERNEL32_CS] = { { { 0x0000ffff, 0x00cf9b00 } } }, +- [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00af9b00 } } }, +- [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9300 } } }, +- [GDT_ENTRY_DEFAULT_USER32_CS] = { { { 0x0000ffff, 0x00cffb00 } } }, +- [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff300 } } }, +- [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00affb00 } } }, -#else --DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { -- [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } }, -- [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } }, -- [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00cffa00 } } }, -- [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff200 } } }, +- [GDT_ENTRY_KERNEL_CS] = { { { 0x0000ffff, 0x00cf9a00 } } }, +- [GDT_ENTRY_KERNEL_DS] = { { { 0x0000ffff, 0x00cf9200 } } }, +- [GDT_ENTRY_DEFAULT_USER_CS] = { { { 0x0000ffff, 0x00cffa00 } } }, +- [GDT_ENTRY_DEFAULT_USER_DS] = { { { 0x0000ffff, 0x00cff200 } } }, - /* - * Segments used for calling PnP BIOS have byte granularity. - * They code segments and data segments have fixed 64k limits, - * the transfer segment sizes are set at run time. - */ - /* 32-bit code */ -- [GDT_ENTRY_PNPBIOS_CS32] = { { { 0x0000ffff, 0x00409a00 } } }, +- [GDT_ENTRY_PNPBIOS_CS32] = { { { 0x0000ffff, 0x00409a00 } } }, - /* 16-bit code */ -- [GDT_ENTRY_PNPBIOS_CS16] = { { { 0x0000ffff, 0x00009a00 } } }, +- [GDT_ENTRY_PNPBIOS_CS16] = { { { 0x0000ffff, 0x00009a00 } } }, - /* 16-bit data */ -- [GDT_ENTRY_PNPBIOS_DS] = { { { 0x0000ffff, 0x00009200 } } }, +- [GDT_ENTRY_PNPBIOS_DS] = { { { 0x0000ffff, 0x00009200 } } }, - /* 16-bit data */ -- [GDT_ENTRY_PNPBIOS_TS1] = { { { 0x00000000, 0x00009200 } } }, +- [GDT_ENTRY_PNPBIOS_TS1] = { { { 0x00000000, 0x00009200 } } }, - /* 16-bit data */ -- [GDT_ENTRY_PNPBIOS_TS2] = { { { 0x00000000, 0x00009200 } } }, +- [GDT_ENTRY_PNPBIOS_TS2] = { { { 0x00000000, 0x00009200 } } }, - /* - * The APM segments have byte granularity and their bases - * are set at run time. All have 64k limits. - */ - /* 32-bit code */ -- [GDT_ENTRY_APMBIOS_BASE] = { { { 0x0000ffff, 0x00409a00 } } }, +- [GDT_ENTRY_APMBIOS_BASE] = { { { 0x0000ffff, 0x00409a00 } } }, - /* 16-bit code */ -- [GDT_ENTRY_APMBIOS_BASE+1] = { { { 0x0000ffff, 0x00009a00 } } }, +- [GDT_ENTRY_APMBIOS_BASE+1] = { { { 0x0000ffff, 0x00009a00 } } }, - /* data */ -- [GDT_ENTRY_APMBIOS_BASE+2] = { { { 0x0000ffff, 0x00409200 } } }, +- [GDT_ENTRY_APMBIOS_BASE+2] = { { { 0x0000ffff, 0x00409200 } } }, - -- [GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } }, -- [GDT_ENTRY_PERCPU] = { { { 0x00000000, 0x00000000 } } }, --} }; +- [GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } }, +- [GDT_ENTRY_PERCPU] = { { { 0x0000ffff, 0x00cf9200 } } }, +- GDT_STACK_CANARY_INIT -#endif +-} }; -EXPORT_PER_CPU_SYMBOL_GPL(gdt_page); - - #ifdef CONFIG_X86_32 - static int cachesize_override __cpuinitdata = -1; - static int disable_x86_serial_nr __cpuinitdata = 1; -@@ -248,7 +194,7 @@ void switch_to_new_gdt(void) + static int __init x86_xsave_setup(char *s) + { + setup_clear_cpu_cap(X86_FEATURE_XSAVE); +@@ -320,7 +266,7 @@ void switch_to_new_gdt(int cpu) { struct desc_ptr gdt_descr; -- gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id()); -+ gdt_descr.address = (unsigned long)get_cpu_gdt_table(smp_processor_id()); +- gdt_descr.address = (long)get_cpu_gdt_table(cpu); ++ gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); gdt_descr.size = GDT_SIZE - 1; load_gdt(&gdt_descr); - #ifdef CONFIG_X86_32 -@@ -708,6 +654,10 @@ static void __cpuinit identify_cpu(struc - * we do "generic changes." - */ + /* Reload the per-cpu base */ +@@ -796,6 +742,10 @@ static void __cpuinit identify_cpu(struc + /* Filter out anything that depends on CPUID levels we don't have */ + filter_cpuid_features(c, true); +#if defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_KERNEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF) + setup_clear_cpu_cap(X86_FEATURE_SEP); @@ -7719,26 +7912,26 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/common.c linux-2.6.29.6/arch/x86/k + /* If the model name is still unset, do table lookup. */ if (!c->x86_model_id[0]) { - char *p; -@@ -880,7 +830,7 @@ __setup("clearcpuid=", setup_disablecpui - struct x8664_pda **_cpu_pda __read_mostly; - EXPORT_SYMBOL(_cpu_pda); + const char *p; +@@ -972,7 +922,7 @@ static __init int setup_disablecpuid(cha + __setup("clearcpuid=", setup_disablecpuid); + #ifdef CONFIG_X86_64 -struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table }; +struct desc_ptr idt_descr __read_only = { 256 * 16 - 1, (unsigned long) idt_table }; - static char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss; + DEFINE_PER_CPU_FIRST(union irq_stack_union, + irq_stack_union) __aligned(PAGE_SIZE); +@@ -1082,7 +1032,7 @@ void __cpuinit cpu_init(void) + int i; -@@ -979,7 +929,7 @@ struct pt_regs * __cpuinit idle_regs(str - void __cpuinit cpu_init(void) - { - int cpu = stack_smp_processor_id(); -- struct tss_struct *t = &per_cpu(init_tss, cpu); -+ struct tss_struct *t = init_tss + cpu; - struct orig_ist *orig_ist = &per_cpu(orig_ist, cpu); - unsigned long v; - char *estacks = NULL; -@@ -1100,7 +1050,7 @@ void __cpuinit cpu_init(void) + cpu = stack_smp_processor_id(); +- t = &per_cpu(init_tss, cpu); ++ t = init_tss + cpu; + orig_ist = &per_cpu(orig_ist, cpu); + + #ifdef CONFIG_NUMA +@@ -1180,7 +1130,7 @@ void __cpuinit cpu_init(void) { int cpu = smp_processor_id(); struct task_struct *curr = current; @@ -7747,10 +7940,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/common.c linux-2.6.29.6/arch/x86/k struct thread_struct *thread = &curr->thread; if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) { -diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c ---- linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-07-23 17:34:32.066840916 -0400 -@@ -581,7 +581,7 @@ static const struct dmi_system_id sw_any +diff -urNp linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c +--- linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c 2009-07-30 09:48:09.941068037 -0400 +@@ -590,7 +590,7 @@ static const struct dmi_system_id sw_any DMI_MATCH(DMI_PRODUCT_NAME, "X6DLP"), }, }, @@ -7759,9 +7952,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c linux-2.6.2 }; #endif -diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c ---- linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-07-23 17:34:32.066840916 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c +--- linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c 2009-07-30 09:48:09.941727851 -0400 @@ -225,7 +225,7 @@ static struct cpu_model models[] = { &cpu_ids[CPU_MP4HT_D0], NULL, 0, NULL }, { &cpu_ids[CPU_MP4HT_E0], NULL, 0, NULL }, @@ -7771,10 +7964,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c linux }; #undef _BANIAS #undef BANIAS -diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/intel.c linux-2.6.29.6/arch/x86/kernel/cpu/intel.c ---- linux-2.6.29.6/arch/x86/kernel/cpu/intel.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/cpu/intel.c 2009-07-23 17:34:32.068000886 -0400 -@@ -94,7 +94,7 @@ static void __cpuinit trap_init_f00f_bug +diff -urNp linux-2.6.30.4/arch/x86/kernel/cpu/intel.c linux-2.6.30.4/arch/x86/kernel/cpu/intel.c +--- linux-2.6.30.4/arch/x86/kernel/cpu/intel.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/cpu/intel.c 2009-07-30 09:48:09.941727851 -0400 +@@ -117,7 +117,7 @@ static void __cpuinit trap_init_f00f_bug * Update the IDT descriptor and reload the IDT so that * it uses the read-only mapped virtual address. */ @@ -7783,20 +7976,20 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/intel.c linux-2.6.29.6/arch/x86/ke load_idt(&idt_descr); } #endif -diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c ---- linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-07-23 17:34:32.068000886 -0400 -@@ -678,6 +678,7 @@ static struct miscdevice mce_log_device +diff -urNp linux-2.6.30.4/arch/x86/kernel/cpu/mcheck/mce_64.c linux-2.6.30.4/arch/x86/kernel/cpu/mcheck/mce_64.c +--- linux-2.6.30.4/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/cpu/mcheck/mce_64.c 2009-07-30 09:48:09.941727851 -0400 +@@ -830,6 +830,7 @@ static struct miscdevice mce_log_device MISC_MCELOG_MINOR, "mcelog", &mce_chrdev_ops, + {NULL, NULL}, NULL, NULL }; - static unsigned long old_cr4 __initdata; -diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c ---- linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c 2009-07-23 17:34:32.068000886 -0400 + /* +diff -urNp linux-2.6.30.4/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.30.4/arch/x86/kernel/cpu/mtrr/generic.c +--- linux-2.6.30.4/arch/x86/kernel/cpu/mtrr/generic.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/cpu/mtrr/generic.c 2009-07-30 09:48:09.942991706 -0400 @@ -23,14 +23,14 @@ static struct fixed_range_block fixed_ra { MTRRfix64K_00000_MSR, 1 }, /* one 64k MTRR */ { MTRRfix16K_80000_MSR, 2 }, /* two 16k MTRRs */ @@ -7813,11 +8006,11 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/cpu/mtrr/generic.c linux-2.6.29.6/arch +struct mtrr_state_type mtrr_state; EXPORT_SYMBOL_GPL(mtrr_state); - static int __initdata mtrr_show; -diff -urNp linux-2.6.29.6/arch/x86/kernel/crash.c linux-2.6.29.6/arch/x86/kernel/crash.c ---- linux-2.6.29.6/arch/x86/kernel/crash.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/crash.c 2009-07-23 17:34:32.068000886 -0400 -@@ -43,7 +43,7 @@ static void kdump_nmi_callback(int cpu, + /** +diff -urNp linux-2.6.30.4/arch/x86/kernel/crash.c linux-2.6.30.4/arch/x86/kernel/crash.c +--- linux-2.6.30.4/arch/x86/kernel/crash.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/crash.c 2009-07-30 09:48:09.942991706 -0400 +@@ -41,7 +41,7 @@ static void kdump_nmi_callback(int cpu, regs = args->regs; #ifdef CONFIG_X86_32 @@ -7826,9 +8019,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/crash.c linux-2.6.29.6/arch/x86/kernel crash_fixup_ss_esp(&fixed_regs, regs); regs = &fixed_regs; } -diff -urNp linux-2.6.29.6/arch/x86/kernel/doublefault_32.c linux-2.6.29.6/arch/x86/kernel/doublefault_32.c ---- linux-2.6.29.6/arch/x86/kernel/doublefault_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/doublefault_32.c 2009-07-23 17:34:32.068803825 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/doublefault_32.c linux-2.6.30.4/arch/x86/kernel/doublefault_32.c +--- linux-2.6.30.4/arch/x86/kernel/doublefault_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/doublefault_32.c 2009-07-30 09:48:09.942991706 -0400 @@ -11,7 +11,7 @@ #define DOUBLEFAULT_STACKSIZE (1024) @@ -7860,9 +8053,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/doublefault_32.c linux-2.6.29.6/arch/x .fs = __KERNEL_PERCPU, .__cr3 = __pa_nodebug(swapper_pg_dir), -diff -urNp linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c ---- linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c 2009-07-23 17:34:32.068803825 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/dumpstack_32.c linux-2.6.30.4/arch/x86/kernel/dumpstack_32.c +--- linux-2.6.30.4/arch/x86/kernel/dumpstack_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/dumpstack_32.c 2009-07-30 09:48:09.943696998 -0400 @@ -107,11 +107,12 @@ void show_registers(struct pt_regs *regs * When in-kernel, we also print out the stack and code at the * time of the fault.. @@ -7907,10 +8100,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/dumpstack_32.c linux-2.6.29.6/arch/x86 if (ip < PAGE_OFFSET) return 0; if (probe_kernel_address((unsigned short *)ip, ud2)) -diff -urNp linux-2.6.29.6/arch/x86/kernel/dumpstack.c linux-2.6.29.6/arch/x86/kernel/dumpstack.c ---- linux-2.6.29.6/arch/x86/kernel/dumpstack.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/dumpstack.c 2009-07-23 17:34:32.068803825 -0400 -@@ -178,7 +178,7 @@ void dump_stack(void) +diff -urNp linux-2.6.30.4/arch/x86/kernel/dumpstack.c linux-2.6.30.4/arch/x86/kernel/dumpstack.c +--- linux-2.6.30.4/arch/x86/kernel/dumpstack.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/dumpstack.c 2009-07-30 09:48:09.942991706 -0400 +@@ -180,7 +180,7 @@ void dump_stack(void) #endif printk("Pid: %d, comm: %.20s %s %s %.*s\n", @@ -7919,7 +8112,16 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/dumpstack.c linux-2.6.29.6/arch/x86/ke init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version); -@@ -288,7 +288,7 @@ void die(const char *str, struct pt_regs +@@ -241,7 +241,7 @@ void __kprobes oops_end(unsigned long fl + panic("Fatal exception in interrupt"); + if (panic_on_oops) + panic("Fatal exception"); +- do_exit(signr); ++ do_group_exit(signr); + } + + int __kprobes __die(const char *str, struct pt_regs *regs, long err) +@@ -295,7 +295,7 @@ void die(const char *str, struct pt_regs unsigned long flags = oops_begin(); int sig = SIGSEGV; @@ -7928,10 +8130,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/dumpstack.c linux-2.6.29.6/arch/x86/ke report_bug(regs->ip, regs); if (__die(str, regs, err)) -diff -urNp linux-2.6.29.6/arch/x86/kernel/e820.c linux-2.6.29.6/arch/x86/kernel/e820.c ---- linux-2.6.29.6/arch/x86/kernel/e820.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/e820.c 2009-07-23 17:34:32.068803825 -0400 -@@ -698,7 +698,10 @@ struct early_res { +diff -urNp linux-2.6.30.4/arch/x86/kernel/e820.c linux-2.6.30.4/arch/x86/kernel/e820.c +--- linux-2.6.30.4/arch/x86/kernel/e820.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/e820.c 2009-07-30 09:48:09.943696998 -0400 +@@ -739,7 +739,10 @@ struct early_res { }; static struct early_res early_res[MAX_EARLY_RES] __initdata = { { 0, PAGE_SIZE, "BIOS data page" }, /* BIOS data page */ @@ -7943,9 +8145,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/e820.c linux-2.6.29.6/arch/x86/kernel/ }; static int __init find_overlapped_early(u64 start, u64 end) -diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_32.c linux-2.6.29.6/arch/x86/kernel/efi_32.c ---- linux-2.6.29.6/arch/x86/kernel/efi_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/efi_32.c 2009-07-23 17:34:32.068803825 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/efi_32.c linux-2.6.30.4/arch/x86/kernel/efi_32.c +--- linux-2.6.30.4/arch/x86/kernel/efi_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/efi_32.c 2009-07-30 09:48:09.943696998 -0400 @@ -38,70 +38,38 @@ */ @@ -8026,15 +8228,15 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_32.c linux-2.6.29.6/arch/x86/kerne /* * After the lock is released, the original page table is restored. -diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S ---- linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S 2009-07-23 17:34:32.068803825 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/efi_stub_32.S linux-2.6.30.4/arch/x86/kernel/efi_stub_32.S +--- linux-2.6.30.4/arch/x86/kernel/efi_stub_32.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/efi_stub_32.S 2009-07-30 09:48:09.944948217 -0400 @@ -6,6 +6,7 @@ */ #include <linux/linkage.h> +#include <linux/init.h> - #include <asm/page.h> + #include <asm/page_types.h> /* @@ -20,7 +21,7 @@ @@ -8085,7 +8287,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S linux-2.6.29.6/arch/x86/ /* * 6. After EFI runtime service returns, control will return to * following instruction. We'd better readjust stack pointer first. -@@ -88,34 +80,27 @@ ENTRY(efi_call_phys) +@@ -88,35 +80,28 @@ ENTRY(efi_call_phys) movl %cr0, %edx orl $0x80000000, %edx movl %edx, %cr0 @@ -8119,6 +8321,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S linux-2.6.29.6/arch/x86/ - pushl %ecx - ret + jmpl *(saved_return_addr) + ENDPROC(efi_call_phys) .previous -.data @@ -8126,47 +8329,50 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/efi_stub_32.S linux-2.6.29.6/arch/x86/ saved_return_addr: .long 0 efi_rt_function_ptr: -diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/kernel/entry_32.S ---- linux-2.6.29.6/arch/x86/kernel/entry_32.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/entry_32.S 2009-07-23 17:34:32.069868390 -0400 -@@ -101,7 +101,7 @@ - #define resume_userspace_sig resume_userspace - #endif - --#define SAVE_ALL \ -+#define __SAVE_ALL(_DS) \ - cld; \ - pushl %fs; \ - CFI_ADJUST_CFA_OFFSET 4;\ -@@ -133,12 +133,26 @@ - pushl %ebx; \ - CFI_ADJUST_CFA_OFFSET 4;\ - CFI_REL_OFFSET ebx, 0;\ -- movl $(__USER_DS), %edx; \ -+ movl $(_DS), %edx; \ - movl %edx, %ds; \ - movl %edx, %es; \ - movl $(__KERNEL_PERCPU), %edx; \ - movl %edx, %fs - +diff -urNp linux-2.6.30.4/arch/x86/kernel/entry_32.S linux-2.6.30.4/arch/x86/kernel/entry_32.S +--- linux-2.6.30.4/arch/x86/kernel/entry_32.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/entry_32.S 2009-07-30 09:48:09.945662533 -0400 +@@ -192,7 +192,7 @@ + + #endif /* CONFIG_X86_32_LAZY_GS */ + +-.macro SAVE_ALL ++.macro __SAVE_ALL _DS + cld + PUSH_GS + pushl %fs +@@ -225,7 +225,7 @@ + pushl %ebx + CFI_ADJUST_CFA_OFFSET 4 + CFI_REL_OFFSET ebx, 0 +- movl $(__USER_DS), %edx ++ movl $\_DS, %edx + movl %edx, %ds + movl %edx, %es + movl $(__KERNEL_PERCPU), %edx +@@ -233,6 +233,21 @@ + SET_KERNEL_GS %edx + .endm + ++.macro SAVE_ALL +#ifdef CONFIG_PAX_KERNEXEC -+#define SAVE_ALL \ -+ __SAVE_ALL(__KERNEL_DS); \ -+ GET_CR0_INTO_EDX; \ -+ movl %edx, %esi; \ -+ orl $X86_CR0_WP, %edx; \ -+ xorl %edx, %esi; \ ++ __SAVE_ALL __KERNEL_DS ++ GET_CR0_INTO_EDX; ++ movl %edx, %esi; ++ orl $X86_CR0_WP, %edx; ++ xorl %edx, %esi; + SET_CR0_FROM_EDX +#elif defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) || defined(CONFIG_PAX_MEMORY_UDEREF) -+#define SAVE_ALL __SAVE_ALL(__KERNEL_DS) ++ __SAVE_ALL __KERNEL_DS +#else -+#define SAVE_ALL __SAVE_ALL(__USER_DS) ++ __SAVE_ALL __USER_DS +#endif ++.endm + - #define RESTORE_INT_REGS \ - popl %ebx; \ - CFI_ADJUST_CFA_OFFSET -4;\ -@@ -229,6 +243,11 @@ ENTRY(ret_from_fork) + .macro RESTORE_INT_REGS + popl %ebx + CFI_ADJUST_CFA_OFFSET -4 +@@ -330,6 +345,11 @@ ENTRY(ret_from_fork) CFI_ADJUST_CFA_OFFSET 4 popfl CFI_ADJUST_CFA_OFFSET -4 @@ -8178,7 +8384,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker jmp syscall_exit CFI_ENDPROC END(ret_from_fork) -@@ -252,7 +271,17 @@ check_userspace: +@@ -353,7 +373,17 @@ check_userspace: movb PT_CS(%esp), %al andl $(X86_EFLAGS_VM | SEGMENT_RPL_MASK), %eax cmpl $USER_RPL, %eax @@ -8196,7 +8402,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker ENTRY(resume_userspace) LOCKDEP_SYS_EXIT -@@ -314,10 +343,9 @@ sysenter_past_esp: +@@ -415,10 +445,9 @@ sysenter_past_esp: /*CFI_REL_OFFSET cs, 0*/ /* * Push current_thread_info()->sysenter_return to the stack. @@ -8209,7 +8415,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker CFI_ADJUST_CFA_OFFSET 4 CFI_REL_OFFSET eip, 0 -@@ -330,9 +358,19 @@ sysenter_past_esp: +@@ -431,9 +460,19 @@ sysenter_past_esp: * Load the potential sixth argument from user stack. * Careful about security. */ @@ -8229,8 +8435,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker movl %ebp,PT_EBP(%esp) .section __ex_table,"a" .align 4 -@@ -356,12 +394,23 @@ sysenter_do_call: - testw $_TIF_ALLWORK_MASK, %cx +@@ -456,12 +495,23 @@ sysenter_do_call: + testl $_TIF_ALLWORK_MASK, %ecx jne sysexit_audit sysenter_exit: + @@ -8250,10 +8456,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker 1: mov PT_FS(%esp), %fs +2: mov PT_DS(%esp), %ds +3: mov PT_ES(%esp), %es + PTGS_TO_GS ENABLE_INTERRUPTS_SYSEXIT - #ifdef CONFIG_AUDITSYSCALL -@@ -404,11 +453,17 @@ sysexit_audit: +@@ -505,11 +555,17 @@ sysexit_audit: CFI_ENDPROC .pushsection .fixup,"ax" @@ -8271,10 +8477,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker + .long 2b,5b + .long 3b,6b .popsection + PTGS_TO_GS_EX ENDPROC(ia32_sysenter_target) - -@@ -438,6 +493,10 @@ syscall_exit: - testw $_TIF_ALLWORK_MASK, %cx # current->work +@@ -539,6 +595,10 @@ syscall_exit: + testl $_TIF_ALLWORK_MASK, %ecx # current->work jne syscall_exit_work +#ifdef CONFIG_PAX_RANDKSTACK @@ -8284,7 +8490,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker restore_all: movl PT_EFLAGS(%esp), %eax # mix EFLAGS, SS and CS # Warning: PT_OLDSS(%esp) contains the wrong/random values if we -@@ -531,25 +590,19 @@ work_resched: +@@ -631,25 +691,19 @@ work_resched: work_notifysig: # deal with pending signals and # notify-resume requests @@ -8313,7 +8519,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker #endif xorl %edx, %edx call do_notify_resume -@@ -584,6 +637,10 @@ END(syscall_exit_work) +@@ -684,6 +738,10 @@ END(syscall_exit_work) RING0_INT_FRAME # can't unwind into user space anyway syscall_fault: @@ -8324,22 +8530,11 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker GET_THREAD_INFO(%ebp) movl $-EFAULT,PT_EAX(%esp) jmp resume_userspace -@@ -595,17 +652,24 @@ syscall_badsys: - END(syscall_badsys) - CFI_ENDPROC +@@ -717,7 +775,13 @@ PTREGSCALL(vm86old) --#define FIXUP_ESPFIX_STACK \ -- /* since we are on a wrong stack, we cant make it a C code :( */ \ -- PER_CPU(gdt_page, %ebx); \ -- GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah); \ -- addl %esp, %eax; \ -- pushl $__KERNEL_DS; \ -- CFI_ADJUST_CFA_OFFSET 4; \ -- pushl %eax; \ -- CFI_ADJUST_CFA_OFFSET 4; \ -- lss (%esp), %esp; \ -+.macro FIXUP_ESPFIX_STACK -+ /* since we are on a wrong stack, we cant make it a C code :( */ + .macro FIXUP_ESPFIX_STACK + /* since we are on a wrong stack, we cant make it a C code :( */ +- PER_CPU(gdt_page, %ebx) +#ifdef CONFIG_SMP + movl PER_CPU_VAR(cpu_number), %ebx; + shll $PAGE_SHIFT_asm, %ebx; @@ -8347,19 +8542,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker +#else + movl $cpu_gdt_table, %ebx; +#endif -+ GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah); -+ addl %esp, %eax; -+ pushl $__KERNEL_DS; -+ CFI_ADJUST_CFA_OFFSET 4; -+ pushl %eax; -+ CFI_ADJUST_CFA_OFFSET 4; -+ lss (%esp), %esp; - CFI_ADJUST_CFA_OFFSET -8; -+.endm - #define UNWIND_ESPFIX_STACK \ - movl %ss, %eax; \ - /* see if on espfix stack */ \ -@@ -1052,7 +1116,6 @@ return_to_handler: + GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah) + addl %esp, %eax + pushl $__KERNEL_DS +@@ -1176,7 +1240,6 @@ return_to_handler: ret #endif @@ -8367,10 +8553,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker #include "syscall_table_32.S" syscall_table_size=(.-sys_call_table) -@@ -1106,12 +1169,21 @@ error_code: - popl %ecx - CFI_ADJUST_CFA_OFFSET -4 - /*CFI_REGISTER es, ecx*/ +@@ -1228,12 +1291,21 @@ error_code: + movl %ecx, %fs + UNWIND_ESPFIX_STACK + GS_TO_REG %ecx + +#ifdef CONFIG_PAX_KERNEXEC + GET_CR0_INTO_EDX @@ -8380,17 +8566,17 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker + SET_CR0_FROM_EDX +#endif + - movl PT_FS(%esp), %edi # get the function address + movl PT_GS(%esp), %edi # get the function address movl PT_ORIG_EAX(%esp), %edx # get the error code movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart - mov %ecx, PT_FS(%esp) - /*CFI_REL_OFFSET fs, ES*/ + REG_TO_PTGS %ecx + SET_KERNEL_GS %ecx - movl $(__USER_DS), %ecx + movl $(__KERNEL_DS), %ecx movl %ecx, %ds movl %ecx, %es TRACE_IRQS_OFF -@@ -1206,6 +1278,13 @@ nmi_stack_correct: +@@ -1329,6 +1401,13 @@ nmi_stack_correct: xorl %edx,%edx # zero error code movl %esp,%eax # pt_regs pointer call do_nmi @@ -8404,7 +8590,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker jmp restore_nocheck_notrace CFI_ENDPROC -@@ -1246,6 +1325,13 @@ nmi_espfix_stack: +@@ -1369,6 +1448,13 @@ nmi_espfix_stack: FIXUP_ESPFIX_STACK # %eax == %esp xorl %edx,%edx # zero error code call do_nmi @@ -8418,28 +8604,23 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_32.S linux-2.6.29.6/arch/x86/ker RESTORE_REGS lss 12+4(%esp), %esp # back to espfix stack CFI_ADJUST_CFA_OFFSET -24 -diff -urNp linux-2.6.29.6/arch/x86/kernel/entry_64.S linux-2.6.29.6/arch/x86/kernel/entry_64.S ---- linux-2.6.29.6/arch/x86/kernel/entry_64.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/entry_64.S 2009-07-23 17:34:32.069868390 -0400 -@@ -1073,10 +1073,11 @@ ENTRY(\sym) +diff -urNp linux-2.6.30.4/arch/x86/kernel/entry_64.S linux-2.6.30.4/arch/x86/kernel/entry_64.S +--- linux-2.6.30.4/arch/x86/kernel/entry_64.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/entry_64.S 2009-07-30 09:48:09.945662533 -0400 +@@ -1073,7 +1073,8 @@ ENTRY(\sym) TRACE_IRQS_OFF movq %rsp,%rdi /* pt_regs pointer */ xorl %esi,%esi /* no error code */ -- movq %gs:pda_data_offset, %rbp -- subq $EXCEPTION_STKSZ, per_cpu__init_tss + TSS_ist + (\ist - 1) * 8(%rbp) -+ imul $TSS_size, %gs:pda_cpunumber, %ebp +- PER_CPU(init_tss, %rbp) ++ imul $TSS_size, PER_CPU_VAR(cpu_number), %ebp + lea init_tss(%rbp), %rbp -+ subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) + subq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) call \do_sym -- addq $EXCEPTION_STKSZ, per_cpu__init_tss + TSS_ist + (\ist - 1) * 8(%rbp) -+ addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) - jmp paranoid_exit /* %ebx: no swapgs flag */ - CFI_ENDPROC - END(\sym) -diff -urNp linux-2.6.29.6/arch/x86/kernel/ftrace.c linux-2.6.29.6/arch/x86/kernel/ftrace.c ---- linux-2.6.29.6/arch/x86/kernel/ftrace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/ftrace.c 2009-07-23 17:34:32.070744144 -0400 -@@ -250,9 +250,9 @@ int ftrace_update_ftrace_func(ftrace_fun + addq $EXCEPTION_STKSZ, TSS_ist + (\ist - 1) * 8(%rbp) +diff -urNp linux-2.6.30.4/arch/x86/kernel/ftrace.c linux-2.6.30.4/arch/x86/kernel/ftrace.c +--- linux-2.6.30.4/arch/x86/kernel/ftrace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/ftrace.c 2009-07-30 09:48:09.945662533 -0400 +@@ -284,9 +284,9 @@ int ftrace_update_ftrace_func(ftrace_fun unsigned char old[MCOUNT_INSN_SIZE], *new; int ret; @@ -8451,9 +8632,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/ftrace.c linux-2.6.29.6/arch/x86/kerne return ret; } -diff -urNp linux-2.6.29.6/arch/x86/kernel/head32.c linux-2.6.29.6/arch/x86/kernel/head32.c ---- linux-2.6.29.6/arch/x86/kernel/head32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/head32.c 2009-07-23 17:34:32.070744144 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/head32.c linux-2.6.30.4/arch/x86/kernel/head32.c +--- linux-2.6.30.4/arch/x86/kernel/head32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/head32.c 2009-07-30 09:48:09.946846946 -0400 @@ -13,12 +13,13 @@ #include <asm/e820.h> #include <asm/bios_ebda.h> @@ -8464,36 +8645,37 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head32.c linux-2.6.29.6/arch/x86/kerne { reserve_trampoline_memory(); -- reserve_early(__pa_symbol(&_text), __pa_symbol(&_end), "TEXT DATA BSS"); -+ reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&_end), "TEXT DATA BSS"); +- reserve_early(__pa_symbol(&_text), __pa_symbol(&__bss_stop), "TEXT DATA BSS"); ++ reserve_early(LOAD_PHYSICAL_ADDR, __pa_symbol(&__bss_stop), "TEXT DATA BSS"); #ifdef CONFIG_BLK_DEV_INITRD /* Reserve INITRD */ -diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kernel/head_32.S ---- linux-2.6.29.6/arch/x86/kernel/head_32.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/head_32.S 2009-07-23 17:34:37.457730203 -0400 -@@ -19,6 +19,7 @@ - #include <asm/asm-offsets.h> +diff -urNp linux-2.6.30.4/arch/x86/kernel/head_32.S linux-2.6.30.4/arch/x86/kernel/head_32.S +--- linux-2.6.30.4/arch/x86/kernel/head_32.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/head_32.S 2009-07-30 19:56:23.400350396 -0400 +@@ -20,6 +20,7 @@ #include <asm/setup.h> #include <asm/processor-flags.h> + #include <asm/percpu.h> +#include <asm/msr-index.h> /* Physical address */ #define pa(X) ((X) - __PAGE_OFFSET) -@@ -64,17 +65,22 @@ LOW_PAGES = 1<<(32-PAGE_SHIFT_asm) - LOW_PAGES = LOW_PAGES + 0x1000000 - #endif +@@ -53,11 +54,7 @@ + * and small than max_low_pfn, otherwise will waste some page table entries + */ -#if PTRS_PER_PMD > 1 --PAGE_TABLE_SIZE = (LOW_PAGES / PTRS_PER_PMD) + PTRS_PER_PGD +-#define PAGE_TABLE_SIZE(pages) (((pages) / PTRS_PER_PMD) + PTRS_PER_PGD) -#else --PAGE_TABLE_SIZE = (LOW_PAGES / PTRS_PER_PGD) +-#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PGD) -#endif -+PAGE_TABLE_SIZE = (LOW_PAGES / PTRS_PER_PTE) - BOOTBITMAP_SIZE = LOW_PAGES / 8 - ALLOCATOR_SLOP = 4 ++#define PAGE_TABLE_SIZE(pages) ((pages) / PTRS_PER_PTE) - INIT_MAP_BEYOND_END = BOOTBITMAP_SIZE + (PAGE_TABLE_SIZE + ALLOCATOR_SLOP)*PAGE_SIZE_asm + /* Enough space to fit pagetables for the low memory linear map */ + MAPPING_BEYOND_END = \ +@@ -74,6 +71,15 @@ INIT_MAP_SIZE = PAGE_TABLE_SIZE(KERNEL_P + RESERVE_BRK(pagetables, INIT_MAP_SIZE) /* + * Real beginning of normal "text" segment @@ -8508,7 +8690,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern * 32-bit kernel entrypoint; only used by the boot CPU. On entry, * %esi points to the real-mode code as a 32-bit pointer. * CS and DS must be 4 GB flat segments, but we don't depend on -@@ -82,6 +88,12 @@ INIT_MAP_BEYOND_END = BOOTBITMAP_SIZE + +@@ -81,6 +87,12 @@ RESERVE_BRK(pagetables, INIT_MAP_SIZE) * can. */ .section .text.head,"ax",@progbits @@ -8521,18 +8703,18 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern ENTRY(startup_32) /* test KEEP_SEGMENTS flag to see if the bootloader is asking us to not reload segments */ -@@ -99,6 +111,56 @@ ENTRY(startup_32) +@@ -98,6 +110,56 @@ ENTRY(startup_32) movl %eax,%gs 2: + movl $pa(cpu_gdt_table),%edi -+ movl $__per_cpu_start,%eax ++ movl $__per_cpu_load,%eax + movw %ax,__KERNEL_PERCPU + 2(%edi) + rorl $16,%eax + movb %al,__KERNEL_PERCPU + 4(%edi) + movb %ah,__KERNEL_PERCPU + 7(%edi) -+ movl $__per_cpu_end + PERCPU_MODULE_RESERVE - 1,%eax -+ subl $__per_cpu_start,%eax ++ movl $__per_cpu_end - 1,%eax ++ subl $__per_cpu_load,%eax + movw %ax,__KERNEL_PERCPU + 0(%edi) + +#ifdef CONFIG_PAX_MEMORY_UDEREF @@ -8578,7 +8760,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern /* * Clear BSS first so that there are no surprises... */ -@@ -142,9 +204,7 @@ ENTRY(startup_32) +@@ -141,9 +203,7 @@ ENTRY(startup_32) cmpl $num_subarch_entries, %eax jae bad_subarch @@ -8589,7 +8771,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern bad_subarch: WEAK(lguest_entry) -@@ -156,9 +216,9 @@ WEAK(xen_entry) +@@ -155,9 +215,9 @@ WEAK(xen_entry) __INITDATA subarch_entries: @@ -8602,35 +8784,41 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern num_subarch_entries = (. - subarch_entries) / 4 .previous #endif /* CONFIG_PARAVIRT */ -@@ -220,8 +280,11 @@ default_entry: +@@ -218,8 +278,14 @@ default_entry: movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ - movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax - movl %eax,pa(swapper_pg_pmd+0x1000*KPMDS-8) +#ifdef CONFIG_COMPAT_VDSO -+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_pmd+0x1000*KPMDS-8) ++ movl $pa(swapper_pg_fixmap0)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_pmd+0x1000*KPMDS-8) +#else -+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-8) ++ movl $pa(swapper_pg_fixmap0)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-8) +#endif ++ movl $pa(swapper_pg_fixmap1)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-16) ++ movl $pa(swapper_pg_fixmap2)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-24) ++ movl $pa(swapper_pg_fixmap3)+PDE_IDENT_ATTR,pa(swapper_pg_pmd+0x1000*KPMDS-32) #else /* Not PAE */ page_pde_offset = (__PAGE_OFFSET >> 20); -@@ -253,8 +316,11 @@ page_pde_offset = (__PAGE_OFFSET >> 20); +@@ -249,8 +315,14 @@ page_pde_offset = (__PAGE_OFFSET >> 20); movl %eax, pa(max_pfn_mapped) /* Do early initialization of the fixmap area */ - movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,%eax - movl %eax,pa(swapper_pg_dir+0xffc) +#ifdef CONFIG_COMPAT_VDSO -+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_dir+0xffc) ++ movl $pa(swapper_pg_fixmap0)+PDE_IDENT_ATTR+_PAGE_USER,pa(swapper_pg_dir+0xffc) +#else -+ movl $pa(swapper_pg_fixmap)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xffc) ++ movl $pa(swapper_pg_fixmap0)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xffc) +#endif ++ movl $pa(swapper_pg_fixmap1)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xff8) ++ movl $pa(swapper_pg_fixmap2)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xff4) ++ movl $pa(swapper_pg_fixmap3)+PDE_IDENT_ATTR,pa(swapper_pg_dir+0xff0) #endif jmp 3f /* -@@ -318,13 +384,16 @@ ENTRY(startup_32_smp) +@@ -314,13 +386,16 @@ ENTRY(startup_32_smp) jnc 6f /* Setup EFER (Extended Feature Enable Register) */ @@ -8648,7 +8836,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern 6: /* -@@ -350,9 +419,7 @@ ENTRY(startup_32_smp) +@@ -346,9 +421,7 @@ ENTRY(startup_32_smp) #ifdef CONFIG_SMP cmpb $0, ready @@ -8659,42 +8847,44 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern #endif /* CONFIG_SMP */ /* -@@ -429,12 +496,12 @@ is386: movl $2,%ecx # set MP - ljmp $(__KERNEL_CS),$1f +@@ -426,7 +499,7 @@ is386: movl $2,%ecx # set MP 1: movl $(__KERNEL_DS),%eax # reload all the segment registers movl %eax,%ss # after changing gdt. -- movl %eax,%fs # gets reset once there's real percpu -- + - movl $(__USER_DS),%eax # DS/ES contains default USER segment ++ movl $(__KERNEL_DS),%eax # DS/ES contains default KERNEL segment movl %eax,%ds movl %eax,%es -+ movl $(__KERNEL_PERCPU), %eax -+ movl %eax,%fs # set this cpu's percpu -+ - xorl %eax,%eax # Clear GS and LDT - movl %eax,%gs - lldt %ax -@@ -444,12 +511,6 @@ is386: movl $2,%ecx # set MP +@@ -440,8 +513,9 @@ is386: movl $2,%ecx # set MP + */ + cmpb $0,ready + jne 1f +- movl $per_cpu__gdt_page,%eax ++ movl $cpu_gdt_table,%eax + movl $per_cpu__stack_canary,%ecx ++ addl $__per_cpu_load,%ecx + subl $20, %ecx + movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) + shrl $16, %ecx +@@ -460,10 +534,6 @@ is386: movl $2,%ecx # set MP #ifdef CONFIG_SMP movb ready, %cl movb $1, ready - cmpb $0,%cl # the first CPU calls start_kernel - je 1f -- movl $(__KERNEL_PERCPU), %eax -- movl %eax,%fs # set this cpu's percpu - movl (stack_start), %esp -1: #endif /* CONFIG_SMP */ jmp *(initial_code) -@@ -535,15 +596,15 @@ early_page_fault: +@@ -549,22 +619,22 @@ early_page_fault: jmp early_fault early_fault: - cld #ifdef CONFIG_PRINTK -+ cmpl $2,%ss:early_recursion_flag ++ cmpl $1,%ss:early_recursion_flag + je hlt_loop + incl %ss:early_recursion_flag + cld @@ -8708,17 +8898,15 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern movl %cr2,%eax pushl %eax pushl %edx /* trapno */ -@@ -553,8 +614,8 @@ early_fault: - #else + pushl $fault_msg call printk ++; call dump_stack #endif --#endif - call dump_stack -+#endif +- call dump_stack hlt_loop: hlt jmp hlt_loop -@@ -562,8 +623,11 @@ hlt_loop: +@@ -572,8 +642,11 @@ hlt_loop: /* This is the default interrupt "handler" :-) */ ALIGN ignore_int: @@ -8731,7 +8919,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern pushl %eax pushl %ecx pushl %edx -@@ -572,9 +636,6 @@ ignore_int: +@@ -582,9 +655,6 @@ ignore_int: movl $(__KERNEL_DS),%eax movl %eax,%ds movl %eax,%es @@ -8741,7 +8929,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern pushl 16(%esp) pushl 24(%esp) pushl 32(%esp) -@@ -599,36 +660,42 @@ ignore_int: +@@ -608,37 +678,49 @@ ignore_int: ENTRY(initial_code) .long i386_start_kernel @@ -8768,14 +8956,23 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern #endif -swapper_pg_fixmap: + -+ENTRY(swapper_pg_fixmap) ++ENTRY(swapper_pg_fixmap0) ++ .fill 1024,4,0 ++ ++ENTRY(swapper_pg_fixmap1) ++ .fill 1024,4,0 ++ ++ENTRY(swapper_pg_fixmap2) ++ .fill 1024,4,0 ++ ++ENTRY(swapper_pg_fixmap3) .fill 1024,4,0 + +.section .empty_zero_page,"a",@progbits ENTRY(empty_zero_page) .fill 4096,1,0 -+ -+/* + + /* + * The IDT has to be page-aligned to simplify the Pentium + * F0 0F bug workaround.. We have a special link segment + * for this. @@ -8784,11 +8981,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern +ENTRY(idt_table) + .fill 256,8,0 + - /* ++/* * This starts the data section. */ -+.data -+ #ifdef CONFIG_X86_PAE -.section ".data.page_aligned","wa" - /* Page-aligned for the benefit of paravirt? */ @@ -8797,7 +8992,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern ENTRY(swapper_pg_dir) .long pa(swapper_pg_pmd+PGD_IDENT_ATTR),0 /* low identity map */ # if KPMDS == 3 -@@ -651,11 +718,12 @@ ENTRY(swapper_pg_dir) +@@ -661,11 +743,12 @@ ENTRY(swapper_pg_dir) .data ENTRY(stack_start) @@ -8811,7 +9006,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern early_recursion_flag: .long 0 -@@ -691,7 +759,7 @@ fault_msg: +@@ -701,7 +784,7 @@ fault_msg: .word 0 # 32 bit align gdt_desc.address boot_gdt_descr: .word __BOOT_DS+7 @@ -8820,7 +9015,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern .word 0 # 32-bit align idt_desc.address idt_descr: -@@ -702,7 +770,7 @@ idt_descr: +@@ -712,7 +795,7 @@ idt_descr: .word 0 # 32 bit align gdt_desc.address ENTRY(early_gdt_descr) .word GDT_ENTRIES*8-1 @@ -8829,7 +9024,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern /* * The boot_gdt must mirror the equivalent in setup.S and is -@@ -711,5 +779,59 @@ ENTRY(early_gdt_descr) +@@ -721,5 +804,59 @@ ENTRY(early_gdt_descr) .align L1_CACHE_BYTES ENTRY(boot_gdt) .fill GDT_ENTRY_BOOT_CS,8,0 @@ -8883,39 +9078,18 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_32.S linux-2.6.29.6/arch/x86/kern + + .quad 0x00c0930000000000 /* 0xd0 - ESPFIX SS */ + .quad 0x0040930000000000 /* 0xd8 - PERCPU */ -+ .quad 0x0000000000000000 /* 0xe0 - PCIBIOS_CS */ -+ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_DS */ -+ .quad 0x0000000000000000 /* 0xf0 - unused */ ++ .quad 0x0040930000000018 /* 0xe0 - STACK_CANARY */ ++ .quad 0x0000000000000000 /* 0xe8 - PCIBIOS_CS */ ++ .quad 0x0000000000000000 /* 0xf0 - PCIBIOS_DS */ + .quad 0x0000000000000000 /* 0xf8 - GDT entry 31: double-fault TSS */ + + /* Be sure this is zeroed to avoid false validations in Xen */ + .fill PAGE_SIZE_asm - GDT_SIZE,1,0 + .endr -diff -urNp linux-2.6.29.6/arch/x86/kernel/head64.c linux-2.6.29.6/arch/x86/kernel/head64.c ---- linux-2.6.29.6/arch/x86/kernel/head64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/head64.c 2009-07-23 17:34:32.070744144 -0400 -@@ -94,6 +94,8 @@ void __init x86_64_start_kernel(char * r - /* clear bss before set_intr_gate with early_idt_handler */ - clear_bss(); - -+ x86_64_init_pda(); -+ - /* Make NULL pointers segfault */ - zap_identity_mappings(); - -@@ -112,8 +114,6 @@ void __init x86_64_start_kernel(char * r - if (console_loglevel == 10) - early_printk("Kernel alive\n"); - -- x86_64_init_pda(); -- - x86_64_start_reservations(real_mode_data); - } - -diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kernel/head_64.S ---- linux-2.6.29.6/arch/x86/kernel/head_64.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/head_64.S 2009-07-23 17:34:32.071712262 -0400 -@@ -38,6 +38,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET +diff -urNp linux-2.6.30.4/arch/x86/kernel/head_64.S linux-2.6.30.4/arch/x86/kernel/head_64.S +--- linux-2.6.30.4/arch/x86/kernel/head_64.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/head_64.S 2009-08-01 08:46:06.399105315 -0400 +@@ -39,6 +39,10 @@ L4_PAGE_OFFSET = pgd_index(__PAGE_OFFSET L3_PAGE_OFFSET = pud_index(__PAGE_OFFSET) L4_START_KERNEL = pgd_index(__START_KERNEL_map) L3_START_KERNEL = pud_index(__START_KERNEL_map) @@ -8926,7 +9100,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern .text .section .text.head -@@ -85,35 +89,22 @@ startup_64: +@@ -86,35 +90,22 @@ startup_64: */ addq %rbp, init_level4_pgt + 0(%rip) addq %rbp, init_level4_pgt + (L4_PAGE_OFFSET*8)(%rip) @@ -8972,7 +9146,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern /* * Fixup the kernel text+data virtual addresses. Note that -@@ -187,6 +178,10 @@ ENTRY(secondary_startup_64) +@@ -188,6 +179,10 @@ ENTRY(secondary_startup_64) btl $20,%edi /* No Execute supported? */ jnc 1f btsl $_EFER_NX, %eax @@ -8983,10 +9157,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern 1: wrmsr /* Make changes effective */ /* Setup cr0 */ -@@ -257,16 +252,16 @@ ENTRY(secondary_startup_64) - .align 8 - ENTRY(initial_code) +@@ -263,16 +258,16 @@ ENTRY(secondary_startup_64) .quad x86_64_start_kernel + ENTRY(initial_gs) + .quad INIT_PER_CPU_VAR(irq_stack_union) - __FINITDATA ENTRY(stack_start) @@ -9002,7 +9176,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern #ifdef CONFIG_EARLY_PRINTK .globl early_idt_handlers early_idt_handlers: -@@ -311,18 +306,23 @@ ENTRY(early_idt_handler) +@@ -317,18 +312,23 @@ ENTRY(early_idt_handler) #endif /* EARLY_PRINTK */ 1: hlt jmp 1b @@ -9024,10 +9198,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern +#endif /* CONFIG_EARLY_PRINTK */ + .section .rodata,"a",@progbits - .balign PAGE_SIZE - #define NEXT_PAGE(name) \ -@@ -347,13 +347,27 @@ NEXT_PAGE(init_level4_pgt) + .balign PAGE_SIZE; \ + ENTRY(name) +@@ -351,13 +351,27 @@ NEXT_PAGE(init_level4_pgt) .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE .org init_level4_pgt + L4_PAGE_OFFSET*8, 0 .quad level3_ident_pgt - __START_KERNEL_map + _KERNPG_TABLE @@ -9056,7 +9230,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern NEXT_PAGE(level3_kernel_pgt) .fill L3_START_KERNEL,8,0 -@@ -361,20 +375,27 @@ NEXT_PAGE(level3_kernel_pgt) +@@ -365,20 +379,27 @@ NEXT_PAGE(level3_kernel_pgt) .quad level2_kernel_pgt - __START_KERNEL_map + _KERNPG_TABLE .quad level2_fixmap_pgt - __START_KERNEL_map + _PAGE_TABLE @@ -9089,7 +9263,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern NEXT_PAGE(level2_kernel_pgt) /* -@@ -387,32 +408,48 @@ NEXT_PAGE(level2_kernel_pgt) +@@ -391,33 +412,49 @@ NEXT_PAGE(level2_kernel_pgt) * If you want to increase this then increase MODULES_VADDR * too.) */ @@ -9129,7 +9303,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern .globl early_gdt_descr early_gdt_descr: .word GDT_ENTRIES*8-1 -- .quad per_cpu__gdt_page + early_gdt_descr_base: +- .quad INIT_PER_CPU_VAR(gdt_page) + .quad cpu_gdt_table ENTRY(phys_base) @@ -9143,14 +9318,14 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/head_64.S linux-2.6.29.6/arch/x86/kern + .section .rodata,"a",@progbits .align L1_CACHE_BYTES ENTRY(idt_table) -- .skip 256 * 16 +- .skip IDT_ENTRIES * 16 + .fill 512,8,0 .section .bss.page_aligned, "aw", @nobits .align PAGE_SIZE -diff -urNp linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c ---- linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c 2009-07-23 17:34:32.071712262 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/i386_ksyms_32.c linux-2.6.30.4/arch/x86/kernel/i386_ksyms_32.c +--- linux-2.6.30.4/arch/x86/kernel/i386_ksyms_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/i386_ksyms_32.c 2009-07-30 09:48:09.948476455 -0400 @@ -10,8 +10,12 @@ EXPORT_SYMBOL(mcount); #endif @@ -9172,9 +9347,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/i386_ksyms_32.c linux-2.6.29.6/arch/x8 +#ifdef CONFIG_PAX_KERNEXEC +EXPORT_SYMBOL(KERNEL_TEXT_OFFSET); +#endif -diff -urNp linux-2.6.29.6/arch/x86/kernel/init_task.c linux-2.6.29.6/arch/x86/kernel/init_task.c ---- linux-2.6.29.6/arch/x86/kernel/init_task.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/init_task.c 2009-07-23 17:34:32.071712262 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/init_task.c linux-2.6.30.4/arch/x86/kernel/init_task.c +--- linux-2.6.30.4/arch/x86/kernel/init_task.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/init_task.c 2009-07-30 09:48:09.948476455 -0400 @@ -40,5 +40,5 @@ EXPORT_SYMBOL(init_task); * section. Since TSS's are completely CPU-local, we want them * on exact cacheline boundaries, to eliminate cacheline ping-pong. @@ -9183,9 +9358,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/init_task.c linux-2.6.29.6/arch/x86/ke - +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS }; +EXPORT_SYMBOL(init_tss); -diff -urNp linux-2.6.29.6/arch/x86/kernel/ioport.c linux-2.6.29.6/arch/x86/kernel/ioport.c ---- linux-2.6.29.6/arch/x86/kernel/ioport.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/ioport.c 2009-07-23 17:34:32.071712262 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/ioport.c linux-2.6.30.4/arch/x86/kernel/ioport.c +--- linux-2.6.30.4/arch/x86/kernel/ioport.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/ioport.c 2009-07-30 11:10:48.918448854 -0400 @@ -6,6 +6,7 @@ #include <linux/sched.h> #include <linux/kernel.h> @@ -9216,7 +9391,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/ioport.c linux-2.6.29.6/arch/x86/kerne set_bitmap(t->io_bitmap_ptr, from, num, !turn_on); -@@ -122,8 +129,13 @@ static int do_iopl(unsigned int level, s +@@ -111,8 +118,13 @@ static int do_iopl(unsigned int level, s return -EINVAL; /* Trying to gain more privileges? */ if (level > old) { @@ -9230,10 +9405,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/ioport.c linux-2.6.29.6/arch/x86/kerne } regs->flags = (regs->flags & ~X86_EFLAGS_IOPL) | (level << 12); -diff -urNp linux-2.6.29.6/arch/x86/kernel/irq_32.c linux-2.6.29.6/arch/x86/kernel/irq_32.c ---- linux-2.6.29.6/arch/x86/kernel/irq_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/irq_32.c 2009-07-23 17:34:32.071712262 -0400 -@@ -93,7 +93,7 @@ execute_on_irq_stack(int overflow, struc +diff -urNp linux-2.6.30.4/arch/x86/kernel/irq_32.c linux-2.6.30.4/arch/x86/kernel/irq_32.c +--- linux-2.6.30.4/arch/x86/kernel/irq_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/irq_32.c 2009-07-30 09:48:09.948476455 -0400 +@@ -94,7 +94,7 @@ execute_on_irq_stack(int overflow, struc return 0; /* build the stack frame on the IRQ stack */ @@ -9242,7 +9417,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/irq_32.c linux-2.6.29.6/arch/x86/kerne irqctx->tinfo.task = curctx->tinfo.task; irqctx->tinfo.previous_esp = current_stack_pointer; -@@ -174,7 +174,7 @@ asmlinkage void do_softirq(void) +@@ -175,7 +175,7 @@ asmlinkage void do_softirq(void) irqctx->tinfo.previous_esp = current_stack_pointer; /* build the stack frame on the softirq stack */ @@ -9251,9 +9426,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/irq_32.c linux-2.6.29.6/arch/x86/kerne call_on_stack(__do_softirq, isp); /* -diff -urNp linux-2.6.29.6/arch/x86/kernel/kprobes.c linux-2.6.29.6/arch/x86/kernel/kprobes.c ---- linux-2.6.29.6/arch/x86/kernel/kprobes.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/kprobes.c 2009-07-23 17:34:32.072711199 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/kprobes.c linux-2.6.30.4/arch/x86/kernel/kprobes.c +--- linux-2.6.30.4/arch/x86/kernel/kprobes.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/kprobes.c 2009-07-30 09:48:09.948476455 -0400 @@ -166,9 +166,24 @@ static void __kprobes set_jmp_op(void *f char op; s32 raddr; @@ -9340,7 +9515,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/kprobes.c linux-2.6.29.6/arch/x86/kern /* * The breakpoint instruction was removed right * after we hit it. Another cpu has removed -@@ -774,7 +802,7 @@ static void __kprobes resume_execution(s +@@ -775,7 +803,7 @@ static void __kprobes resume_execution(s struct pt_regs *regs, struct kprobe_ctlblk *kcb) { unsigned long *tos = stack_addr(regs); @@ -9349,7 +9524,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/kprobes.c linux-2.6.29.6/arch/x86/kern unsigned long orig_ip = (unsigned long)p->addr; kprobe_opcode_t *insn = p->ainsn.insn; -@@ -957,7 +985,7 @@ int __kprobes kprobe_exceptions_notify(s +@@ -958,7 +986,7 @@ int __kprobes kprobe_exceptions_notify(s struct die_args *args = data; int ret = NOTIFY_DONE; @@ -9358,9 +9533,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/kprobes.c linux-2.6.29.6/arch/x86/kern return ret; switch (val) { -diff -urNp linux-2.6.29.6/arch/x86/kernel/ldt.c linux-2.6.29.6/arch/x86/kernel/ldt.c ---- linux-2.6.29.6/arch/x86/kernel/ldt.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/ldt.c 2009-07-23 17:34:32.072711199 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/ldt.c linux-2.6.30.4/arch/x86/kernel/ldt.c +--- linux-2.6.30.4/arch/x86/kernel/ldt.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/ldt.c 2009-07-30 09:48:09.950015875 -0400 @@ -66,13 +66,13 @@ static int alloc_ldt(mm_context_t *pc, i if (reload) { #ifdef CONFIG_SMP @@ -9425,9 +9600,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/ldt.c linux-2.6.29.6/arch/x86/kernel/l fill_ldt(&ldt, &ldt_info); if (oldmode) ldt.avl = 0; -diff -urNp linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c ---- linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c 2009-07-23 17:34:32.072711199 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/machine_kexec_32.c linux-2.6.30.4/arch/x86/kernel/machine_kexec_32.c +--- linux-2.6.30.4/arch/x86/kernel/machine_kexec_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/machine_kexec_32.c 2009-07-30 09:48:09.950015875 -0400 @@ -26,7 +26,7 @@ #include <asm/system.h> #include <asm/cacheflush.h> @@ -9446,7 +9621,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c linux-2.6.29.6/arch { struct desc_ptr curgdt; -@@ -216,7 +216,7 @@ void machine_kexec(struct kimage *image) +@@ -217,7 +217,7 @@ void machine_kexec(struct kimage *image) } control_page = page_address(image->control_code_page); @@ -9455,9 +9630,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/machine_kexec_32.c linux-2.6.29.6/arch relocate_kernel_ptr = control_page; page_list[PA_CONTROL_PAGE] = __pa(control_page); -diff -urNp linux-2.6.29.6/arch/x86/kernel/module_32.c linux-2.6.29.6/arch/x86/kernel/module_32.c ---- linux-2.6.29.6/arch/x86/kernel/module_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/module_32.c 2009-07-23 17:34:32.072711199 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/module_32.c linux-2.6.30.4/arch/x86/kernel/module_32.c +--- linux-2.6.30.4/arch/x86/kernel/module_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/module_32.c 2009-08-01 15:35:35.138919235 -0400 @@ -23,6 +23,9 @@ #include <linux/kernel.h> #include <linux/bug.h> @@ -9500,8 +9675,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_32.c linux-2.6.29.6/arch/x86/ke /* Free memory returned from module_alloc */ void module_free(struct module *mod, void *module_region) -@@ -45,6 +70,45 @@ void module_free(struct module *mod, voi - table entries. */ +@@ -45,6 +70,46 @@ void module_free(struct module *mod, voi + table entries. */ } +#ifdef CONFIG_PAX_KERNEXEC @@ -9541,12 +9716,13 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_32.c linux-2.6.29.6/arch/x86/ke + WARN_ON(1); + } +} ++EXPORT_SYMBOL(module_free_exec); +#endif + /* We don't need anything special. */ int module_frob_arch_sections(Elf_Ehdr *hdr, Elf_Shdr *sechdrs, -@@ -63,14 +127,20 @@ int apply_relocate(Elf32_Shdr *sechdrs, +@@ -63,14 +128,20 @@ int apply_relocate(Elf32_Shdr *sechdrs, unsigned int i; Elf32_Rel *rel = (void *)sechdrs[relsec].sh_addr; Elf32_Sym *sym; @@ -9570,7 +9746,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_32.c linux-2.6.29.6/arch/x86/ke /* This is the symbol it is referring to. Note that all undefined symbols have been resolved. */ sym = (Elf32_Sym *)sechdrs[symindex].sh_addr -@@ -78,12 +148,32 @@ int apply_relocate(Elf32_Shdr *sechdrs, +@@ -78,12 +149,32 @@ int apply_relocate(Elf32_Shdr *sechdrs, switch (ELF32_R_TYPE(rel[i].r_info)) { case R_386_32: @@ -9605,11 +9781,11 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_32.c linux-2.6.29.6/arch/x86/ke break; default: printk(KERN_ERR "module %s: Unknown relocation: %u\n", -diff -urNp linux-2.6.29.6/arch/x86/kernel/module_64.c linux-2.6.29.6/arch/x86/kernel/module_64.c ---- linux-2.6.29.6/arch/x86/kernel/module_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/module_64.c 2009-07-23 17:34:32.072711199 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/module_64.c linux-2.6.30.4/arch/x86/kernel/module_64.c +--- linux-2.6.30.4/arch/x86/kernel/module_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/module_64.c 2009-08-01 15:35:35.161871747 -0400 @@ -40,7 +40,7 @@ void module_free(struct module *mod, voi - table entries. */ + table entries. */ } -void *module_alloc(unsigned long size) @@ -9617,7 +9793,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_64.c linux-2.6.29.6/arch/x86/ke { struct vm_struct *area; -@@ -54,8 +54,31 @@ void *module_alloc(unsigned long size) +@@ -54,8 +54,33 @@ void *module_alloc(unsigned long size) if (!area) return NULL; @@ -9635,10 +9811,12 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_64.c linux-2.6.29.6/arch/x86/ke +{ + module_free(mod, module_region); +} ++EXPORT_SYMBOL(module_free_exec); + +void *module_alloc_exec(unsigned long size) +{ + return __module_alloc(size, PAGE_KERNEL_RX); ++EXPORT_SYMBOL(module_alloc_exec); } +#else +void *module_alloc(unsigned long size) @@ -9650,20 +9828,18 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_64.c linux-2.6.29.6/arch/x86/ke #endif /* We don't need anything special. */ -@@ -77,7 +100,11 @@ int apply_relocate_add(Elf64_Shdr *sechd - Elf64_Rela *rel = (void *)sechdrs[relsec].sh_addr; - Elf64_Sym *sym; +@@ -79,6 +104,10 @@ int apply_relocate_add(Elf64_Shdr *sechd void *loc; -- u64 val; -+ u64 val; -+ + u64 val; + +#ifdef CONFIG_PAX_KERNEXEC + unsigned long cr0; +#endif - ++ DEBUGP("Applying relocate section %u to %u\n", relsec, sechdrs[relsec].sh_info); -@@ -101,21 +128,61 @@ int apply_relocate_add(Elf64_Shdr *sechd + for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rel); i++) { +@@ -101,21 +130,61 @@ int apply_relocate_add(Elf64_Shdr *sechd case R_X86_64_NONE: break; case R_X86_64_64: @@ -9709,7 +9885,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_64.c linux-2.6.29.6/arch/x86/ke if ((s64)val != *(s32 *)loc) goto overflow; break; - case R_X86_64_PC32: + case R_X86_64_PC32: val -= (u64)loc; + +#ifdef CONFIG_PAX_KERNEXEC @@ -9724,12 +9900,12 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/module_64.c linux-2.6.29.6/arch/x86/ke + #if 0 if ((s64)val != *(s32 *)loc) - goto overflow; -diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt.c linux-2.6.29.6/arch/x86/kernel/paravirt.c ---- linux-2.6.29.6/arch/x86/kernel/paravirt.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/paravirt.c 2009-07-23 17:34:32.073727851 -0400 -@@ -44,7 +44,7 @@ void _paravirt_nop(void) - { + goto overflow; +diff -urNp linux-2.6.30.4/arch/x86/kernel/paravirt.c linux-2.6.30.4/arch/x86/kernel/paravirt.c +--- linux-2.6.30.4/arch/x86/kernel/paravirt.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/paravirt.c 2009-07-30 09:48:09.950702241 -0400 +@@ -54,7 +54,7 @@ u64 _paravirt_ident_64(u64 x) + return x; } -static void __init default_banner(void) @@ -9737,7 +9913,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt.c linux-2.6.29.6/arch/x86/ker { printk(KERN_INFO "Booting paravirtualized kernel on %s\n", pv_info.name); -@@ -164,7 +164,7 @@ unsigned paravirt_patch_insns(void *insn +@@ -183,7 +183,7 @@ unsigned paravirt_patch_insns(void *insn if (insn_len > len || start == NULL) insn_len = len; else @@ -9746,7 +9922,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt.c linux-2.6.29.6/arch/x86/ker return insn_len; } -@@ -294,21 +294,21 @@ void arch_flush_lazy_cpu_mode(void) +@@ -313,21 +313,21 @@ void arch_flush_lazy_cpu_mode(void) preempt_enable(); } @@ -9771,16 +9947,16 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt.c linux-2.6.29.6/arch/x86/ker .time_init = hpet_time_init, .get_wallclock = native_get_wallclock, .set_wallclock = native_set_wallclock, -@@ -316,7 +316,7 @@ struct pv_time_ops pv_time_ops = { +@@ -335,7 +335,7 @@ struct pv_time_ops pv_time_ops = { .get_tsc_khz = native_calibrate_tsc, }; -struct pv_irq_ops pv_irq_ops = { +struct pv_irq_ops pv_irq_ops __read_only = { .init_IRQ = native_init_IRQ, - .save_fl = native_save_fl, - .restore_fl = native_restore_fl, -@@ -329,7 +329,7 @@ struct pv_irq_ops pv_irq_ops = { + .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl), + .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl), +@@ -348,7 +348,7 @@ struct pv_irq_ops pv_irq_ops = { #endif }; @@ -9789,7 +9965,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt.c linux-2.6.29.6/arch/x86/ker .cpuid = native_cpuid, .get_debugreg = native_get_debugreg, .set_debugreg = native_set_debugreg, -@@ -391,7 +391,7 @@ struct pv_cpu_ops pv_cpu_ops = { +@@ -410,7 +410,7 @@ struct pv_cpu_ops pv_cpu_ops = { }, }; @@ -9798,18 +9974,18 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt.c linux-2.6.29.6/arch/x86/ker #ifdef CONFIG_X86_LOCAL_APIC .setup_boot_clock = setup_boot_APIC_clock, .setup_secondary_clock = setup_secondary_APIC_clock, -@@ -399,7 +399,7 @@ struct pv_apic_ops pv_apic_ops = { +@@ -426,7 +426,7 @@ struct pv_apic_ops pv_apic_ops = { + #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64) #endif - }; -struct pv_mmu_ops pv_mmu_ops = { +struct pv_mmu_ops pv_mmu_ops __read_only = { #ifndef CONFIG_X86_64 .pagetable_setup_start = native_pagetable_setup_start, .pagetable_setup_done = native_pagetable_setup_done, -diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c ---- linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c 2009-07-23 17:34:32.073727851 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.30.4/arch/x86/kernel/paravirt-spinlocks.c +--- linux-2.6.30.4/arch/x86/kernel/paravirt-spinlocks.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/paravirt-spinlocks.c 2009-07-30 09:48:09.950702241 -0400 @@ -13,7 +13,7 @@ default_spin_lock_flags(raw_spinlock_t * __raw_spin_lock(lock); } @@ -9819,21 +9995,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/paravirt-spinlocks.c linux-2.6.29.6/ar #ifdef CONFIG_SMP .spin_is_locked = __ticket_spin_is_locked, .spin_is_contended = __ticket_spin_is_contended, -diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/kernel/process_32.c ---- linux-2.6.29.6/arch/x86/kernel/process_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/process_32.c 2009-07-23 17:34:32.073727851 -0400 -@@ -66,8 +66,10 @@ asmlinkage void ret_from_fork(void) __as - DEFINE_PER_CPU(struct task_struct *, current_task) = &init_task; - EXPORT_PER_CPU_SYMBOL(current_task); - -+#ifdef CONFIG_SMP - DEFINE_PER_CPU(int, cpu_number); - EXPORT_PER_CPU_SYMBOL(cpu_number); -+#endif - - /* - * Return saved PC of a blocked thread. -@@ -75,6 +77,7 @@ EXPORT_PER_CPU_SYMBOL(cpu_number); +diff -urNp linux-2.6.30.4/arch/x86/kernel/process_32.c linux-2.6.30.4/arch/x86/kernel/process_32.c +--- linux-2.6.30.4/arch/x86/kernel/process_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/process_32.c 2009-07-30 09:48:09.951950745 -0400 +@@ -73,6 +73,7 @@ EXPORT_PER_CPU_SYMBOL(current_task); unsigned long thread_saved_pc(struct task_struct *tsk) { return ((unsigned long *)tsk->thread.sp)[3]; @@ -9841,7 +10006,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k } #ifndef CONFIG_SMP -@@ -129,7 +132,7 @@ void __show_regs(struct pt_regs *regs, i +@@ -135,7 +136,7 @@ void __show_regs(struct pt_regs *regs, i unsigned short ss, gs; const char *board; @@ -9849,8 +10014,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k + if (user_mode(regs)) { sp = regs->sp; ss = regs->ss & 0xffff; - savesegment(gs, gs); -@@ -210,8 +213,8 @@ int kernel_thread(int (*fn)(void *), voi + gs = get_user_gs(regs); +@@ -216,8 +217,8 @@ int kernel_thread(int (*fn)(void *), voi regs.bx = (unsigned long) fn; regs.dx = (unsigned long) arg; @@ -9859,26 +10024,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k + regs.ds = __KERNEL_DS; + regs.es = __KERNEL_DS; regs.fs = __KERNEL_PERCPU; + regs.gs = __KERNEL_STACK_CANARY; regs.orig_ax = -1; - regs.ip = (unsigned long) kernel_thread_helper; -@@ -233,7 +236,7 @@ void exit_thread(void) - struct task_struct *tsk = current; - struct thread_struct *t = &tsk->thread; - int cpu = get_cpu(); -- struct tss_struct *tss = &per_cpu(init_tss, cpu); -+ struct tss_struct *tss = init_tss + cpu; - - kfree(t->io_bitmap_ptr); - t->io_bitmap_ptr = NULL; -@@ -256,6 +259,7 @@ void flush_thread(void) - { - struct task_struct *tsk = current; - -+ loadsegment(gs, 0); - tsk->thread.debugreg0 = 0; - tsk->thread.debugreg1 = 0; - tsk->thread.debugreg2 = 0; -@@ -295,7 +299,7 @@ int copy_thread(int nr, unsigned long cl +@@ -253,7 +254,7 @@ int copy_thread(unsigned long clone_flag struct task_struct *tsk; int err; @@ -9887,7 +10035,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k *childregs = *regs; childregs->ax = 0; childregs->sp = sp; -@@ -324,6 +328,7 @@ int copy_thread(int nr, unsigned long cl +@@ -282,6 +283,7 @@ int copy_thread(unsigned long clone_flag * Set a new TLS for the child thread? */ if (clone_flags & CLONE_SETTLS) @@ -9895,7 +10043,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k err = do_set_thread_area(p, -1, (struct user_desc __user *)childregs->si, 0); -@@ -514,7 +519,7 @@ __switch_to(struct task_struct *prev_p, +@@ -351,7 +353,7 @@ __switch_to(struct task_struct *prev_p, struct thread_struct *prev = &prev_p->thread, *next = &next_p->thread; int cpu = smp_processor_id(); @@ -9904,9 +10052,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k /* never put a printk in __switch_to... printk() calls wake_up*() indirectly */ -@@ -542,6 +547,11 @@ __switch_to(struct task_struct *prev_p, +@@ -379,6 +381,11 @@ __switch_to(struct task_struct *prev_p, */ - savesegment(gs, prev->gs); + lazy_save_gs(prev->gs); +#ifdef CONFIG_PAX_MEMORY_UDEREF + if (!segment_eq(task_thread_info(prev_p)->addr_limit, task_thread_info(next_p)->addr_limit)) @@ -9916,7 +10064,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k /* * Load the per-thread Thread-Local Storage descriptor. */ -@@ -680,15 +690,27 @@ unsigned long get_wchan(struct task_stru +@@ -497,15 +504,27 @@ unsigned long get_wchan(struct task_stru return 0; } @@ -9953,10 +10101,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_32.c linux-2.6.29.6/arch/x86/k + load_sp0(init_tss + smp_processor_id(), thread); } +#endif -diff -urNp linux-2.6.29.6/arch/x86/kernel/process_64.c linux-2.6.29.6/arch/x86/kernel/process_64.c ---- linux-2.6.29.6/arch/x86/kernel/process_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/process_64.c 2009-07-23 17:34:32.073727851 -0400 -@@ -91,7 +91,7 @@ static void __exit_idle(void) +diff -urNp linux-2.6.30.4/arch/x86/kernel/process_64.c linux-2.6.30.4/arch/x86/kernel/process_64.c +--- linux-2.6.30.4/arch/x86/kernel/process_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/process_64.c 2009-07-30 09:48:09.951950745 -0400 +@@ -97,7 +97,7 @@ static void __exit_idle(void) void exit_idle(void) { /* idle loop has pid 0 */ @@ -9965,16 +10113,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_64.c linux-2.6.29.6/arch/x86/k return; __exit_idle(); } -@@ -112,6 +112,8 @@ static inline void play_dead(void) - void cpu_idle(void) - { - current_thread_info()->status |= TS_POLLING; -+ current->stack_canary = pax_get_random_long(); -+ write_pda(stack_canary, current->stack_canary); - /* endless idle loop with no priority at all */ - while (1) { - tick_nohz_stop_sched_tick(1); -@@ -160,7 +162,7 @@ void __show_regs(struct pt_regs *regs, i +@@ -176,7 +176,7 @@ void __show_regs(struct pt_regs *regs, i if (!board) board = ""; printk(KERN_INFO "Pid: %d, comm: %.20s %s %s %.*s %s\n", @@ -9983,16 +10122,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_64.c linux-2.6.29.6/arch/x86/k init_utsname()->release, (int)strcspn(init_utsname()->version, " "), init_utsname()->version, board); -@@ -230,7 +232,7 @@ void exit_thread(void) - struct thread_struct *t = &me->thread; - - if (me->thread.io_bitmap_ptr) { -- struct tss_struct *tss = &per_cpu(init_tss, get_cpu()); -+ struct tss_struct *tss = init_tss + get_cpu(); - - kfree(t->io_bitmap_ptr); - t->io_bitmap_ptr = NULL; -@@ -537,7 +539,7 @@ __switch_to(struct task_struct *prev_p, +@@ -386,7 +386,7 @@ __switch_to(struct task_struct *prev_p, struct thread_struct *prev = &prev_p->thread; struct thread_struct *next = &next_p->thread; int cpu = smp_processor_id(); @@ -10001,15 +10131,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_64.c linux-2.6.29.6/arch/x86/k unsigned fsindex, gsindex; /* we're going to use this soon, after a few expensive things */ -@@ -626,7 +628,6 @@ __switch_to(struct task_struct *prev_p, - (unsigned long)task_stack_page(next_p) + - THREAD_SIZE - PDA_STACKOFFSET); - #ifdef CONFIG_CC_STACKPROTECTOR -- write_pda(stack_canary, next_p->stack_canary); - /* - * Build time only check to make sure the stack_canary is at - * offset 40 in the pda; this is a gcc ABI requirement -@@ -725,12 +726,11 @@ unsigned long get_wchan(struct task_stru +@@ -545,12 +545,11 @@ unsigned long get_wchan(struct task_stru if (!p || p == current || p->state == TASK_RUNNING) return 0; stack = (unsigned long)task_stack_page(p); @@ -10024,7 +10146,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_64.c linux-2.6.29.6/arch/x86/k return 0; ip = *(u64 *)(fp+8); if (!in_sched_functions(ip)) -@@ -839,16 +839,3 @@ long sys_arch_prctl(int code, unsigned l +@@ -659,16 +658,3 @@ long sys_arch_prctl(int code, unsigned l { return do_arch_prctl(current, code, addr); } @@ -10041,10 +10163,32 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/process_64.c linux-2.6.29.6/arch/x86/k - unsigned long range_end = mm->brk + 0x02000000; - return randomize_range(mm->brk, range_end, 0) ? : mm->brk; -} -diff -urNp linux-2.6.29.6/arch/x86/kernel/ptrace.c linux-2.6.29.6/arch/x86/kernel/ptrace.c ---- linux-2.6.29.6/arch/x86/kernel/ptrace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/ptrace.c 2009-07-23 17:34:32.073727851 -0400 -@@ -1377,7 +1377,7 @@ void send_sigtrap(struct task_struct *ts +diff -urNp linux-2.6.30.4/arch/x86/kernel/process.c linux-2.6.30.4/arch/x86/kernel/process.c +--- linux-2.6.30.4/arch/x86/kernel/process.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/process.c 2009-07-30 09:48:09.950702241 -0400 +@@ -71,7 +71,7 @@ void exit_thread(void) + unsigned long *bp = t->io_bitmap_ptr; + + if (bp) { +- struct tss_struct *tss = &per_cpu(init_tss, get_cpu()); ++ struct tss_struct *tss = init_tss + get_cpu(); + + t->io_bitmap_ptr = NULL; + clear_thread_flag(TIF_IO_BITMAP); +@@ -105,6 +105,9 @@ void flush_thread(void) + + clear_tsk_thread_flag(tsk, TIF_DEBUG); + ++#ifndef CONFIG_CC_STACKPROTECTOR ++ loadsegment(gs, 0); ++#endif + tsk->thread.debugreg0 = 0; + tsk->thread.debugreg1 = 0; + tsk->thread.debugreg2 = 0; +diff -urNp linux-2.6.30.4/arch/x86/kernel/ptrace.c linux-2.6.30.4/arch/x86/kernel/ptrace.c +--- linux-2.6.30.4/arch/x86/kernel/ptrace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/ptrace.c 2009-07-30 09:48:09.952643339 -0400 +@@ -1374,7 +1374,7 @@ void send_sigtrap(struct task_struct *ts info.si_code = si_code; /* User-mode ip? */ @@ -10053,10 +10197,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/ptrace.c linux-2.6.29.6/arch/x86/kerne /* Send us the fake SIGTRAP */ force_sig_info(SIGTRAP, &info, tsk); -diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kernel/reboot.c ---- linux-2.6.29.6/arch/x86/kernel/reboot.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/reboot.c 2009-07-23 17:34:32.073727851 -0400 -@@ -32,7 +32,7 @@ void (*pm_power_off)(void); +diff -urNp linux-2.6.30.4/arch/x86/kernel/reboot.c linux-2.6.30.4/arch/x86/kernel/reboot.c +--- linux-2.6.30.4/arch/x86/kernel/reboot.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/reboot.c 2009-07-30 09:48:09.952643339 -0400 +@@ -31,7 +31,7 @@ void (*pm_power_off)(void); EXPORT_SYMBOL(pm_power_off); static const struct desc_ptr no_idt = {}; @@ -10065,8 +10209,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kerne enum reboot_type reboot_type = BOOT_KBD; int reboot_force; -@@ -234,7 +234,7 @@ static struct dmi_system_id __initdata r - DMI_MATCH(DMI_PRODUCT_NAME, "Dell XPS710"), +@@ -249,7 +249,7 @@ static struct dmi_system_id __initdata r + DMI_MATCH(DMI_PRODUCT_NAME, "VGN-Z540N"), }, }, - { } @@ -10074,7 +10218,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kerne }; static int __init reboot_init(void) -@@ -250,12 +250,12 @@ core_initcall(reboot_init); +@@ -265,12 +265,12 @@ core_initcall(reboot_init); controller to pulse the CPU reset line, which is more thorough, but doesn't work with at least one type of 486 motherboard. It is easy to stop this code working; hence the copious comments. */ @@ -10092,7 +10236,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kerne }; static const struct desc_ptr -@@ -304,7 +304,7 @@ static const unsigned char jump_to_bios +@@ -319,7 +319,7 @@ static const unsigned char jump_to_bios * specified by the code and length parameters. * We assume that length will aways be less that 100! */ @@ -10101,7 +10245,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kerne { local_irq_disable(); -@@ -324,8 +324,8 @@ void machine_real_restart(const unsigned +@@ -339,8 +339,8 @@ void machine_real_restart(const unsigned /* Remap the kernel at virtual address zero, as well as offset zero from the kernel segment. This assumes the kernel segment starts at virtual address PAGE_OFFSET. */ @@ -10112,7 +10256,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kerne /* * Use `swapper_pg_dir' as our page directory. -@@ -337,16 +337,15 @@ void machine_real_restart(const unsigned +@@ -352,16 +352,15 @@ void machine_real_restart(const unsigned boot)". This seems like a fairly standard thing that gets set by REBOOT.COM programs, and the previous reset routine did this too. */ @@ -10132,10 +10276,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/reboot.c linux-2.6.29.6/arch/x86/kerne /* Set up the IDT for real mode. */ load_idt(&real_mode_idt); -diff -urNp linux-2.6.29.6/arch/x86/kernel/setup.c linux-2.6.29.6/arch/x86/kernel/setup.c ---- linux-2.6.29.6/arch/x86/kernel/setup.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/setup.c 2009-07-23 17:34:32.075127987 -0400 -@@ -703,8 +703,8 @@ void __init setup_arch(char **cmdline_p) +diff -urNp linux-2.6.30.4/arch/x86/kernel/setup.c linux-2.6.30.4/arch/x86/kernel/setup.c +--- linux-2.6.30.4/arch/x86/kernel/setup.c 2009-07-30 20:32:40.383618032 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/setup.c 2009-07-30 20:32:47.940599318 -0400 +@@ -740,14 +740,14 @@ void __init setup_arch(char **cmdline_p) if (!boot_params.hdr.root_flags) root_mountflags &= ~MS_RDONLY; @@ -10144,11 +10288,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/setup.c linux-2.6.29.6/arch/x86/kernel + init_mm.start_code = ktla_ktva((unsigned long) _text); + init_mm.end_code = ktla_ktva((unsigned long) _etext); init_mm.end_data = (unsigned long) _edata; - #ifdef CONFIG_X86_32 - init_mm.brk = init_pg_tables_end + PAGE_OFFSET; -@@ -712,9 +712,9 @@ void __init setup_arch(char **cmdline_p) - init_mm.brk = (unsigned long) &_end; - #endif + init_mm.brk = _brk_end; - code_resource.start = virt_to_phys(_text); - code_resource.end = virt_to_phys(_etext)-1; @@ -10159,34 +10299,101 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/setup.c linux-2.6.29.6/arch/x86/kernel data_resource.end = virt_to_phys(_edata)-1; bss_resource.start = virt_to_phys(&__bss_start); bss_resource.end = virt_to_phys(&__bss_stop)-1; -diff -urNp linux-2.6.29.6/arch/x86/kernel/setup_percpu.c linux-2.6.29.6/arch/x86/kernel/setup_percpu.c ---- linux-2.6.29.6/arch/x86/kernel/setup_percpu.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/setup_percpu.c 2009-07-23 17:34:32.075127987 -0400 -@@ -197,7 +197,11 @@ void __init setup_per_cpu_areas(void) - cpu, node, __pa(ptr)); - } +diff -urNp linux-2.6.30.4/arch/x86/kernel/setup_percpu.c linux-2.6.30.4/arch/x86/kernel/setup_percpu.c +--- linux-2.6.30.4/arch/x86/kernel/setup_percpu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/setup_percpu.c 2009-08-04 17:52:34.388856060 -0400 +@@ -25,19 +25,17 @@ + # define DBG(x...) #endif -+#ifdef CONFIG_X86_32 -+ __per_cpu_offset[cpu] = ptr - __per_cpu_start; -+#else - per_cpu_offset(cpu) = ptr - __per_cpu_start; + ++#ifdef CONFIG_SMP + DEFINE_PER_CPU(int, cpu_number); + EXPORT_PER_CPU_SYMBOL(cpu_number); +#endif - memcpy(ptr, __per_cpu_start, __per_cpu_end - __per_cpu_start); - } -diff -urNp linux-2.6.29.6/arch/x86/kernel/signal.c linux-2.6.29.6/arch/x86/kernel/signal.c ---- linux-2.6.29.6/arch/x86/kernel/signal.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/signal.c 2009-07-23 17:34:32.075127987 -0400 -@@ -255,7 +255,7 @@ get_sigframe(struct k_sigaction *ka, str +-#ifdef CONFIG_X86_64 + #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load) +-#else +-#define BOOT_PERCPU_OFFSET 0 +-#endif + + DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET; + EXPORT_PER_CPU_SYMBOL(this_cpu_off); + +-unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = { ++unsigned long __per_cpu_offset[NR_CPUS] __read_only = { + [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET, + }; + EXPORT_SYMBOL(__per_cpu_offset); +@@ -333,16 +331,18 @@ out_free_ar: + return ret; + } + +-static inline void setup_percpu_segment(int cpu) ++static inline void setup_percpu_segment(int cpu, size_t size) + { + #ifdef CONFIG_X86_32 +- struct desc_struct gdt; ++ struct desc_struct d, *gdt = get_cpu_gdt_table(cpu); ++ unsigned long base; + +- pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF, +- 0x2 | DESCTYPE_S, 0x8); +- gdt.s = 1; +- write_gdt_entry(get_cpu_gdt_table(cpu), +- GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); ++ base = per_cpu_offset(cpu); ++ if (size <= 64*1024) ++ pack_descriptor(&d, base, size-1, 0x80 | DESCTYPE_S | 0x3, 0x4); ++ else ++ pack_descriptor(&d, base, (size-1) >> PAGE_SHIFT, 0x80 | DESCTYPE_S | 0x3, 0xC); ++ write_gdt_entry(gdt, GDT_ENTRY_PERCPU, &d, DESCTYPE_S); + #endif + } + +@@ -381,10 +381,15 @@ void __init setup_per_cpu_areas(void) + /* alrighty, percpu areas up and running */ + delta = (unsigned long)pcpu_base_addr - (unsigned long)__per_cpu_start; + for_each_possible_cpu(cpu) { ++#ifdef CONFIG_CC_STACKPROTECTOR ++#ifdef CONFIG_x86_32 ++ unsigned long canary = per_cpu(stack_canary, cpu); ++#endif ++#endif + per_cpu_offset(cpu) = delta + cpu * pcpu_unit_size; + per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu); + per_cpu(cpu_number, cpu) = cpu; +- setup_percpu_segment(cpu); ++ setup_percpu_segment(cpu, static_size + PERCPU_MODULE_RESERVE + PERCPU_DYNAMIC_RESERVE); + setup_stack_canary_segment(cpu); + /* + * Copy data used in early init routines from the +@@ -408,6 +413,12 @@ void __init setup_per_cpu_areas(void) + early_per_cpu_map(x86_cpu_to_node_map, cpu); + #endif + #endif ++#ifdef CONFIG_CC_STACKPROTECTOR ++#ifdef CONFIG_x86_32 ++ if (cpu == boot_cpu_id) ++ per_cpu(stack_canary, cpu) = canary; ++#endif ++#endif + /* + * Up to this point, the boot CPU has been using .data.init + * area. Reload any changed state for the boot CPU. +diff -urNp linux-2.6.30.4/arch/x86/kernel/signal.c linux-2.6.30.4/arch/x86/kernel/signal.c +--- linux-2.6.30.4/arch/x86/kernel/signal.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/signal.c 2009-07-30 09:48:09.958625901 -0400 +@@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi * Align the stack pointer according to the i386 ABI, * i.e. so that on function entry ((sp + 4) & 15) == 0. */ - sp = ((sp + 4) & -16ul) - 4; + sp = ((sp - 12) & -16ul) - 4; - - return (void __user *) sp; - } -@@ -287,9 +287,9 @@ __setup_frame(int sig, struct k_sigactio + #else /* !CONFIG_X86_32 */ + sp = round_down(sp, 16) - 8; + #endif +@@ -308,9 +308,9 @@ __setup_frame(int sig, struct k_sigactio } if (current->mm->context.vdso) @@ -10198,16 +10405,16 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/signal.c linux-2.6.29.6/arch/x86/kerne if (ka->sa.sa_flags & SA_RESTORER) restorer = ka->sa.sa_restorer; -@@ -360,7 +360,7 @@ static int __setup_rt_frame(int sig, str - return -EFAULT; +@@ -378,7 +378,7 @@ static int __setup_rt_frame(int sig, str + err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); - /* Set up to return from userspace. */ -- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); -+ restorer = (void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); - if (ka->sa.sa_flags & SA_RESTORER) - restorer = ka->sa.sa_restorer; - err |= __put_user(restorer, &frame->pretcode); -@@ -811,7 +811,7 @@ static void do_signal(struct pt_regs *re + /* Set up to return from userspace. */ +- restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); ++ restorer = (void __user *)VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); + if (ka->sa.sa_flags & SA_RESTORER) + restorer = ka->sa.sa_restorer; + put_user_ex(restorer, &frame->pretcode); +@@ -790,7 +790,7 @@ static void do_signal(struct pt_regs *re * X86_32: vm86 regs switched out by assembly code before reaching * here, so testing against kernel CS suffices. */ @@ -10216,24 +10423,23 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/signal.c linux-2.6.29.6/arch/x86/kerne return; if (current_thread_info()->status & TS_RESTORE_SIGMASK) -diff -urNp linux-2.6.29.6/arch/x86/kernel/smpboot.c linux-2.6.29.6/arch/x86/kernel/smpboot.c ---- linux-2.6.29.6/arch/x86/kernel/smpboot.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/smpboot.c 2009-07-23 17:34:32.076107253 -0400 -@@ -806,6 +806,11 @@ static int __cpuinit do_boot_cpu(int api - .cpu = cpu, - .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), +diff -urNp linux-2.6.30.4/arch/x86/kernel/smpboot.c linux-2.6.30.4/arch/x86/kernel/smpboot.c +--- linux-2.6.30.4/arch/x86/kernel/smpboot.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/smpboot.c 2009-07-30 09:48:09.958625901 -0400 +@@ -685,6 +685,10 @@ static int __cpuinit do_boot_cpu(int api + .done = COMPLETION_INITIALIZER_ONSTACK(c_idle.done), }; -+ + +#ifdef CONFIG_PAX_KERNEXEC + unsigned long cr0; +#endif + INIT_WORK(&c_idle.work, do_fork_idle); - #ifdef CONFIG_X86_64 -@@ -856,7 +861,17 @@ do_rest: - cpu_pda(cpu)->pcurrent = c_idle.idle; - clear_tsk_thread_flag(c_idle.idle, TIF_FORK); + alternatives_smp_switch(1); +@@ -727,7 +731,17 @@ do_rest: + (unsigned long)task_stack_page(c_idle.idle) - + KERNEL_STACK_OFFSET + THREAD_SIZE; #endif + +#ifdef CONFIG_PAX_KERNEXEC @@ -10249,51 +10455,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/smpboot.c linux-2.6.29.6/arch/x86/kern initial_code = (unsigned long)start_secondary; stack_start.sp = (void *) c_idle.idle->thread.sp; -diff -urNp linux-2.6.29.6/arch/x86/kernel/smpcommon.c linux-2.6.29.6/arch/x86/kernel/smpcommon.c ---- linux-2.6.29.6/arch/x86/kernel/smpcommon.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/smpcommon.c 2009-07-23 17:34:32.076107253 -0400 -@@ -3,9 +3,10 @@ - */ - #include <linux/module.h> - #include <asm/smp.h> -+#include <asm/sections.h> - - #ifdef CONFIG_X86_32 --DEFINE_PER_CPU(unsigned long, this_cpu_off); -+DEFINE_PER_CPU(unsigned long, this_cpu_off) = (unsigned long)__per_cpu_start; - EXPORT_PER_CPU_SYMBOL(this_cpu_off); - - /* -@@ -15,16 +16,19 @@ EXPORT_PER_CPU_SYMBOL(this_cpu_off); - */ - __cpuinit void init_gdt(int cpu) - { -- struct desc_struct gdt; -+ struct desc_struct d, *gdt = get_cpu_gdt_table(cpu); -+ unsigned long base, limit; - -- pack_descriptor(&gdt, __per_cpu_offset[cpu], 0xFFFFF, -- 0x2 | DESCTYPE_S, 0x8); -- gdt.s = 1; -+ base = per_cpu_offset(cpu); -+ limit = PERCPU_ENOUGH_ROOM - 1; -+ if (limit < 64*1024) -+ pack_descriptor(&d, base, limit, 0x80 | DESCTYPE_S | 0x3, 0x4); -+ else -+ pack_descriptor(&d, base, limit >> PAGE_SHIFT, 0x80 | DESCTYPE_S | 0x3, 0xC); - -- write_gdt_entry(get_cpu_gdt_table(cpu), -- GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); -+ write_gdt_entry(gdt, GDT_ENTRY_PERCPU, &d, DESCTYPE_S); - -- per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu]; -+ per_cpu(this_cpu_off, cpu) = base; - per_cpu(cpu_number, cpu) = cpu; - } - #endif -diff -urNp linux-2.6.29.6/arch/x86/kernel/step.c linux-2.6.29.6/arch/x86/kernel/step.c ---- linux-2.6.29.6/arch/x86/kernel/step.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/step.c 2009-07-23 17:34:32.076107253 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/step.c linux-2.6.30.4/arch/x86/kernel/step.c +--- linux-2.6.30.4/arch/x86/kernel/step.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/step.c 2009-07-30 09:48:09.958625901 -0400 @@ -23,22 +23,20 @@ unsigned long convert_ip_to_linear(struc * and APM bios ones we just ignore here. */ @@ -10343,17 +10507,17 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/step.c linux-2.6.29.6/arch/x86/kernel/ /* 32-bit mode: register increment */ return 0; /* 64-bit mode: REX prefix */ -diff -urNp linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S ---- linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/syscall_table_32.S 2009-07-23 17:34:32.076778086 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/syscall_table_32.S linux-2.6.30.4/arch/x86/kernel/syscall_table_32.S +--- linux-2.6.30.4/arch/x86/kernel/syscall_table_32.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/syscall_table_32.S 2009-07-30 09:48:09.959782846 -0400 @@ -1,3 +1,4 @@ +.section .rodata,"a",@progbits ENTRY(sys_call_table) .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ .long sys_exit -diff -urNp linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c ---- linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c 2009-07-23 17:34:32.076778086 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/sys_i386_32.c linux-2.6.30.4/arch/x86/kernel/sys_i386_32.c +--- linux-2.6.30.4/arch/x86/kernel/sys_i386_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/sys_i386_32.c 2009-07-30 09:48:09.958625901 -0400 @@ -24,6 +24,21 @@ #include <asm/syscalls.h> @@ -10582,9 +10746,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/sys_i386_32.c linux-2.6.29.6/arch/x86/ struct sel_arg_struct { unsigned long n; -diff -urNp linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c ---- linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c 2009-07-23 17:34:32.076778086 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/sys_x86_64.c linux-2.6.30.4/arch/x86/kernel/sys_x86_64.c +--- linux-2.6.30.4/arch/x86/kernel/sys_x86_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/sys_x86_64.c 2009-07-30 09:48:09.959782846 -0400 @@ -47,8 +47,8 @@ out: return error; } @@ -10666,9 +10830,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/sys_x86_64.c linux-2.6.29.6/arch/x86/k mm->cached_hole_size = ~0UL; return addr; -diff -urNp linux-2.6.29.6/arch/x86/kernel/time_32.c linux-2.6.29.6/arch/x86/kernel/time_32.c ---- linux-2.6.29.6/arch/x86/kernel/time_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/time_32.c 2009-07-23 17:34:32.076778086 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/time_32.c linux-2.6.30.4/arch/x86/kernel/time_32.c +--- linux-2.6.30.4/arch/x86/kernel/time_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/time_32.c 2009-07-30 09:48:09.959782846 -0400 @@ -47,22 +47,32 @@ unsigned long profile_pc(struct pt_regs unsigned long pc = instruction_pointer(regs); @@ -10704,9 +10868,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/time_32.c linux-2.6.29.6/arch/x86/kern return pc; } EXPORT_SYMBOL(profile_pc); -diff -urNp linux-2.6.29.6/arch/x86/kernel/time_64.c linux-2.6.29.6/arch/x86/kernel/time_64.c ---- linux-2.6.29.6/arch/x86/kernel/time_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/time_64.c 2009-07-23 17:34:32.076778086 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/time_64.c linux-2.6.30.4/arch/x86/kernel/time_64.c +--- linux-2.6.30.4/arch/x86/kernel/time_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/time_64.c 2009-07-30 09:48:09.960740129 -0400 @@ -25,8 +25,6 @@ #include <asm/time.h> #include <asm/timer.h> @@ -10725,21 +10889,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/time_64.c linux-2.6.29.6/arch/x86/kern #ifdef CONFIG_FRAME_POINTER return *(unsigned long *)(regs->bp + sizeof(long)); #else -diff -urNp linux-2.6.29.6/arch/x86/kernel/tlb_32.c linux-2.6.29.6/arch/x86/kernel/tlb_32.c ---- linux-2.6.29.6/arch/x86/kernel/tlb_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/tlb_32.c 2009-07-23 17:34:32.076778086 -0400 -@@ -5,7 +5,7 @@ - #include <asm/tlbflush.h> - - DEFINE_PER_CPU(struct tlb_state, cpu_tlbstate) -- ____cacheline_aligned = { &init_mm, 0, }; -+ ____cacheline_aligned = { &init_mm, 0, {0} }; - - /* must come after the send_IPI functions above for inlining */ - #include <mach_ipi.h> -diff -urNp linux-2.6.29.6/arch/x86/kernel/tls.c linux-2.6.29.6/arch/x86/kernel/tls.c ---- linux-2.6.29.6/arch/x86/kernel/tls.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/tls.c 2009-07-23 17:34:32.077892704 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/tls.c linux-2.6.30.4/arch/x86/kernel/tls.c +--- linux-2.6.30.4/arch/x86/kernel/tls.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/tls.c 2009-07-30 09:48:09.960740129 -0400 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX) return -EINVAL; @@ -10752,10 +10904,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/tls.c linux-2.6.29.6/arch/x86/kernel/t set_tls_desc(p, idx, &info, 1); return 0; -diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel/traps.c ---- linux-2.6.29.6/arch/x86/kernel/traps.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/traps.c 2009-07-23 17:34:32.077892704 -0400 -@@ -71,14 +71,6 @@ asmlinkage int system_call(void); +diff -urNp linux-2.6.30.4/arch/x86/kernel/traps.c linux-2.6.30.4/arch/x86/kernel/traps.c +--- linux-2.6.30.4/arch/x86/kernel/traps.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/traps.c 2009-07-30 09:48:09.961532028 -0400 +@@ -70,14 +70,6 @@ asmlinkage int system_call(void); /* Do we ignore FPU interrupts ? */ char ignore_fpu_irq; @@ -10770,7 +10922,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel #endif DECLARE_BITMAP(used_vectors, NR_VECTORS); -@@ -116,7 +108,7 @@ static inline void preempt_conditional_c +@@ -115,7 +107,7 @@ static inline void preempt_conditional_c static inline void die_if_kernel(const char *str, struct pt_regs *regs, long err) { @@ -10778,17 +10930,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel + if (!user_mode(regs)) die(str, regs, err); } - -@@ -133,7 +125,7 @@ static int lazy_iobitmap_copy(void) - int cpu; - - cpu = get_cpu(); -- tss = &per_cpu(init_tss, cpu); -+ tss = init_tss + cpu; - thread = ¤t->thread; - - if (tss->x86_tss.io_bitmap_base == INVALID_IO_BITMAP_OFFSET_LAZY && -@@ -169,7 +161,7 @@ do_trap(int trapnr, int signr, char *str + #endif +@@ -127,7 +119,7 @@ do_trap(int trapnr, int signr, char *str struct task_struct *tsk = current; #ifdef CONFIG_X86_32 @@ -10797,7 +10940,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel /* * traps 0, 1, 3, 4, and 5 should be forwarded to vm86. * On nmi (interrupt 2), do_trap should not be called. -@@ -180,7 +172,7 @@ do_trap(int trapnr, int signr, char *str +@@ -138,7 +130,7 @@ do_trap(int trapnr, int signr, char *str } #endif @@ -10806,7 +10949,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel goto kernel_trap; #ifdef CONFIG_X86_32 -@@ -203,7 +195,7 @@ trap_signal: +@@ -161,7 +153,7 @@ trap_signal: printk_ratelimit()) { printk(KERN_INFO "%s[%d] trap %s ip:%lx sp:%lx error:%lx", @@ -10815,7 +10958,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel regs->ip, regs->sp, error_code); print_vma_addr(" in ", regs->ip); printk("\n"); -@@ -222,6 +214,12 @@ kernel_trap: +@@ -180,6 +172,12 @@ kernel_trap: tsk->thread.trap_no = trapnr; die(str, regs, error_code); } @@ -10828,10 +10971,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel return; #ifdef CONFIG_X86_32 -@@ -315,14 +313,30 @@ do_general_protection(struct pt_regs *re - return; - } +@@ -268,14 +266,30 @@ do_general_protection(struct pt_regs *re + conditional_sti(regs); + #ifdef CONFIG_X86_32 - if (regs->flags & X86_VM_MASK) + if (v8086_mode(regs)) goto gp_in_vm86; @@ -10861,7 +11004,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel tsk->thread.error_code = error_code; tsk->thread.trap_no = 13; -@@ -355,6 +369,13 @@ gp_in_kernel: +@@ -308,6 +322,13 @@ gp_in_kernel: if (notify_die(DIE_GPF, "general protection fault", regs, error_code, 13, SIGSEGV) == NOTIFY_STOP) return; @@ -10875,7 +11018,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel die("general protection fault", regs, error_code); } -@@ -601,7 +622,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -554,7 +575,7 @@ dotraplinkage void __kprobes do_debug(st } #ifdef CONFIG_X86_32 @@ -10884,7 +11027,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel goto debug_vm86; #endif -@@ -613,7 +634,7 @@ dotraplinkage void __kprobes do_debug(st +@@ -566,7 +587,7 @@ dotraplinkage void __kprobes do_debug(st * kernel space (but re-enable TF when returning to user mode). */ if (condition & DR_STEP) { @@ -10893,7 +11036,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel goto clear_TF_reenable; } -@@ -800,7 +821,7 @@ do_simd_coprocessor_error(struct pt_regs +@@ -753,7 +774,7 @@ do_simd_coprocessor_error(struct pt_regs * Handle strange cache flush from user space exception * in all other cases. This is undocumented behaviour. */ @@ -10902,7 +11045,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel handle_vm86_fault((struct kernel_vm86_regs *)regs, error_code); return; } -@@ -829,19 +850,14 @@ do_spurious_interrupt_bug(struct pt_regs +@@ -782,19 +803,14 @@ do_spurious_interrupt_bug(struct pt_regs #ifdef CONFIG_X86_32 unsigned long patch_espfix_desc(unsigned long uesp, unsigned long kesp) { @@ -10925,10 +11068,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/traps.c linux-2.6.29.6/arch/x86/kernel return new_kesp; } -diff -urNp linux-2.6.29.6/arch/x86/kernel/tsc.c linux-2.6.29.6/arch/x86/kernel/tsc.c ---- linux-2.6.29.6/arch/x86/kernel/tsc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/tsc.c 2009-07-23 17:34:32.077892704 -0400 -@@ -765,7 +765,7 @@ static struct dmi_system_id __initdata b +diff -urNp linux-2.6.30.4/arch/x86/kernel/tsc.c linux-2.6.30.4/arch/x86/kernel/tsc.c +--- linux-2.6.30.4/arch/x86/kernel/tsc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/tsc.c 2009-07-30 09:48:09.961532028 -0400 +@@ -772,7 +772,7 @@ static struct dmi_system_id __initdata b DMI_MATCH(DMI_BOARD_NAME, "2635FA0"), }, }, @@ -10937,9 +11080,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/tsc.c linux-2.6.29.6/arch/x86/kernel/t }; static void __init check_system_tsc_reliable(void) -diff -urNp linux-2.6.29.6/arch/x86/kernel/vm86_32.c linux-2.6.29.6/arch/x86/kernel/vm86_32.c ---- linux-2.6.29.6/arch/x86/kernel/vm86_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/vm86_32.c 2009-07-23 17:34:32.078863323 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/vm86_32.c linux-2.6.30.4/arch/x86/kernel/vm86_32.c +--- linux-2.6.30.4/arch/x86/kernel/vm86_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/vm86_32.c 2009-07-30 09:48:09.961532028 -0400 @@ -148,7 +148,7 @@ struct pt_regs *save_v86_state(struct ke do_exit(SIGSEGV); } @@ -10949,18 +11092,18 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vm86_32.c linux-2.6.29.6/arch/x86/kern current->thread.sp0 = current->thread.saved_sp0; current->thread.sysenter_cs = __KERNEL_CS; load_sp0(tss, ¤t->thread); -@@ -325,7 +325,7 @@ static void do_sys_vm86(struct kernel_vm +@@ -324,7 +324,7 @@ static void do_sys_vm86(struct kernel_vm tsk->thread.saved_fs = info->regs32->fs; - savesegment(gs, tsk->thread.saved_gs); + tsk->thread.saved_gs = get_user_gs(info->regs32); - tss = &per_cpu(init_tss, get_cpu()); + tss = init_tss + get_cpu(); tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0; if (cpu_has_sep) tsk->thread.sysenter_cs = 0; -diff -urNp linux-2.6.29.6/arch/x86/kernel/vmi_32.c linux-2.6.29.6/arch/x86/kernel/vmi_32.c ---- linux-2.6.29.6/arch/x86/kernel/vmi_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/vmi_32.c 2009-07-23 17:34:32.078863323 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/vmi_32.c linux-2.6.30.4/arch/x86/kernel/vmi_32.c +--- linux-2.6.30.4/arch/x86/kernel/vmi_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/vmi_32.c 2009-07-30 09:48:09.962543704 -0400 @@ -102,18 +102,43 @@ static unsigned patch_internal(int call, { u64 reloc; @@ -11005,7 +11148,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmi_32.c linux-2.6.29.6/arch/x86/kerne return 5; case VMI_RELOCATION_NOP: -@@ -409,13 +434,13 @@ static void vmi_set_pud(pud_t *pudp, pud +@@ -404,13 +429,13 @@ static void vmi_set_pud(pud_t *pudp, pud static void vmi_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep) { @@ -11021,7 +11164,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmi_32.c linux-2.6.29.6/arch/x86/kerne vmi_ops.set_pte(pte, (pte_t *)pmd, VMI_PAGE_PD); } #endif -@@ -443,8 +468,8 @@ vmi_startup_ipi_hook(int phys_apicid, un +@@ -438,8 +463,8 @@ vmi_startup_ipi_hook(int phys_apicid, un ap.ss = __KERNEL_DS; ap.esp = (unsigned long) start_esp; @@ -11032,7 +11175,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmi_32.c linux-2.6.29.6/arch/x86/kerne ap.fs = __KERNEL_PERCPU; ap.gs = 0; -@@ -639,12 +664,20 @@ static inline int __init activate_vmi(vo +@@ -634,12 +659,20 @@ static inline int __init activate_vmi(vo u64 reloc; const struct vmi_relocation_info *rel = (struct vmi_relocation_info *)&reloc; @@ -11053,7 +11196,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmi_32.c linux-2.6.29.6/arch/x86/kerne pv_info.paravirt_enabled = 1; pv_info.kernel_rpl = kernel_cs & SEGMENT_RPL_MASK; pv_info.name = "vmi"; -@@ -835,6 +868,10 @@ static inline int __init activate_vmi(vo +@@ -830,6 +863,10 @@ static inline int __init activate_vmi(vo para_fill(pv_irq_ops.safe_halt, Halt); @@ -11064,11 +11207,11 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmi_32.c linux-2.6.29.6/arch/x86/kerne /* * Alternative instruction rewriting doesn't happen soon enough * to convert VMI_IRET to a call instead of a jump; so we have -diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S ---- linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S 2009-07-23 17:34:32.078863323 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.30.4/arch/x86/kernel/vmlinux_32.lds.S +--- linux-2.6.30.4/arch/x86/kernel/vmlinux_32.lds.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/vmlinux_32.lds.S 2009-07-30 09:48:09.962543704 -0400 @@ -15,6 +15,20 @@ - #include <asm/page.h> + #include <asm/page_types.h> #include <asm/cache.h> #include <asm/boot.h> +#include <asm/segment.h> @@ -11107,7 +11250,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.6/arch/x { - . = LOAD_OFFSET + LOAD_PHYSICAL_ADDR; - phys_startup_32 = startup_32 - LOAD_OFFSET; -- ++ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR; + - .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) { - _text = .; /* Text and read-only data */ - *(.text.head) @@ -11128,8 +11272,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.6/arch/x - } :text = 0x9090 - - NOTES :text :note -+ . = LOAD_OFFSET + ____LOAD_PHYSICAL_ADDR; - +- - . = ALIGN(16); /* Exception table */ - __ex_table : AT(ADDR(__ex_table) - LOAD_OFFSET) { - __start___ex_table = .; @@ -11212,29 +11355,16 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.6/arch/x .exit.data : AT(ADDR(.exit.data) - LOAD_OFFSET) { EXIT_DATA } -@@ -179,18 +123,139 @@ SECTIONS +@@ -178,12 +122,130 @@ SECTIONS + __initramfs_end = .; } #endif +- PERCPU(PAGE_SIZE) . = ALIGN(PAGE_SIZE); -- .data.percpu : AT(ADDR(.data.percpu) - LOAD_OFFSET) { -- __per_cpu_start = .; -- *(.data.percpu.page_aligned) -+ per_cpu_start = .; -+ .data.percpu (0) : AT(ADDR(.data.percpu) - LOAD_OFFSET + per_cpu_start) { -+ __per_cpu_start = . + per_cpu_start; -+ LONG(0) - *(.data.percpu) - *(.data.percpu.shared_aligned) -- __per_cpu_end = .; -- } -+ . = ALIGN(PAGE_SIZE); -+ *(.data.percpu.page_aligned) -+ __per_cpu_end = . + per_cpu_start; -+ } :percpu -+ . += per_cpu_start; - . = ALIGN(PAGE_SIZE); - /* freed after init ends here */ - ++ PERCPU_VADDR(0, :percpu) ++ . = ALIGN(PAGE_SIZE); ++ /* freed after init ends here */ ++ + . = ALIGN(PAGE_SIZE); /* Init code and data */ + .init.text (. - __KERNEL_TEXT_OFFSET) : AT(ADDR(.init.text) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) { + _sinittext = .; @@ -11253,8 +11383,8 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.6/arch/x + . = ALIGN(2*PMD_SIZE) - 1; + } + -+ /* freed after init ends here */ -+ + /* freed after init ends here */ + + .text.head : AT(ADDR(.text.head) - LOAD_OFFSET + __KERNEL_TEXT_OFFSET) { + __init_end = . + __KERNEL_TEXT_OFFSET; + KERNEL_TEXT_OFFSET = . + __KERNEL_TEXT_OFFSET; @@ -11358,16 +11488,15 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_32.lds.S linux-2.6.29.6/arch/x __bss_start = .; /* BSS */ *(.bss.page_aligned) *(.bss) -diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S ---- linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S 2009-07-23 17:34:37.458887026 -0400 -@@ -12,12 +12,12 @@ +diff -urNp linux-2.6.30.4/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.30.4/arch/x86/kernel/vmlinux_64.lds.S +--- linux-2.6.30.4/arch/x86/kernel/vmlinux_64.lds.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/vmlinux_64.lds.S 2009-08-01 08:46:06.438873305 -0400 +@@ -13,11 +13,11 @@ OUTPUT_FORMAT("elf64-x86-64", "elf64-x86-64", "elf64-x86-64") OUTPUT_ARCH(i386:x86-64) ENTRY(phys_startup_64) -jiffies_64 = jiffies; +jiffies = jiffies_64; - _proxy_pda = 1; PHDRS { text PT_LOAD FLAGS(5); /* R_E */ - data PT_LOAD FLAGS(7); /* RWE */ @@ -11375,9 +11504,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.6/arch/x + data PT_LOAD FLAGS(6); /* RW_ */ + user PT_LOAD FLAGS(5); /* R_E */ data.init PT_LOAD FLAGS(7); /* RWE */ - note PT_NOTE FLAGS(0); /* ___ */ - } -@@ -50,17 +50,20 @@ SECTIONS + #ifdef CONFIG_SMP + percpu PT_LOAD FLAGS(7); /* RWE */ +@@ -54,14 +54,18 @@ SECTIONS __stop___ex_table = .; } :text = 0x9090 @@ -11390,36 +11519,36 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.6/arch/x . = ALIGN(PAGE_SIZE); /* Align data segment to page size boundary */ +#endif /* Data */ -+ _data = .; .data : AT(ADDR(.data) - LOAD_OFFSET) { ++ _data = .; DATA_DATA CONSTRUCTORS +- _edata = .; /* End of data section */ } :data -- _edata = .; /* End of data section */ -- - . = ALIGN(PAGE_SIZE); - . = ALIGN(CONFIG_X86_L1_CACHE_BYTES); - .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET) { -@@ -71,9 +74,25 @@ SECTIONS + +@@ -75,9 +79,28 @@ SECTIONS *(.data.read_mostly) } -+ . = ALIGN(THREAD_SIZE); /* init_task */ + .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { ++ . = ALIGN(THREAD_SIZE); /* init_task */ + *(.data.init_task) -+ }:data ++ } + -+ . = ALIGN(PAGE_SIZE); + .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { ++ . = ALIGN(PAGE_SIZE); + *(.data.page_aligned) + } + -+ . = ALIGN(PAGE_SIZE); -+ __nosave_begin = .; -+ .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { *(.data.nosave) } -+ . = ALIGN(PAGE_SIZE); -+ __nosave_end = .; ++ .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { ++ . = ALIGN(PAGE_SIZE); ++ __nosave_begin = .; ++ *(.data.nosave) ++ . = ALIGN(PAGE_SIZE); ++ __nosave_end = .; ++ _edata = .; /* End of data section */ ++ } + #define VSYSCALL_ADDR (-10*1024*1024) -#define VSYSCALL_PHYS_ADDR ((LOADADDR(.data.read_mostly) + SIZEOF(.data.read_mostly) + 4095) & ~(4095)) @@ -11429,7 +11558,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.6/arch/x #define VLOAD_OFFSET (VSYSCALL_ADDR - VSYSCALL_PHYS_ADDR) #define VLOAD(x) (ADDR(x) - VLOAD_OFFSET) -@@ -104,10 +123,6 @@ SECTIONS +@@ -108,10 +131,6 @@ SECTIONS .vgetcpu_mode : AT(VLOAD(.vgetcpu_mode)) { *(.vgetcpu_mode) } vgetcpu_mode = VVIRT(.vgetcpu_mode); @@ -11440,53 +11569,73 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vmlinux_64.lds.S linux-2.6.29.6/arch/x .vsyscall_3 ADDR(.vsyscall_0) + 3072: AT(VLOAD(.vsyscall_3)) { *(.vsyscall_3) } -@@ -121,15 +136,7 @@ SECTIONS +@@ -125,16 +144,6 @@ SECTIONS #undef VVIRT_OFFSET #undef VVIRT -- . = ALIGN(THREAD_SIZE); /* init_task */ - .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) { +- . = ALIGN(THREAD_SIZE); /* init_task */ - *(.data.init_task) - }:data.init - -- . = ALIGN(PAGE_SIZE); - .data.page_aligned : AT(ADDR(.data.page_aligned) - LOAD_OFFSET) { +- . = ALIGN(PAGE_SIZE); - *(.data.page_aligned) - } -+ _edata = .; /* End of data section */ - - /* might get freed after init */ - . = ALIGN(PAGE_SIZE); -@@ -137,7 +144,7 @@ SECTIONS - __smp_locks = .; +- .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { - *(.smp_locks) + /* might get freed after init */ + . = ALIGN(PAGE_SIZE); +@@ -144,7 +153,7 @@ SECTIONS + __smp_locks_end = .; + . = ALIGN(PAGE_SIZE); + __smp_alt_end = .; - } + }:data.init - __smp_locks_end = .; - . = ALIGN(PAGE_SIZE); - __smp_alt_end = .; -@@ -213,16 +220,11 @@ SECTIONS + + . = ALIGN(PAGE_SIZE); /* Init code and data */ + __init_begin = .; /* paired with __init_end */ +@@ -233,27 +242,20 @@ SECTIONS . = ALIGN(PAGE_SIZE); __init_end = .; -- . = ALIGN(PAGE_SIZE); -- __nosave_begin = .; -- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { *(.data.nosave) } -- . = ALIGN(PAGE_SIZE); -- __nosave_end = .; +- .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { +- . = ALIGN(PAGE_SIZE); +- __nosave_begin = .; +- *(.data.nosave) +- . = ALIGN(PAGE_SIZE); +- __nosave_end = .; +- } :data.init2 /* use another section data.init2, see PERCPU_VADDR() above */ - - __bss_start = .; /* BSS */ .bss : AT(ADDR(.bss) - LOAD_OFFSET) { + . = ALIGN(PAGE_SIZE); + __bss_start = .; /* BSS */ *(.bss.page_aligned) *(.bss) + __bss_stop = .; +- } ++ } :data.init2 + + .brk : AT(ADDR(.brk) - LOAD_OFFSET) { + . = ALIGN(PAGE_SIZE); + __brk_base = . ; + . += 64 * 1024 ; /* 64k alignment slop space */ + *(.brk_reservation) /* areas brk users have reserved */ + . = ALIGN(2*1024*1024); - } - __bss_stop = .; + __brk_limit = . ; + } -diff -urNp linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c ---- linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c 2009-07-23 17:34:32.080014276 -0400 +@@ -276,7 +278,6 @@ SECTIONS + * for the boot processor. + */ + #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load +-INIT_PER_CPU(gdt_page); + INIT_PER_CPU(irq_stack_union); + + /* +diff -urNp linux-2.6.30.4/arch/x86/kernel/vsyscall_64.c linux-2.6.30.4/arch/x86/kernel/vsyscall_64.c +--- linux-2.6.30.4/arch/x86/kernel/vsyscall_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/vsyscall_64.c 2009-07-30 09:48:09.963690654 -0400 @@ -79,6 +79,7 @@ void update_vsyscall(struct timespec *wa write_seqlock_irqsave(&vsyscall_gtod_data.lock, flags); @@ -11495,7 +11644,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c linux-2.6.29.6/arch/x86/ vsyscall_gtod_data.clock.vread = clock->vread; vsyscall_gtod_data.clock.cycle_last = clock->cycle_last; vsyscall_gtod_data.clock.mask = clock->mask; -@@ -209,7 +210,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s +@@ -201,7 +202,7 @@ vgetcpu(unsigned *cpu, unsigned *node, s We do this here because otherwise user space would do it on its own in a likely inferior way (no access to jiffies). If you don't like it pass NULL. */ @@ -11504,7 +11653,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c linux-2.6.29.6/arch/x86/ p = tcache->blob[1]; } else if (__vgetcpu_mode == VGETCPU_RDTSCP) { /* Load per CPU data from RDTSCP */ -@@ -248,13 +249,13 @@ static ctl_table kernel_table2[] = { +@@ -240,13 +241,13 @@ static ctl_table kernel_table2[] = { .data = &vsyscall_gtod_data.sysctl_enabled, .maxlen = sizeof(int), .mode = 0644, .proc_handler = vsyscall_sysctl_change }, @@ -11520,9 +11669,9 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/vsyscall_64.c linux-2.6.29.6/arch/x86/ }; #endif -diff -urNp linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c ---- linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c 2009-07-23 17:34:32.080014276 -0400 +diff -urNp linux-2.6.30.4/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.30.4/arch/x86/kernel/x8664_ksyms_64.c +--- linux-2.6.30.4/arch/x86/kernel/x8664_ksyms_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kernel/x8664_ksyms_64.c 2009-07-30 09:48:09.963690654 -0400 @@ -30,8 +30,6 @@ EXPORT_SYMBOL(__put_user_8); EXPORT_SYMBOL(copy_user_generic); @@ -11532,10 +11681,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kernel/x8664_ksyms_64.c linux-2.6.29.6/arch/x EXPORT_SYMBOL(__copy_from_user_inatomic); EXPORT_SYMBOL(copy_page); -diff -urNp linux-2.6.29.6/arch/x86/kvm/svm.c linux-2.6.29.6/arch/x86/kvm/svm.c ---- linux-2.6.29.6/arch/x86/kvm/svm.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kvm/svm.c 2009-07-23 17:34:32.080014276 -0400 -@@ -1525,7 +1525,19 @@ static void reload_tss(struct kvm_vcpu * +diff -urNp linux-2.6.30.4/arch/x86/kvm/svm.c linux-2.6.30.4/arch/x86/kvm/svm.c +--- linux-2.6.30.4/arch/x86/kvm/svm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kvm/svm.c 2009-07-30 09:48:09.964534231 -0400 +@@ -2226,7 +2226,19 @@ static void reload_tss(struct kvm_vcpu * int cpu = raw_smp_processor_id(); struct svm_cpu_data *svm_data = per_cpu(svm_data, cpu); @@ -11555,7 +11704,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/svm.c linux-2.6.29.6/arch/x86/kvm/svm.c load_TR_desc(); } -@@ -1936,7 +1948,7 @@ static int svm_get_mt_mask_shift(void) +@@ -2622,7 +2634,7 @@ static int svm_get_mt_mask_shift(void) return 0; } @@ -11564,10 +11713,10 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/svm.c linux-2.6.29.6/arch/x86/kvm/svm.c .cpu_has_kvm_support = has_svm, .disabled_by_bios = is_disabled, .hardware_setup = svm_hardware_setup, -diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c ---- linux-2.6.29.6/arch/x86/kvm/vmx.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kvm/vmx.c 2009-07-23 17:34:32.080863524 -0400 -@@ -497,9 +497,23 @@ static void reload_tss(void) +diff -urNp linux-2.6.30.4/arch/x86/kvm/vmx.c linux-2.6.30.4/arch/x86/kvm/vmx.c +--- linux-2.6.30.4/arch/x86/kvm/vmx.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kvm/vmx.c 2009-07-30 09:48:09.965634801 -0400 +@@ -506,9 +506,23 @@ static void reload_tss(void) struct descriptor_table gdt; struct desc_struct *descs; @@ -11591,7 +11740,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c load_TR_desc(); } -@@ -2182,7 +2196,7 @@ static int vmx_vcpu_setup(struct vcpu_vm +@@ -2192,7 +2206,7 @@ static int vmx_vcpu_setup(struct vcpu_vm vmcs_writel(HOST_IDTR_BASE, dt.base); /* 22.2.4 */ asm("mov $.Lkvm_vmx_return, %0" : "=r"(kvm_vmx_return)); @@ -11600,7 +11749,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c vmcs_write32(VM_EXIT_MSR_STORE_COUNT, 0); vmcs_write32(VM_EXIT_MSR_LOAD_COUNT, 0); vmcs_write32(VM_ENTRY_MSR_LOAD_COUNT, 0); -@@ -3379,6 +3393,12 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3494,6 +3508,12 @@ static void vmx_vcpu_run(struct kvm_vcpu "jmp .Lkvm_vmx_return \n\t" ".Llaunched: " __ex(ASM_VMX_VMRESUME) "\n\t" ".Lkvm_vmx_return: " @@ -11613,7 +11762,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c /* Save guest registers, load host registers, keep flags */ "xchg %0, (%%"R"sp) \n\t" "mov %%"R"ax, %c[rax](%0) \n\t" -@@ -3425,6 +3445,11 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3540,6 +3560,11 @@ static void vmx_vcpu_run(struct kvm_vcpu [r15]"i"(offsetof(struct vcpu_vmx, vcpu.arch.regs[VCPU_REGS_R15])), #endif [cr2]"i"(offsetof(struct vcpu_vmx, vcpu.arch.cr2)) @@ -11625,7 +11774,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c : "cc", "memory" , R"bx", R"di", R"si" #ifdef CONFIG_X86_64 -@@ -3441,7 +3466,7 @@ static void vmx_vcpu_run(struct kvm_vcpu +@@ -3558,7 +3583,7 @@ static void vmx_vcpu_run(struct kvm_vcpu vmx_update_window_states(vcpu); @@ -11634,7 +11783,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c vmx->launched = 1; intr_info = vmcs_read32(VM_EXIT_INTR_INFO); -@@ -3570,7 +3595,7 @@ static int vmx_get_mt_mask_shift(void) +@@ -3694,7 +3719,7 @@ static int vmx_get_mt_mask_shift(void) return VMX_EPT_MT_EPTE_SHIFT; } @@ -11643,12 +11792,12 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/vmx.c linux-2.6.29.6/arch/x86/kvm/vmx.c .cpu_has_kvm_support = cpu_has_kvm_support, .disabled_by_bios = vmx_disabled_by_bios, .hardware_setup = hardware_setup, -diff -urNp linux-2.6.29.6/arch/x86/kvm/x86.c linux-2.6.29.6/arch/x86/kvm/x86.c ---- linux-2.6.29.6/arch/x86/kvm/x86.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/kvm/x86.c 2009-07-23 17:34:32.081957601 -0400 -@@ -70,44 +70,44 @@ static u64 __read_mostly efer_reserved_b - static int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid, - struct kvm_cpuid_entry2 __user *entries); +diff -urNp linux-2.6.30.4/arch/x86/kvm/x86.c linux-2.6.30.4/arch/x86/kvm/x86.c +--- linux-2.6.30.4/arch/x86/kvm/x86.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/kvm/x86.c 2009-07-30 09:48:09.966523935 -0400 +@@ -73,44 +73,44 @@ static int kvm_dev_ioctl_get_supported_c + struct kvm_cpuid_entry2 *kvm_find_cpuid_entry(struct kvm_vcpu *vcpu, + u32 function, u32 index); -struct kvm_x86_ops *kvm_x86_ops; +const struct kvm_x86_ops *kvm_x86_ops; @@ -11726,7 +11875,7 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/x86.c linux-2.6.29.6/arch/x86/kvm/x86.c { NULL } }; -@@ -1372,7 +1372,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru +@@ -1417,7 +1417,7 @@ static int kvm_vcpu_ioctl_set_lapic(stru static int kvm_vcpu_ioctl_interrupt(struct kvm_vcpu *vcpu, struct kvm_interrupt *irq) { @@ -11735,22 +11884,33 @@ diff -urNp linux-2.6.29.6/arch/x86/kvm/x86.c linux-2.6.29.6/arch/x86/kvm/x86.c return -EINVAL; if (irqchip_in_kernel(vcpu->kvm)) return -ENXIO; -@@ -2591,10 +2591,10 @@ int kvm_emulate_pio_string(struct kvm_vc - } - EXPORT_SYMBOL_GPL(kvm_emulate_pio_string); +@@ -2731,10 +2731,10 @@ static struct notifier_block kvmclock_cp + .notifier_call = kvmclock_cpufreq_notifier + }; -int kvm_arch_init(void *opaque) +int kvm_arch_init(const void *opaque) { - int r; + int r, cpu; - struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque; + const struct kvm_x86_ops *ops = (const struct kvm_x86_ops *)opaque; if (kvm_x86_ops) { printk(KERN_ERR "kvm: already loaded the other module\n"); -diff -urNp linux-2.6.29.6/arch/x86/lib/checksum_32.S linux-2.6.29.6/arch/x86/lib/checksum_32.S ---- linux-2.6.29.6/arch/x86/lib/checksum_32.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/checksum_32.S 2009-07-23 17:34:32.081957601 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lguest/Kconfig linux-2.6.30.4/arch/x86/lguest/Kconfig +--- linux-2.6.30.4/arch/x86/lguest/Kconfig 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lguest/Kconfig 2009-08-02 09:47:36.165378342 -0400 +@@ -3,6 +3,7 @@ config LGUEST_GUEST + select PARAVIRT + depends on X86_32 + depends on !X86_PAE ++ depends on !PAX_KERNEXEC + select VIRTIO + select VIRTIO_RING + select VIRTIO_CONSOLE +diff -urNp linux-2.6.30.4/arch/x86/lib/checksum_32.S linux-2.6.30.4/arch/x86/lib/checksum_32.S +--- linux-2.6.30.4/arch/x86/lib/checksum_32.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/checksum_32.S 2009-07-30 09:48:09.967600435 -0400 @@ -28,7 +28,8 @@ #include <linux/linkage.h> #include <asm/dwarf2.h> @@ -11996,9 +12156,9 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/checksum_32.S linux-2.6.29.6/arch/x86/lib #undef ROUND #undef ROUND1 -diff -urNp linux-2.6.29.6/arch/x86/lib/clear_page_64.S linux-2.6.29.6/arch/x86/lib/clear_page_64.S ---- linux-2.6.29.6/arch/x86/lib/clear_page_64.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/clear_page_64.S 2009-07-23 17:34:32.081957601 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/clear_page_64.S linux-2.6.30.4/arch/x86/lib/clear_page_64.S +--- linux-2.6.30.4/arch/x86/lib/clear_page_64.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/clear_page_64.S 2009-07-30 09:48:09.967600435 -0400 @@ -44,7 +44,7 @@ ENDPROC(clear_page) #include <asm/cpufeature.h> @@ -12008,9 +12168,9 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/clear_page_64.S linux-2.6.29.6/arch/x86/l 1: .byte 0xeb /* jmp <disp8> */ .byte (clear_page_c - clear_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.6/arch/x86/lib/copy_page_64.S linux-2.6.29.6/arch/x86/lib/copy_page_64.S ---- linux-2.6.29.6/arch/x86/lib/copy_page_64.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/copy_page_64.S 2009-07-23 17:34:32.081957601 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/copy_page_64.S linux-2.6.30.4/arch/x86/lib/copy_page_64.S +--- linux-2.6.30.4/arch/x86/lib/copy_page_64.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/copy_page_64.S 2009-07-30 09:48:09.967600435 -0400 @@ -104,7 +104,7 @@ ENDPROC(copy_page) #include <asm/cpufeature.h> @@ -12020,9 +12180,9 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/copy_page_64.S linux-2.6.29.6/arch/x86/li 1: .byte 0xeb /* jmp <disp8> */ .byte (copy_page_c - copy_page) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.6/arch/x86/lib/copy_user_64.S linux-2.6.29.6/arch/x86/lib/copy_user_64.S ---- linux-2.6.29.6/arch/x86/lib/copy_user_64.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/copy_user_64.S 2009-07-23 17:34:32.082759353 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/copy_user_64.S linux-2.6.30.4/arch/x86/lib/copy_user_64.S +--- linux-2.6.30.4/arch/x86/lib/copy_user_64.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/copy_user_64.S 2009-07-30 09:48:09.967600435 -0400 @@ -21,7 +21,7 @@ .byte 0xe9 /* 32bit jump */ .long \orig-1f /* by default jump to orig */ @@ -12073,9 +12233,9 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/copy_user_64.S linux-2.6.29.6/arch/x86/li movl %edx,%ecx xorl %eax,%eax rep -diff -urNp linux-2.6.29.6/arch/x86/lib/getuser.S linux-2.6.29.6/arch/x86/lib/getuser.S ---- linux-2.6.29.6/arch/x86/lib/getuser.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/getuser.S 2009-07-23 17:34:32.082759353 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/getuser.S linux-2.6.30.4/arch/x86/lib/getuser.S +--- linux-2.6.30.4/arch/x86/lib/getuser.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/getuser.S 2009-07-30 09:48:09.967600435 -0400 @@ -33,6 +33,7 @@ #include <asm/asm-offsets.h> #include <asm/thread_info.h> @@ -12157,21 +12317,21 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/getuser.S linux-2.6.29.6/arch/x86/lib/get xor %edx,%edx mov $(-EFAULT),%_ASM_AX ret -diff -urNp linux-2.6.29.6/arch/x86/lib/memcpy_64.S linux-2.6.29.6/arch/x86/lib/memcpy_64.S ---- linux-2.6.29.6/arch/x86/lib/memcpy_64.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/memcpy_64.S 2009-07-23 17:34:32.082759353 -0400 -@@ -114,7 +114,7 @@ ENDPROC(__memcpy) - /* Some CPUs run faster using the string copy instructions. - It is also a lot simpler. Use this when possible */ +diff -urNp linux-2.6.30.4/arch/x86/lib/memcpy_64.S linux-2.6.30.4/arch/x86/lib/memcpy_64.S +--- linux-2.6.30.4/arch/x86/lib/memcpy_64.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/memcpy_64.S 2009-07-30 09:48:09.968548540 -0400 +@@ -128,7 +128,7 @@ ENDPROC(__memcpy) + * It is also a lot simpler. Use this when possible: + */ -- .section .altinstr_replacement,"ax" -+ .section .altinstr_replacement,"a" +- .section .altinstr_replacement, "ax" ++ .section .altinstr_replacement, "a" 1: .byte 0xeb /* jmp <disp8> */ .byte (memcpy_c - memcpy) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.6/arch/x86/lib/memset_64.S linux-2.6.29.6/arch/x86/lib/memset_64.S ---- linux-2.6.29.6/arch/x86/lib/memset_64.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/memset_64.S 2009-07-23 17:34:32.082759353 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/memset_64.S linux-2.6.30.4/arch/x86/lib/memset_64.S +--- linux-2.6.30.4/arch/x86/lib/memset_64.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/memset_64.S 2009-07-30 09:48:09.968548540 -0400 @@ -118,7 +118,7 @@ ENDPROC(__memset) #include <asm/cpufeature.h> @@ -12181,9 +12341,9 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/memset_64.S linux-2.6.29.6/arch/x86/lib/m 1: .byte 0xeb /* jmp <disp8> */ .byte (memset_c - memset) - (2f - 1b) /* offset */ 2: -diff -urNp linux-2.6.29.6/arch/x86/lib/mmx_32.c linux-2.6.29.6/arch/x86/lib/mmx_32.c ---- linux-2.6.29.6/arch/x86/lib/mmx_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/mmx_32.c 2009-07-23 17:34:32.083767334 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/mmx_32.c linux-2.6.30.4/arch/x86/lib/mmx_32.c +--- linux-2.6.30.4/arch/x86/lib/mmx_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/mmx_32.c 2009-07-30 09:48:09.968548540 -0400 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void * { void *p; @@ -12499,9 +12659,9 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/mmx_32.c linux-2.6.29.6/arch/x86/lib/mmx_ from += 64; to += 64; -diff -urNp linux-2.6.29.6/arch/x86/lib/putuser.S linux-2.6.29.6/arch/x86/lib/putuser.S ---- linux-2.6.29.6/arch/x86/lib/putuser.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/putuser.S 2009-07-23 17:34:32.083767334 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/putuser.S linux-2.6.30.4/arch/x86/lib/putuser.S +--- linux-2.6.30.4/arch/x86/lib/putuser.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/putuser.S 2009-07-30 09:48:09.969494268 -0400 @@ -15,6 +15,7 @@ #include <asm/thread_info.h> #include <asm/errno.h> @@ -12605,9 +12765,9 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/putuser.S linux-2.6.29.6/arch/x86/lib/put movl $-EFAULT,%eax EXIT END(bad_put_user) -diff -urNp linux-2.6.29.6/arch/x86/lib/usercopy_32.c linux-2.6.29.6/arch/x86/lib/usercopy_32.c ---- linux-2.6.29.6/arch/x86/lib/usercopy_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/lib/usercopy_32.c 2009-07-23 17:34:32.084899980 -0400 +diff -urNp linux-2.6.30.4/arch/x86/lib/usercopy_32.c linux-2.6.30.4/arch/x86/lib/usercopy_32.c +--- linux-2.6.30.4/arch/x86/lib/usercopy_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/lib/usercopy_32.c 2009-07-30 09:48:09.969494268 -0400 @@ -36,31 +36,38 @@ static inline int __movsl_is_ok(unsigned * Copy a null terminated string from userspace. */ @@ -13573,76 +13733,13 @@ diff -urNp linux-2.6.29.6/arch/x86/lib/usercopy_32.c linux-2.6.29.6/arch/x86/lib +#endif + +EXPORT_SYMBOL(set_fs); -diff -urNp linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c ---- linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mach-voyager/voyager_basic.c 2009-07-23 17:34:32.084899980 -0400 -@@ -123,7 +123,7 @@ int __init voyager_memory_detect(int reg - __u8 cmos[4]; - ClickMap_t *map; - unsigned long map_addr; -- unsigned long old; -+ pte_t old; - - if (region >= CLICK_ENTRIES) { - printk("Voyager: Illegal ClickMap region %d\n", region); -@@ -138,7 +138,7 @@ int __init voyager_memory_detect(int reg - - /* steal page 0 for this */ - old = pg0[0]; -- pg0[0] = ((map_addr & PAGE_MASK) | _PAGE_RW | _PAGE_PRESENT); -+ pg0[0] = __pte((map_addr & PAGE_MASK) | _PAGE_RW | _PAGE_PRESENT); - local_flush_tlb(); - /* now clear everything out but page 0 */ - map = (ClickMap_t *) (map_addr & (~PAGE_MASK)); -diff -urNp linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c ---- linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mach-voyager/voyager_smp.c 2009-07-23 17:34:32.084899980 -0400 -@@ -511,6 +511,10 @@ static void __init do_boot_cpu(__u8 cpu) - __u32 *hijack_vector; - __u32 start_phys_address = setup_trampoline(); - -+#ifdef CONFIG_PAX_KERNEXEC -+ unsigned long cr0; -+#endif -+ - /* There's a clever trick to this: The linux trampoline is - * compiled to begin at absolute location zero, so make the - * address zero but have the data segment selector compensate -@@ -530,7 +534,17 @@ static void __init do_boot_cpu(__u8 cpu) - - init_gdt(cpu); - per_cpu(current_task, cpu) = idle; -- early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ pax_open_kernel(cr0); -+#endif -+ -+ early_gdt_descr.address = get_cpu_gdt_table(cpu); -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ pax_close_kernel(cr0); -+#endif -+ - irq_ctx_init(cpu); - - /* Note: Don't modify initial ss override */ -@@ -1144,7 +1158,7 @@ void smp_local_timer_interrupt(void) - per_cpu(prof_counter, cpu); - } - -- update_process_times(user_mode_vm(get_irq_regs())); -+ update_process_times(user_mode(get_irq_regs())); - } - - if (((1 << cpu) & voyager_extended_vic_processors) == 0) -diff -urNp linux-2.6.29.6/arch/x86/Makefile linux-2.6.29.6/arch/x86/Makefile ---- linux-2.6.29.6/arch/x86/Makefile 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/Makefile 2009-07-23 17:34:32.084899980 -0400 -@@ -232,3 +232,12 @@ endef - CLEAN_FILES += arch/x86/boot/fdimage \ - arch/x86/boot/image.iso \ - arch/x86/boot/mtools.conf +diff -urNp linux-2.6.30.4/arch/x86/Makefile linux-2.6.30.4/arch/x86/Makefile +--- linux-2.6.30.4/arch/x86/Makefile 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/Makefile 2009-07-30 09:48:09.917626356 -0400 +@@ -198,3 +198,12 @@ define archhelp + echo ' FDARGS="..." arguments for the booted kernel' + echo ' FDINITRD=file initrd for the booted kernel' + endef + +define OLD_LD + @@ -13652,9 +13749,9 @@ diff -urNp linux-2.6.29.6/arch/x86/Makefile linux-2.6.29.6/arch/x86/Makefile + +archprepare: + $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD))) -diff -urNp linux-2.6.29.6/arch/x86/mm/extable.c linux-2.6.29.6/arch/x86/mm/extable.c ---- linux-2.6.29.6/arch/x86/mm/extable.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/extable.c 2009-07-23 17:34:32.085744993 -0400 +diff -urNp linux-2.6.30.4/arch/x86/mm/extable.c linux-2.6.30.4/arch/x86/mm/extable.c +--- linux-2.6.30.4/arch/x86/mm/extable.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/extable.c 2009-07-30 09:48:09.970452952 -0400 @@ -1,14 +1,62 @@ #include <linux/module.h> #include <linux/spinlock.h> @@ -13719,29 +13816,29 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/extable.c linux-2.6.29.6/arch/x86/mm/extab extern u32 pnp_bios_fault_eip, pnp_bios_fault_esp; extern u32 pnp_bios_is_utter_crap; pnp_bios_is_utter_crap = 1; -diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c ---- linux-2.6.29.6/arch/x86/mm/fault.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/fault.c 2009-07-23 17:34:32.085744993 -0400 -@@ -26,6 +26,8 @@ - #include <linux/kprobes.h> - #include <linux/uaccess.h> - #include <linux/kdebug.h> +diff -urNp linux-2.6.30.4/arch/x86/mm/fault.c linux-2.6.30.4/arch/x86/mm/fault.c +--- linux-2.6.30.4/arch/x86/mm/fault.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/fault.c 2009-07-30 11:10:48.941676108 -0400 +@@ -27,6 +27,8 @@ + #include <linux/tty.h> + #include <linux/smp.h> + #include <linux/mm.h> +#include <linux/unistd.h> +#include <linux/compiler.h> - #include <asm/system.h> - #include <asm/desc.h> -@@ -67,7 +69,7 @@ static inline int notify_page_fault(stru + #include <asm-generic/sections.h> + +@@ -73,7 +75,7 @@ static inline int notify_page_fault(stru int ret = 0; /* kprobe_running() needs smp_processor_id() */ -- if (!user_mode_vm(regs)) { -+ if (!user_mode(regs)) { +- if (kprobes_built_in() && !user_mode_vm(regs)) { ++ if (kprobes_built_in() && !user_mode(regs)) { preempt_disable(); if (kprobe_running() && kprobe_fault_handler(regs, 14)) ret = 1; -@@ -265,6 +267,30 @@ bad: - #endif +@@ -193,6 +195,30 @@ force_sig_info_fault(int si_signo, int s + force_sig_info(si_signo, &info, tsk); } +#ifdef CONFIG_PAX_EMUTRAMP @@ -13768,36 +13865,42 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c +} +#endif + - #ifdef CONFIG_X86_32 - static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address) - { -@@ -351,7 +377,7 @@ static int is_errata93(struct pt_regs *r + DEFINE_SPINLOCK(pgd_lock); + LIST_HEAD(pgd_list); + +@@ -571,7 +597,7 @@ static int is_errata93(struct pt_regs *r static int is_errata100(struct pt_regs *regs, unsigned long address) { #ifdef CONFIG_X86_64 -- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && -+ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && - (address >> 32)) +- if ((regs->cs == __USER32_CS || (regs->cs & (1<<2))) && (address >> 32)) ++ if ((regs->cs == __USER32_CS || (regs->cs & SEGMENT_LDT)) && (address >> 32)) return 1; #endif -@@ -386,14 +412,31 @@ static void show_fault_oops(struct pt_re - #endif + return 0; +@@ -598,7 +624,7 @@ static int is_f00f_bug(struct pt_regs *r + } + + static const char nx_warning[] = KERN_CRIT +-"kernel tried to execute NX-protected page - exploit attempt? (uid: %d)\n"; ++"kernel tried to execute NX-protected page - exploit attempt? (uid: %d, task: %s, pid: %d)\n"; + + static void + show_fault_oops(struct pt_regs *regs, unsigned long error_code, +@@ -607,15 +633,31 @@ show_fault_oops(struct pt_regs *regs, un + if (!oops_may_print()) + return; - #ifdef CONFIG_X86_PAE - if (error_code & PF_INSTR) { + if (nx_enabled && (error_code & PF_INSTR)) { unsigned int level; + pte_t *pte = lookup_address(address, &level); if (pte && pte_present(*pte) && !pte_exec(*pte)) - printk(KERN_CRIT "kernel tried to execute " - "NX-protected page - exploit attempt? " -- "(uid: %d)\n", current_uid()); -+ "(uid: %d, task: %s, pid: %d)\n", -+ current_uid(), current->comm, task_pid_nr(current)); -+ } -+#endif -+ +- printk(nx_warning, current_uid()); ++ printk(nx_warning, current_uid(), current->comm, task_pid_nr(current)); + } + +#ifdef CONFIG_PAX_KERNEXEC +#ifdef CONFIG_MODULES + if (init_mm.start_code <= address && address < (unsigned long)MODULES_END) @@ -13811,72 +13914,96 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c + else + printk(KERN_ERR "PAX: %s:%d, uid/euid: %u/%u, attempted to modify kernel code\n", + current->comm, task_pid_nr(current), current_uid(), current_euid()); - } - #endif ++ } ++#endif ++ + printk(KERN_ALERT "BUG: unable to handle kernel "); + if (address < PAGE_SIZE) + printk(KERN_CONT "NULL pointer dereference"); +@@ -740,6 +782,68 @@ __bad_area_nosemaphore(struct pt_regs *r + unsigned long address, int si_code) + { + struct task_struct *tsk = current; ++ struct mm_struct *mm = tsk->mm; ++ ++#ifdef CONFIG_X86_64 ++ if (mm && (error_code & PF_INSTR)) { ++ if (regs->ip == (unsigned long)vgettimeofday) { ++ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday); ++ return; ++ } else if (regs->ip == (unsigned long)vtime) { ++ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time); ++ return; ++ } else if (regs->ip == (unsigned long)vgetcpu) { ++ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu); ++ return; ++ } ++ } ++#endif ++ ++#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) ++ if (mm && (error_code & PF_USER)) { ++ unsigned long ip = regs->ip; ++ ++ if (v8086_mode(regs)) ++ ip = ((regs->cs & 0xffff) << 4) + (regs->ip & 0xffff); ++ ++ /* ++ * It's possible to have interrupts off here: ++ */ ++ local_irq_enable(); ++ ++#ifdef CONFIG_PAX_PAGEEXEC ++ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && ++ ((nx_enabled && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && regs->ip == address))) { ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++ switch (pax_handle_fetch_fault(regs)) { ++ case 2: ++ return; ++ } ++#endif ++ ++ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ ++#ifdef CONFIG_PAX_SEGMEXEC ++ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (regs->ip + SEGMEXEC_TASK_SIZE == address)) { ++ ++#ifdef CONFIG_PAX_EMUTRAMP ++ switch (pax_handle_fetch_fault(regs)) { ++ case 2: ++ return; ++ } ++#endif ++ ++ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); ++ do_group_exit(SIGKILL); ++ } ++#endif ++ ++ } ++#endif -@@ -586,7 +629,6 @@ void __kprobes do_page_fault(struct pt_r - struct task_struct *tsk; - struct mm_struct *mm; - struct vm_area_struct *vma; -- unsigned long address; - int write, si_code; - int fault; - #ifdef CONFIG_X86_64 -@@ -594,13 +636,20 @@ void __kprobes do_page_fault(struct pt_r - int sig; - #endif + /* User mode accesses just cause a SIGSEGV */ + if (error_code & PF_USER) { +@@ -874,6 +978,106 @@ static int spurious_fault_check(unsigned + return 1; + } +#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) ++static int pax_handle_pageexec_fault(struct pt_regs *regs, struct mm_struct *mm, unsigned long address, unsigned long error_code) ++{ + pte_t *pte; + pmd_t *pmd; + spinlock_t *ptl; + unsigned char pte_mask; -+#endif -+ -+ /* get the address */ -+ const unsigned long address = read_cr2(); + - tsk = current; - mm = tsk->mm; - prefetchw(&mm->mmap_sem); - -- /* get the address */ -- address = read_cr2(); -- - si_code = SEGV_MAPERR; - - if (unlikely(kmmio_fault(regs, address))) -@@ -653,7 +702,7 @@ void __kprobes do_page_fault(struct pt_r - * User-mode registers count as a user access even for any - * potential system fault or CPU buglet. - */ -- if (user_mode_vm(regs)) { -+ if (user_mode(regs)) { - local_irq_enable(); - error_code |= PF_USER; - } else if (regs->flags & X86_EFLAGS_IF) -@@ -669,7 +718,7 @@ void __kprobes do_page_fault(struct pt_r - * atomic region then we must not take the fault. - */ - if (unlikely(in_atomic() || !mm)) -- goto bad_area_nosemaphore; -+ goto bad_area_nopax; - - /* - * When running in the kernel we expect faults to occur only to -@@ -690,10 +739,104 @@ void __kprobes do_page_fault(struct pt_r - if (!down_read_trylock(&mm->mmap_sem)) { - if ((error_code & PF_USER) == 0 && - !search_exception_tables(regs->ip)) -- goto bad_area_nosemaphore; -+ goto bad_area_nopax; - down_read(&mm->mmap_sem); - } - -+#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) + if (nx_enabled || (error_code & (PF_PROT|PF_USER)) != (PF_PROT|PF_USER) || v8086_mode(regs) || + !(mm->pax_flags & MF_PAX_PAGEEXEC)) -+ goto not_pax_fault; ++ return 0; + + /* PaX: it's our fault, let's handle it if we can */ + @@ -13888,7 +14015,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c +#ifdef CONFIG_PAX_EMUTRAMP + switch (pax_handle_fetch_fault(regs)) { + case 2: -+ return; ++ return 1; + } +#endif + @@ -13898,18 +14025,18 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c + + pmd = pax_get_pmd(mm, address); + if (unlikely(!pmd)) -+ goto not_pax_fault; ++ return 0; + + pte = pte_offset_map_lock(mm, pmd, address, &ptl); + if (unlikely(!(pte_val(*pte) & _PAGE_PRESENT) || pte_user(*pte))) { + pte_unmap_unlock(pte, ptl); -+ goto not_pax_fault; ++ return 0; + } + + if (unlikely((error_code & PF_WRITE) && !pte_write(*pte))) { + /* write attempt to a protected page in user mode */ + pte_unmap_unlock(pte, ptl); -+ goto not_pax_fault; ++ return 0; + } + +#ifdef CONFIG_SMP @@ -13922,7 +14049,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c + __flush_tlb_one(address); + pte_unmap_unlock(pte, ptl); + up_read(&mm->mmap_sem); -+ return; ++ return 1; + } + + pte_mask = _PAGE_ACCESSED | _PAGE_USER | ((error_code & PF_WRITE) << (_PAGE_BIT_DIRTY-1)); @@ -13962,136 +14089,106 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c + : "memory", "cc"); + pte_unmap_unlock(pte, ptl); + up_read(&mm->mmap_sem); -+ return; ++ return 1; ++} ++#endif ++ + /* + * Handle a spurious fault caused by a stale TLB entry. + * +@@ -940,6 +1144,9 @@ int show_unhandled_signals = 1; + static inline int + access_error(unsigned long error_code, int write, struct vm_area_struct *vma) + { ++ if (nx_enabled && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC)) ++ return 1; + -+not_pax_fault: + if (write) { + /* write, present and write, not present: */ + if (unlikely(!(vma->vm_flags & VM_WRITE))) +@@ -973,19 +1180,18 @@ do_page_fault(struct pt_regs *regs, unsi + { + struct vm_area_struct *vma; + struct task_struct *tsk; +- unsigned long address; + struct mm_struct *mm; + int write; + int fault; + ++ /* Get the faulting address: */ ++ const unsigned long address = read_cr2(); ++ + tsk = current; + mm = tsk->mm; + + prefetchw(&mm->mmap_sem); + +- /* Get the faulting address: */ +- address = read_cr2(); +- + if (unlikely(kmmio_fault(regs, address))) + return; + +@@ -1033,7 +1239,7 @@ do_page_fault(struct pt_regs *regs, unsi + * User-mode registers count as a user access even for any + * potential system fault or CPU buglet: + */ +- if (user_mode_vm(regs)) { ++ if (user_mode(regs)) { + local_irq_enable(); + error_code |= PF_USER; + } else { +@@ -1085,6 +1291,11 @@ do_page_fault(struct pt_regs *regs, unsi + might_sleep(); + } + ++#if defined(CONFIG_X86_32) && defined(CONFIG_PAX_PAGEEXEC) ++ if (pax_handle_pageexec_fault(regs, mm, address, error_code)) ++ return; +#endif + vma = find_vma(mm, address); - if (!vma) - goto bad_area; -@@ -701,16 +844,20 @@ void __kprobes do_page_fault(struct pt_r - goto good_area; - if (!(vma->vm_flags & VM_GROWSDOWN)) - goto bad_area; + if (unlikely(!vma)) { + bad_area(regs, error_code, address); +@@ -1096,18 +1307,24 @@ do_page_fault(struct pt_regs *regs, unsi + bad_area(regs, error_code, address); + return; + } - if (error_code & PF_USER) { - /* - * Accessing the stack below %sp is always a bug. - * The large cushion allows instructions like enter -- * and pusha to work. ("enter $65535,$31" pushes +- * and pusha to work. ("enter $65535, $31" pushes - * 32 pointers and then decrements %sp by 65535.) - */ -- if (address + 65536 + 32 * sizeof(unsigned long) < regs->sp) -- goto bad_area; -- } +- if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < regs->sp)) { +- bad_area(regs, error_code, address); +- return; +- } + /* + * Accessing the stack below %sp is always a bug. + * The large cushion allows instructions like enter -+ * and pusha to work. ("enter $65535,$31" pushes ++ * and pusha to work. ("enter $65535, $31" pushes + * 32 pointers and then decrements %sp by 65535.) + */ -+ if (address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp) -+ goto bad_area; -+ -+#ifdef CONFIG_PAX_SEGMEXEC -+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1) -+ goto bad_area; -+#endif -+ - if (expand_stack(vma, address)) - goto bad_area; - /* -@@ -720,6 +867,8 @@ void __kprobes do_page_fault(struct pt_r - good_area: - si_code = SEGV_ACCERR; - write = 0; -+ if (nx_enabled && (error_code & PF_INSTR) && !(vma->vm_flags & VM_EXEC)) -+ goto bad_area; - switch (error_code & (PF_PROT|PF_WRITE)) { - default: /* 3: write, present */ - /* fall through */ -@@ -774,6 +923,69 @@ bad_area: - up_read(&mm->mmap_sem); - - bad_area_nosemaphore: -+ -+#ifdef CONFIG_X86_64 -+ if (mm && (error_code & PF_INSTR)) { -+ if (regs->ip == (unsigned long)vgettimeofday) { -+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_gettimeofday); -+ return; -+ } else if (regs->ip == (unsigned long)vtime) { -+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, fallback_time); -+ return; -+ } else if (regs->ip == (unsigned long)vgetcpu) { -+ regs->ip = (unsigned long)VDSO64_SYMBOL(mm->context.vdso, getcpu); -+ return; -+ } -+ } -+#endif -+ -+#if defined(CONFIG_PAX_PAGEEXEC) || defined(CONFIG_PAX_SEGMEXEC) -+ if (mm && (error_code & PF_USER)) { -+ unsigned long ip = regs->ip; -+ -+ if (v8086_mode(regs)) -+ ip = ((regs->cs & 0xffff) << 4) + (regs->ip & 0xffff); -+ -+ /* -+ * It's possible to have interrupts off here. -+ */ -+ local_irq_enable(); -+ -+#ifdef CONFIG_PAX_PAGEEXEC -+ if ((mm->pax_flags & MF_PAX_PAGEEXEC) && -+ ((nx_enabled && (error_code & PF_INSTR)) || (!(error_code & (PF_PROT | PF_WRITE)) && regs->ip == address))) { -+ -+#ifdef CONFIG_PAX_EMUTRAMP -+ switch (pax_handle_fetch_fault(regs)) { -+ case 2: -+ return; -+ } -+#endif -+ -+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); -+ do_group_exit(SIGKILL); -+ } -+#endif ++ if (unlikely(address + 65536 + 32 * sizeof(unsigned long) < task_pt_regs(tsk)->sp)) { ++ bad_area(regs, error_code, address); ++ return; + } + +#ifdef CONFIG_PAX_SEGMEXEC -+ if ((mm->pax_flags & MF_PAX_SEGMEXEC) && !(error_code & (PF_PROT | PF_WRITE)) && (regs->ip + SEGMEXEC_TASK_SIZE == address)) { -+ -+#ifdef CONFIG_PAX_EMUTRAMP -+ switch (pax_handle_fetch_fault(regs)) { -+ case 2: -+ return; -+ } -+#endif -+ -+ pax_report_fault(regs, (void *)regs->ip, (void *)regs->sp); -+ do_group_exit(SIGKILL); -+ } -+#endif -+ ++ if (unlikely((mm->pax_flags & MF_PAX_SEGMEXEC) && vma->vm_end - SEGMEXEC_TASK_SIZE - 1 < address - SEGMEXEC_TASK_SIZE - 1)) { ++ bad_area(regs, error_code, address); ++ return; + } +#endif + -+bad_area_nopax: - /* User mode accesses just cause a SIGSEGV */ - if (error_code & PF_USER) { - /* -@@ -852,7 +1064,7 @@ no_context: - #ifdef CONFIG_X86_32 - die("Oops", regs, error_code); - bust_spinlocks(0); -- do_exit(SIGKILL); -+ do_group_exit(SIGKILL); - #else - sig = SIGKILL; - if (__die("Oops", regs, error_code)) -@@ -935,3 +1147,174 @@ void vmalloc_sync_all(void) - } - #endif + if (unlikely(expand_stack(vma, address))) { + bad_area(regs, error_code, address); + return; +@@ -1146,3 +1363,174 @@ good_area: + + up_read(&mm->mmap_sem); } + +#ifdef CONFIG_PAX_EMUTRAMP @@ -14264,10 +14361,10 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/fault.c linux-2.6.29.6/arch/x86/mm/fault.c + printk("\n"); +} +#endif -diff -urNp linux-2.6.29.6/arch/x86/mm/highmem_32.c linux-2.6.29.6/arch/x86/mm/highmem_32.c ---- linux-2.6.29.6/arch/x86/mm/highmem_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/highmem_32.c 2009-07-23 17:34:32.085744993 -0400 -@@ -74,6 +74,10 @@ void *kmap_atomic_prot(struct page *page +diff -urNp linux-2.6.30.4/arch/x86/mm/highmem_32.c linux-2.6.30.4/arch/x86/mm/highmem_32.c +--- linux-2.6.30.4/arch/x86/mm/highmem_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/highmem_32.c 2009-07-30 09:48:09.970452952 -0400 +@@ -32,6 +32,10 @@ void *kmap_atomic_prot(struct page *page enum fixed_addresses idx; unsigned long vaddr; @@ -14278,7 +14375,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/highmem_32.c linux-2.6.29.6/arch/x86/mm/hi /* even !CONFIG_PREEMPT needs this, for in_atomic in do_page_fault */ pagefault_disable(); -@@ -85,7 +89,17 @@ void *kmap_atomic_prot(struct page *page +@@ -43,7 +47,17 @@ void *kmap_atomic_prot(struct page *page idx = type + KM_TYPE_NR*smp_processor_id(); vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); BUG_ON(!pte_none(*(kmap_pte-idx))); @@ -14296,7 +14393,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/highmem_32.c linux-2.6.29.6/arch/x86/mm/hi arch_flush_lazy_mmu_mode(); return (void *)vaddr; -@@ -101,15 +115,29 @@ void kunmap_atomic(void *kvaddr, enum km +@@ -59,15 +73,29 @@ void kunmap_atomic(void *kvaddr, enum km unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK; enum fixed_addresses idx = type + KM_TYPE_NR*smp_processor_id(); @@ -14328,35 +14425,9 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/highmem_32.c linux-2.6.29.6/arch/x86/mm/hi #ifdef CONFIG_DEBUG_HIGHMEM BUG_ON(vaddr < PAGE_OFFSET); BUG_ON(vaddr >= (unsigned long)high_memory); -@@ -128,11 +156,25 @@ void *kmap_atomic_pfn(unsigned long pfn, - enum fixed_addresses idx; - unsigned long vaddr; - -+#ifdef CONFIG_PAX_KERNEXEC -+ unsigned long cr0; -+#endif -+ - pagefault_disable(); - - idx = type + KM_TYPE_NR*smp_processor_id(); - vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ pax_open_kernel(cr0); -+#endif -+ - set_pte(kmap_pte-idx, pfn_pte(pfn, kmap_prot)); -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ pax_close_kernel(cr0); -+#endif -+ - arch_flush_lazy_mmu_mode(); - - return (void*) vaddr; -diff -urNp linux-2.6.29.6/arch/x86/mm/hugetlbpage.c linux-2.6.29.6/arch/x86/mm/hugetlbpage.c ---- linux-2.6.29.6/arch/x86/mm/hugetlbpage.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/hugetlbpage.c 2009-07-23 17:34:32.085744993 -0400 +diff -urNp linux-2.6.30.4/arch/x86/mm/hugetlbpage.c linux-2.6.30.4/arch/x86/mm/hugetlbpage.c +--- linux-2.6.30.4/arch/x86/mm/hugetlbpage.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/hugetlbpage.c 2009-07-30 09:48:09.971412512 -0400 @@ -267,13 +267,18 @@ static unsigned long hugetlb_get_unmappe struct hstate *h = hstate_file(file); struct mm_struct *mm = current->mm; @@ -14491,18 +14562,18 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/hugetlbpage.c linux-2.6.29.6/arch/x86/mm/h (!vma || addr + len <= vma->vm_start)) return addr; } -diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_32.c ---- linux-2.6.29.6/arch/x86/mm/init_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/init_32.c 2009-07-23 17:34:32.086818444 -0400 +diff -urNp linux-2.6.30.4/arch/x86/mm/init_32.c linux-2.6.30.4/arch/x86/mm/init_32.c +--- linux-2.6.30.4/arch/x86/mm/init_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/init_32.c 2009-07-30 09:48:09.972413251 -0400 @@ -50,6 +50,7 @@ #include <asm/setup.h> #include <asm/cacheflush.h> - #include <asm/smp.h> + #include <asm/init.h> +#include <asm/desc.h> - unsigned int __VMALLOC_RESERVE = 128 << 20; - -@@ -82,36 +83,6 @@ static __init void *alloc_low_page(void) + unsigned long max_low_pfn_mapped; + unsigned long max_pfn_mapped; +@@ -75,36 +76,6 @@ static __init void *alloc_low_page(void) } /* @@ -14517,7 +14588,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ - -#ifdef CONFIG_X86_PAE - if (!(pgd_val(*pgd) & _PAGE_PRESENT)) { -- if (after_init_bootmem) +- if (after_bootmem) - pmd_table = (pmd_t *)alloc_bootmem_low_pages(PAGE_SIZE); - else - pmd_table = (pmd_t *)alloc_low_page(); @@ -14539,7 +14610,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ * Create a page table and place a pointer to it in a middle page * directory entry: */ -@@ -131,7 +102,11 @@ static pte_t * __init one_page_table_ini +@@ -124,13 +95,28 @@ static pte_t * __init one_page_table_ini page_table = (pte_t *)alloc_low_page(); paravirt_alloc_pte(&init_mm, __pa(page_table) >> PAGE_SHIFT); @@ -14551,7 +14622,24 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ BUG_ON(page_table != pte_offset_kernel(pmd, 0)); } -@@ -194,6 +169,7 @@ page_table_range_init(unsigned long star + return pte_offset_kernel(pmd, 0); + } + ++static pmd_t * __init one_md_table_init(pgd_t *pgd) ++{ ++ pud_t *pud; ++ pmd_t *pmd_table; ++ ++ pud = pud_offset(pgd, 0); ++ pmd_table = pmd_offset(pud, 0); ++ ++ return pmd_table; ++} ++ + pmd_t * __init populate_extra_pmd(unsigned long vaddr) + { + int pgd_idx = pgd_index(vaddr); +@@ -204,6 +190,7 @@ page_table_range_init(unsigned long star int pgd_idx, pmd_idx; unsigned long vaddr; pgd_t *pgd; @@ -14559,7 +14647,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ pmd_t *pmd; pte_t *pte = NULL; -@@ -203,8 +179,13 @@ page_table_range_init(unsigned long star +@@ -213,8 +200,13 @@ page_table_range_init(unsigned long star pgd = pgd_base + pgd_idx; for ( ; (pgd_idx < PTRS_PER_PGD) && (vaddr != end); pgd++, pgd_idx++) { @@ -14575,7 +14663,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ for (; (pmd_idx < PTRS_PER_PMD) && (vaddr != end); pmd++, pmd_idx++) { pte = page_table_kmap_check(one_page_table_init(pmd), -@@ -216,11 +197,23 @@ page_table_range_init(unsigned long star +@@ -226,11 +218,23 @@ page_table_range_init(unsigned long star } } @@ -14603,10 +14691,10 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ } /* -@@ -233,9 +226,10 @@ static void __init kernel_physical_mappi - unsigned long end_pfn, - int use_pse) - { +@@ -246,9 +250,10 @@ kernel_physical_mapping_init(unsigned lo + int use_pse = page_size_mask == (1<<PG_LEVEL_2M); + unsigned long start_pfn, end_pfn; + pgd_t *pgd_base = swapper_pg_dir; - int pgd_idx, pmd_idx, pte_ofs; + unsigned int pgd_idx, pmd_idx, pte_ofs; unsigned long pfn; @@ -14615,7 +14703,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ pmd_t *pmd; pte_t *pte; unsigned pages_2m, pages_4k; -@@ -265,8 +259,13 @@ repeat: +@@ -281,8 +286,13 @@ repeat: pfn = start_pfn; pgd_idx = pgd_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET); pgd = pgd_base + pgd_idx; @@ -14631,7 +14719,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ if (pfn >= end_pfn) continue; -@@ -278,14 +277,13 @@ repeat: +@@ -294,14 +304,13 @@ repeat: #endif for (; pmd_idx < PTRS_PER_PMD && pfn < end_pfn; pmd++, pmd_idx++) { @@ -14647,7 +14735,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ pgprot_t prot = PAGE_KERNEL_LARGE; /* * first pass will use the same initial -@@ -295,11 +293,7 @@ repeat: +@@ -311,11 +320,7 @@ repeat: __pgprot(PTE_IDENT_ATTR | _PAGE_PSE); @@ -14660,7 +14748,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ prot = PAGE_KERNEL_LARGE_EXEC; pages_2m++; -@@ -316,7 +310,7 @@ repeat: +@@ -332,7 +337,7 @@ repeat: pte_ofs = pte_index((pfn<<PAGE_SHIFT) + PAGE_OFFSET); pte += pte_ofs; for (; pte_ofs < PTRS_PER_PTE && pfn < end_pfn; @@ -14669,7 +14757,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ pgprot_t prot = PAGE_KERNEL; /* * first pass will use the same initial -@@ -324,7 +318,7 @@ repeat: +@@ -340,7 +345,7 @@ repeat: */ pgprot_t init_prot = __pgprot(PTE_IDENT_ATTR); @@ -14678,22 +14766,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ prot = PAGE_KERNEL_EXEC; pages_4k++; -@@ -369,7 +363,13 @@ repeat: - */ - int devmem_is_allowed(unsigned long pagenr) - { -- if (pagenr <= 256) -+ if (!pagenr) -+ return 1; -+#ifdef CONFIG_VM86 -+ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT)) -+ return 1; -+#endif -+ if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) - return 1; - if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) - return 0; -@@ -508,7 +508,7 @@ void __init native_pagetable_setup_start +@@ -492,7 +497,7 @@ void __init native_pagetable_setup_start pud = pud_offset(pgd, va); pmd = pmd_offset(pud, va); @@ -14702,7 +14775,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ break; pte = pte_offset_kernel(pmd, va); -@@ -559,9 +559,7 @@ static void __init early_ioremap_page_ta +@@ -544,9 +549,7 @@ void __init early_ioremap_page_table_ran static void __init pagetable_init(void) { @@ -14713,7 +14786,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ } #ifdef CONFIG_ACPI_SLEEP -@@ -569,12 +567,12 @@ static void __init pagetable_init(void) +@@ -554,12 +557,12 @@ static void __init pagetable_init(void) * ACPI suspend needs this for resume, because things like the intel-agp * driver might have split up a kernel 4MB mapping. */ @@ -14728,7 +14801,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ } #else /* !CONFIG_ACPI_SLEEP */ static inline void save_pg_dir(void) -@@ -604,13 +602,11 @@ void zap_low_mappings(void) +@@ -589,13 +592,11 @@ void zap_low_mappings(void) int nx_enabled; @@ -14743,7 +14816,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ /* * noexec = on|off * -@@ -619,40 +615,33 @@ static int disable_nx __initdata; +@@ -604,40 +605,33 @@ static int disable_nx __initdata; * on Enable * off Disable */ @@ -14774,7 +14847,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ early_param("noexec", noexec_setup); +#endif - static void __init set_nx(void) + void __init set_nx(void) { - unsigned int v[4], l, h; + if (!nx_enabled && cpu_has_nx) { @@ -14797,7 +14870,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ } } #endif -@@ -1035,7 +1024,7 @@ void __init mem_init(void) +@@ -934,7 +928,7 @@ void __init mem_init(void) set_highmem_pages_init(); codesize = (unsigned long) &_etext - (unsigned long) &_text; @@ -14806,7 +14879,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ initsize = (unsigned long) &__init_end - (unsigned long) &__init_begin; kclist_add(&kcore_mem, __va(0), max_low_pfn << PAGE_SHIFT); -@@ -1081,10 +1070,10 @@ void __init mem_init(void) +@@ -980,10 +974,10 @@ void __init mem_init(void) ((unsigned long)&__init_end - (unsigned long)&__init_begin) >> 10, @@ -14820,57 +14893,10 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_32.c linux-2.6.29.6/arch/x86/mm/init_ ((unsigned long)&_etext - (unsigned long)&_text) >> 10); /* -@@ -1227,6 +1216,46 @@ void free_init_pages(char *what, unsigne - - void free_initmem(void) - { -+ -+#ifdef CONFIG_PAX_KERNEXEC -+ /* PaX: limit KERNEL_CS to actual size */ -+ unsigned long addr, limit; -+ struct desc_struct d; -+ int cpu; -+ pgd_t *pgd; -+ pud_t *pud; -+ pmd_t *pmd; -+ -+#ifdef CONFIG_MODULES -+ limit = ktva_ktla((unsigned long)&MODULES_END); -+#else -+ limit = (unsigned long)&_etext; -+#endif -+ limit = (limit - 1UL) >> PAGE_SHIFT; -+ -+ for (cpu = 0; cpu < NR_CPUS; cpu++) { -+ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC); -+ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S); -+ } -+ -+ /* PaX: make KERNEL_CS read-only */ -+ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_data; addr += PMD_SIZE) { -+ pgd = pgd_offset_k(addr); -+ pud = pud_offset(pgd, addr); -+ pmd = pmd_offset(pud, addr); -+ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); -+ } -+#ifdef CONFIG_X86_PAE -+ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) { -+ pgd = pgd_offset_k(addr); -+ pud = pud_offset(pgd, addr); -+ pmd = pmd_offset(pud, addr); -+ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); -+ } -+#endif -+ flush_tlb_all(); -+#endif -+ - free_init_pages("unused kernel memory", - (unsigned long)(&__init_begin), - (unsigned long)(&__init_end)); -diff -urNp linux-2.6.29.6/arch/x86/mm/init_64.c linux-2.6.29.6/arch/x86/mm/init_64.c ---- linux-2.6.29.6/arch/x86/mm/init_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/init_64.c 2009-07-23 17:34:32.086818444 -0400 -@@ -175,6 +175,10 @@ set_pte_vaddr_pud(pud_t *pud_page, unsig +diff -urNp linux-2.6.30.4/arch/x86/mm/init_64.c linux-2.6.30.4/arch/x86/mm/init_64.c +--- linux-2.6.30.4/arch/x86/mm/init_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/init_64.c 2009-07-30 09:48:09.972413251 -0400 +@@ -202,12 +202,24 @@ void set_pte_vaddr_pud(pud_t *pud_page, pmd_t *pmd; pte_t *pte; @@ -14879,13 +14905,9 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_64.c linux-2.6.29.6/arch/x86/mm/init_ +#endif + pud = pud_page + pud_index(vaddr); - if (pud_none(*pud)) { - pmd = (pmd_t *) spp_getpage(); -@@ -196,8 +200,17 @@ set_pte_vaddr_pud(pud_t *pud_page, unsig - } + pmd = fill_pmd(pud, vaddr); + pte = fill_pte(pmd, vaddr); - pte = pte_offset_kernel(pmd, vaddr); -+ +#ifdef CONFIG_PAX_KERNEXEC + pax_open_kernel(cr0); +#endif @@ -14899,7 +14921,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_64.c linux-2.6.29.6/arch/x86/mm/init_ /* * It's enough to flush this one mapping. * (PGE mappings get flushed as well) -@@ -238,14 +251,12 @@ static void __init __init_extra_mapping( +@@ -265,14 +277,12 @@ static void __init __init_extra_mapping( pgd = pgd_offset_k((unsigned long)__va(phys)); if (pgd_none(*pgd)) { pud = (pud_t *) spp_getpage(); @@ -14916,28 +14938,90 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_64.c linux-2.6.29.6/arch/x86/mm/init_ } pmd = pmd_offset(pud, phys); BUG_ON(!pmd_none(*pmd)); -@@ -888,7 +899,9 @@ EXPORT_SYMBOL_GPL(memory_add_physaddr_to +@@ -882,8 +892,8 @@ int kern_addr_valid(unsigned long addr) + static struct vm_area_struct gate_vma = { + .vm_start = VSYSCALL_START, + .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE), +- .vm_page_prot = PAGE_READONLY_EXEC, +- .vm_flags = VM_READ | VM_EXEC ++ .vm_page_prot = PAGE_READONLY, ++ .vm_flags = VM_READ + }; + + struct vm_area_struct *get_gate_vma(struct task_struct *tsk) +@@ -917,7 +927,7 @@ int in_gate_area_no_task(unsigned long a + + const char *arch_vma_name(struct vm_area_struct *vma) + { +- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) ++ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso) + return "[vdso]"; + if (vma == &gate_vma) + return "[vsyscall]"; +diff -urNp linux-2.6.30.4/arch/x86/mm/init.c linux-2.6.30.4/arch/x86/mm/init.c +--- linux-2.6.30.4/arch/x86/mm/init.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/init.c 2009-07-30 09:48:09.971412512 -0400 +@@ -348,7 +348,13 @@ unsigned long __init_refok init_memory_m */ int devmem_is_allowed(unsigned long pagenr) { - if (pagenr <= 256) + if (!pagenr) + return 1; ++#ifdef CONFIG_VM86 ++ if (pagenr < (ISA_START_ADDRESS >> PAGE_SHIFT)) ++ return 1; ++#endif + if ((ISA_START_ADDRESS >> PAGE_SHIFT) <= pagenr && pagenr < (ISA_END_ADDRESS >> PAGE_SHIFT)) return 1; if (iomem_is_exclusive(pagenr << PAGE_SHIFT)) return 0; -@@ -979,6 +992,39 @@ void free_init_pages(char *what, unsigne +@@ -396,6 +402,75 @@ void free_init_pages(char *what, unsigne void free_initmem(void) { + +#ifdef CONFIG_PAX_KERNEXEC -+ unsigned long addr, end; + pgd_t *pgd; + pud_t *pud; + pmd_t *pmd; + ++#ifdef CONFIG_X86_32 ++ /* PaX: limit KERNEL_CS to actual size */ ++ unsigned long addr, limit; ++ struct desc_struct d; ++ int cpu; ++ ++#ifdef CONFIG_MODULES ++ limit = ktva_ktla((unsigned long)&MODULES_END); ++#else ++ limit = (unsigned long)&_etext; ++#endif ++ limit = (limit - 1UL) >> PAGE_SHIFT; ++ ++ for (cpu = 0; cpu < NR_CPUS; cpu++) { ++ pack_descriptor(&d, get_desc_base(&get_cpu_gdt_table(cpu)[GDT_ENTRY_KERNEL_CS]), limit, 0x9B, 0xC); ++ write_gdt_entry(get_cpu_gdt_table(cpu), GDT_ENTRY_KERNEL_CS, &d, DESCTYPE_S); ++ } ++ ++ /* PaX: make KERNEL_CS read-only */ ++ for (addr = ktla_ktva((unsigned long)&_text); addr < (unsigned long)&_data; addr += PMD_SIZE) { ++ pgd = pgd_offset_k(addr); ++ pud = pud_offset(pgd, addr); ++ pmd = pmd_offset(pud, addr); ++ set_pmd(pmd, __pmd(pmd_val(*pmd) & ~_PAGE_RW)); ++ } ++#ifdef CONFIG_X86_PAE ++ for (addr = (unsigned long)&__init_begin; addr < (unsigned long)&__init_end; addr += PMD_SIZE) { ++ pgd = pgd_offset_k(addr); ++ pud = pud_offset(pgd, addr); ++ pmd = pmd_offset(pud, addr); ++ set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); ++ } ++#endif ++#else ++ unsigned long addr, end; ++ + /* PaX: make kernel code/rodata read-only, rest non-executable */ + for (addr = __START_KERNEL_map; addr < __START_KERNEL_map + KERNEL_IMAGE_SIZE; addr += PMD_SIZE) { + pgd = pgd_offset_k(addr); @@ -14960,6 +15044,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_64.c linux-2.6.29.6/arch/x86/mm/init_ + else + set_pmd(pmd, __pmd(pmd_val(*pmd) | (_PAGE_NX & __supported_pte_mask))); + } ++#endif + + flush_tlb_all(); +#endif @@ -14967,42 +15052,40 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/init_64.c linux-2.6.29.6/arch/x86/mm/init_ free_init_pages("unused kernel memory", (unsigned long)(&__init_begin), (unsigned long)(&__init_end)); -@@ -1116,8 +1162,8 @@ int kern_addr_valid(unsigned long addr) - static struct vm_area_struct gate_vma = { - .vm_start = VSYSCALL_START, - .vm_end = VSYSCALL_START + (VSYSCALL_MAPPED_PAGES * PAGE_SIZE), -- .vm_page_prot = PAGE_READONLY_EXEC, -- .vm_flags = VM_READ | VM_EXEC -+ .vm_page_prot = PAGE_READONLY, -+ .vm_flags = VM_READ - }; +diff -urNp linux-2.6.30.4/arch/x86/mm/iomap_32.c linux-2.6.30.4/arch/x86/mm/iomap_32.c +--- linux-2.6.30.4/arch/x86/mm/iomap_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/iomap_32.c 2009-07-30 09:48:09.973477350 -0400 +@@ -37,12 +37,26 @@ void *kmap_atomic_prot_pfn(unsigned long + enum fixed_addresses idx; + unsigned long vaddr; - struct vm_area_struct *get_gate_vma(struct task_struct *tsk) -@@ -1151,7 +1197,7 @@ int in_gate_area_no_task(unsigned long a ++#ifdef CONFIG_PAX_KERNEXEC ++ unsigned long cr0; ++#endif ++ + pagefault_disable(); - const char *arch_vma_name(struct vm_area_struct *vma) - { -- if (vma->vm_mm && vma->vm_start == (long)vma->vm_mm->context.vdso) -+ if (vma->vm_mm && vma->vm_start == vma->vm_mm->context.vdso) - return "[vdso]"; - if (vma == &gate_vma) - return "[vsyscall]"; -diff -urNp linux-2.6.29.6/arch/x86/mm/iomap_32.c linux-2.6.29.6/arch/x86/mm/iomap_32.c ---- linux-2.6.29.6/arch/x86/mm/iomap_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/iomap_32.c 2009-07-23 17:34:32.086818444 -0400 -@@ -24,7 +24,7 @@ int is_io_mapping_possible(resource_size - { - #ifndef CONFIG_X86_PAE - /* There is no way to map greater than 1 << 32 address without PAE */ -- if (base + size > 0x100000000ULL) -+ if ((u64)base + size > 0x100000000ULL) - return 0; - #endif - return 1; -diff -urNp linux-2.6.29.6/arch/x86/mm/ioremap.c linux-2.6.29.6/arch/x86/mm/ioremap.c ---- linux-2.6.29.6/arch/x86/mm/ioremap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/ioremap.c 2009-07-23 17:34:37.458887026 -0400 -@@ -114,8 +114,8 @@ int page_is_ram(unsigned long pagenr) + debug_kmap_atomic(type); + idx = type + KM_TYPE_NR * smp_processor_id(); + vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ pax_open_kernel(cr0); ++#endif ++ + set_pte(kmap_pte - idx, pfn_pte(pfn, prot)); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ pax_close_kernel(cr0); ++#endif ++ + arch_flush_lazy_mmu_mode(); + + return (void *)vaddr; +diff -urNp linux-2.6.30.4/arch/x86/mm/ioremap.c linux-2.6.30.4/arch/x86/mm/ioremap.c +--- linux-2.6.30.4/arch/x86/mm/ioremap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/ioremap.c 2009-07-30 19:56:23.514032300 -0400 +@@ -111,8 +111,8 @@ int page_is_ram(unsigned long pagenr) * Second special case: Some BIOSen report the PC BIOS * area (640->1Mb) as ram even though it is not. */ @@ -15013,7 +15096,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/ioremap.c linux-2.6.29.6/arch/x86/mm/iorem return 0; for (i = 0; i < e820.nr_map; i++) { -@@ -210,10 +210,7 @@ static void __iomem *__ioremap_caller(re +@@ -207,10 +207,7 @@ static void __iomem *__ioremap_caller(re /* * Don't allow anybody to remap normal RAM that we're using.. */ @@ -15025,7 +15108,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/ioremap.c linux-2.6.29.6/arch/x86/mm/iorem int is_ram = page_is_ram(pfn); if (is_ram && pfn_valid(pfn) && !PageReserved(pfn_to_page(pfn))) -@@ -275,6 +272,8 @@ static void __iomem *__ioremap_caller(re +@@ -272,6 +269,8 @@ static void __iomem *__ioremap_caller(re break; } @@ -15034,7 +15117,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/ioremap.c linux-2.6.29.6/arch/x86/mm/iorem /* * Ok, go for it.. */ -@@ -490,7 +489,6 @@ static int __init early_ioremap_debug_se +@@ -489,7 +488,6 @@ static int __init early_ioremap_debug_se early_param("early_ioremap_debug", early_ioremap_debug_setup); static __initdata int after_paging_init; @@ -15042,21 +15125,20 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/ioremap.c linux-2.6.29.6/arch/x86/mm/iorem static inline pmd_t * __init early_ioremap_pmd(unsigned long addr) { -@@ -505,7 +503,11 @@ static inline pmd_t * __init early_iorem +@@ -502,11 +500,6 @@ static inline pmd_t * __init early_iorem + return pmd; + } - static inline pte_t * __init early_ioremap_pte(unsigned long addr) - { +-static inline pte_t * __init early_ioremap_pte(unsigned long addr) +-{ - return &bm_pte[pte_index(addr)]; -+#ifdef CONFIG_X86_32 -+ return &swapper_pg_fixmap[pte_index(addr)]; -+#else -+ return &level1_fixmap_pgt[pte_index(addr)]; -+#endif - } +-} +- + static unsigned long slot_virt[FIX_BTMAPS_SLOTS] __initdata; void __init early_ioremap_init(void) -@@ -516,8 +518,6 @@ void __init early_ioremap_init(void) - printk(KERN_INFO "early_ioremap_init()\n"); +@@ -521,8 +514,6 @@ void __init early_ioremap_init(void) + slot_virt[i] = __fix_to_virt(FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*i); pmd = early_ioremap_pmd(fix_to_virt(FIX_BTMAP_BEGIN)); - memset(bm_pte, 0, sizeof(bm_pte)); @@ -15064,9 +15146,26 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/ioremap.c linux-2.6.29.6/arch/x86/mm/iorem /* * The boot-ioremap range spans multiple pmds, for which -diff -urNp linux-2.6.29.6/arch/x86/mm/mmap.c linux-2.6.29.6/arch/x86/mm/mmap.c ---- linux-2.6.29.6/arch/x86/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/mmap.c 2009-07-23 17:34:32.087725848 -0400 +@@ -552,13 +543,15 @@ static void __init __early_set_fixmap(en + phys_addr_t phys, pgprot_t flags) + { + unsigned long addr = __fix_to_virt(idx); ++ unsigned int level; + pte_t *pte; + + if (idx >= __end_of_fixed_addresses) { + BUG(); + return; + } +- pte = early_ioremap_pte(addr); ++ pte = lookup_address(addr, &level); ++ BUG_ON(!pte || level != PG_LEVEL_4K); + + if (pgprot_val(flags)) + set_pte(pte, pfn_pte(phys >> PAGE_SHIFT, flags)); +diff -urNp linux-2.6.30.4/arch/x86/mm/mmap.c linux-2.6.30.4/arch/x86/mm/mmap.c +--- linux-2.6.30.4/arch/x86/mm/mmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/mmap.c 2009-07-30 09:48:09.973477350 -0400 @@ -36,7 +36,7 @@ * Leave an at least ~128 MB hole. */ @@ -15148,9 +15247,9 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/mmap.c linux-2.6.29.6/arch/x86/mm/mmap.c mm->get_unmapped_area = arch_get_unmapped_area_topdown; mm->unmap_area = arch_unmap_area_topdown; } -diff -urNp linux-2.6.29.6/arch/x86/mm/numa_32.c linux-2.6.29.6/arch/x86/mm/numa_32.c ---- linux-2.6.29.6/arch/x86/mm/numa_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/numa_32.c 2009-07-23 17:34:32.087725848 -0400 +diff -urNp linux-2.6.30.4/arch/x86/mm/numa_32.c linux-2.6.30.4/arch/x86/mm/numa_32.c +--- linux-2.6.30.4/arch/x86/mm/numa_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/numa_32.c 2009-07-30 09:48:09.974436034 -0400 @@ -98,7 +98,6 @@ unsigned long node_memmap_size_bytes(int } #endif @@ -15159,10 +15258,10 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/numa_32.c linux-2.6.29.6/arch/x86/mm/numa_ extern unsigned long highend_pfn, highstart_pfn; #define LARGE_PAGE_BYTES (PTRS_PER_PTE * PAGE_SIZE) -diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr.c linux-2.6.29.6/arch/x86/mm/pageattr.c ---- linux-2.6.29.6/arch/x86/mm/pageattr.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/pageattr.c 2009-07-23 17:34:32.087725848 -0400 -@@ -20,6 +20,7 @@ +diff -urNp linux-2.6.30.4/arch/x86/mm/pageattr.c linux-2.6.30.4/arch/x86/mm/pageattr.c +--- linux-2.6.30.4/arch/x86/mm/pageattr.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/pageattr.c 2009-07-30 09:48:09.974436034 -0400 +@@ -21,6 +21,7 @@ #include <asm/pgalloc.h> #include <asm/proto.h> #include <asm/pat.h> @@ -15170,7 +15269,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr.c linux-2.6.29.6/arch/x86/mm/page /* * The current flushing context - we pass it instead of 5 arguments: -@@ -259,9 +260,10 @@ static inline pgprot_t static_protection +@@ -265,9 +266,10 @@ static inline pgprot_t static_protection * Does not cover __inittext since that is gone later on. On * 64bit we do not enforce !NX on the low mapping */ @@ -15182,7 +15281,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr.c linux-2.6.29.6/arch/x86/mm/page /* * The .rodata section needs to be read-only. Using the pfn * catches all aliases. -@@ -269,6 +271,7 @@ static inline pgprot_t static_protection +@@ -275,6 +277,7 @@ static inline pgprot_t static_protection if (within(pfn, __pa((unsigned long)__start_rodata) >> PAGE_SHIFT, __pa((unsigned long)__end_rodata) >> PAGE_SHIFT)) pgprot_val(forbidden) |= _PAGE_RW; @@ -15190,7 +15289,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr.c linux-2.6.29.6/arch/x86/mm/page prot = __pgprot(pgprot_val(prot) & ~pgprot_val(forbidden)); -@@ -321,8 +324,20 @@ EXPORT_SYMBOL_GPL(lookup_address); +@@ -327,8 +330,20 @@ EXPORT_SYMBOL_GPL(lookup_address); */ static void __set_pmd_pte(pte_t *kpte, unsigned long address, pte_t pte) { @@ -15211,9 +15310,9 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr.c linux-2.6.29.6/arch/x86/mm/page #ifdef CONFIG_X86_32 if (!SHARED_KERNEL_PMD) { struct page *page; -diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr-test.c linux-2.6.29.6/arch/x86/mm/pageattr-test.c ---- linux-2.6.29.6/arch/x86/mm/pageattr-test.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/pageattr-test.c 2009-07-23 17:34:32.088730317 -0400 +diff -urNp linux-2.6.30.4/arch/x86/mm/pageattr-test.c linux-2.6.30.4/arch/x86/mm/pageattr-test.c +--- linux-2.6.30.4/arch/x86/mm/pageattr-test.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/pageattr-test.c 2009-07-30 09:48:09.974436034 -0400 @@ -36,7 +36,7 @@ enum { static int pte_testbit(pte_t pte) @@ -15223,10 +15322,10 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pageattr-test.c linux-2.6.29.6/arch/x86/mm } struct split_state { -diff -urNp linux-2.6.29.6/arch/x86/mm/pat.c linux-2.6.29.6/arch/x86/mm/pat.c ---- linux-2.6.29.6/arch/x86/mm/pat.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/pat.c 2009-07-23 18:40:27.466429820 -0400 -@@ -204,7 +204,7 @@ chk_conflict(struct memtype *new, struct +diff -urNp linux-2.6.30.4/arch/x86/mm/pat.c linux-2.6.30.4/arch/x86/mm/pat.c +--- linux-2.6.30.4/arch/x86/mm/pat.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/pat.c 2009-07-30 09:48:09.975412278 -0400 +@@ -213,7 +213,7 @@ chk_conflict(struct memtype *new, struct conflict: printk(KERN_INFO "%s:%d conflicting memory types " @@ -15235,7 +15334,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pat.c linux-2.6.29.6/arch/x86/mm/pat.c new->end, cattr_name(new->type), cattr_name(entry->type)); return -EBUSY; } -@@ -488,7 +488,7 @@ int free_memtype(u64 start, u64 end) +@@ -487,7 +487,7 @@ int free_memtype(u64 start, u64 end) if (err) { printk(KERN_INFO "%s:%d freeing invalid memtype %Lx-%Lx\n", @@ -15244,25 +15343,16 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pat.c linux-2.6.29.6/arch/x86/mm/pat.c } dprintk("free_memtype request 0x%Lx-0x%Lx\n", start, end); -@@ -590,7 +590,7 @@ int phys_mem_access_prot_allowed(struct - free_memtype(offset, offset + size); +@@ -588,7 +588,7 @@ int kernel_map_sync_memtype(u64 base, un printk(KERN_INFO - "%s:%d /dev/mem ioremap_change_attr failed %s for %Lx-%Lx\n", + "%s:%d ioremap_change_attr failed %s " + "for %Lx-%Lx\n", - current->comm, current->pid, + current->comm, task_pid_nr(current), cattr_name(flags), - offset, (unsigned long long)(offset + size)); - return 0; -@@ -611,7 +611,7 @@ void map_devmem(unsigned long pfn, unsig - if (flags != want_flags) { - printk(KERN_INFO - "%s:%d /dev/mem expected mapping type %s for %Lx-%Lx, got %s\n", -- current->comm, current->pid, -+ current->comm, task_pid_nr(current), - cattr_name(want_flags), - addr, (unsigned long long)(addr + size), - cattr_name(flags)); -@@ -656,7 +656,7 @@ static int reserve_pfn_range(u64 paddr, + base, (unsigned long long)(base + size)); + return -EINVAL; +@@ -627,7 +627,7 @@ static int reserve_pfn_range(u64 paddr, free_memtype(paddr, paddr + size); printk(KERN_ERR "%s:%d map pfn expected mapping type %s" " for %Lx-%Lx, got %s\n", @@ -15271,16 +15361,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pat.c linux-2.6.29.6/arch/x86/mm/pat.c cattr_name(want_flags), (unsigned long long)paddr, (unsigned long long)(paddr + size), -@@ -685,7 +685,7 @@ static int reserve_pfn_range(u64 paddr, - printk(KERN_ERR - "%s:%d reserve_pfn_range ioremap_change_attr failed %s " - "for %Lx-%Lx\n", -- current->comm, current->pid, -+ current->comm, task_pid_nr(current), - cattr_name(flags), - (unsigned long long)paddr, - (unsigned long long)(paddr + size)); -@@ -870,7 +870,7 @@ static int memtype_seq_show(struct seq_f +@@ -826,7 +826,7 @@ static int memtype_seq_show(struct seq_f return 0; } @@ -15289,10 +15370,10 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pat.c linux-2.6.29.6/arch/x86/mm/pat.c .start = memtype_seq_start, .next = memtype_seq_next, .stop = memtype_seq_stop, -diff -urNp linux-2.6.29.6/arch/x86/mm/pgtable_32.c linux-2.6.29.6/arch/x86/mm/pgtable_32.c ---- linux-2.6.29.6/arch/x86/mm/pgtable_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/mm/pgtable_32.c 2009-07-23 17:34:32.088730317 -0400 -@@ -31,6 +31,10 @@ void set_pte_vaddr(unsigned long vaddr, +diff -urNp linux-2.6.30.4/arch/x86/mm/pgtable_32.c linux-2.6.30.4/arch/x86/mm/pgtable_32.c +--- linux-2.6.30.4/arch/x86/mm/pgtable_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/pgtable_32.c 2009-07-30 09:48:09.975412278 -0400 +@@ -33,6 +33,10 @@ void set_pte_vaddr(unsigned long vaddr, pmd_t *pmd; pte_t *pte; @@ -15303,7 +15384,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pgtable_32.c linux-2.6.29.6/arch/x86/mm/pg pgd = swapper_pg_dir + pgd_index(vaddr); if (pgd_none(*pgd)) { BUG(); -@@ -47,11 +51,20 @@ void set_pte_vaddr(unsigned long vaddr, +@@ -49,11 +53,20 @@ void set_pte_vaddr(unsigned long vaddr, return; } pte = pte_offset_kernel(pmd, vaddr); @@ -15313,7 +15394,7 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pgtable_32.c linux-2.6.29.6/arch/x86/mm/pg +#endif + if (pte_val(pteval)) - set_pte_present(&init_mm, vaddr, pte, pteval); + set_pte_at(&init_mm, vaddr, pte, pteval); else pte_clear(&init_mm, vaddr, pte); @@ -15324,9 +15405,21 @@ diff -urNp linux-2.6.29.6/arch/x86/mm/pgtable_32.c linux-2.6.29.6/arch/x86/mm/pg /* * It's enough to flush this one mapping. * (PGE mappings get flushed as well) -diff -urNp linux-2.6.29.6/arch/x86/oprofile/backtrace.c linux-2.6.29.6/arch/x86/oprofile/backtrace.c ---- linux-2.6.29.6/arch/x86/oprofile/backtrace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/oprofile/backtrace.c 2009-07-23 17:34:32.088730317 -0400 +diff -urNp linux-2.6.30.4/arch/x86/mm/tlb.c linux-2.6.30.4/arch/x86/mm/tlb.c +--- linux-2.6.30.4/arch/x86/mm/tlb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/mm/tlb.c 2009-07-30 09:48:09.975412278 -0400 +@@ -12,7 +12,7 @@ + #include <asm/uv/uv.h> + + DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) +- = { &init_mm, 0, }; ++ = { &init_mm, 0 }; + + /* + * Smarter SMP flushing macros. +diff -urNp linux-2.6.30.4/arch/x86/oprofile/backtrace.c linux-2.6.30.4/arch/x86/oprofile/backtrace.c +--- linux-2.6.30.4/arch/x86/oprofile/backtrace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/oprofile/backtrace.c 2009-07-30 09:48:09.975412278 -0400 @@ -37,7 +37,7 @@ static void backtrace_address(void *data unsigned int *depth = data; @@ -15336,18 +15429,18 @@ diff -urNp linux-2.6.29.6/arch/x86/oprofile/backtrace.c linux-2.6.29.6/arch/x86/ } static struct stacktrace_ops backtrace_ops = { -@@ -78,7 +78,7 @@ x86_backtrace(struct pt_regs * const reg +@@ -77,7 +77,7 @@ x86_backtrace(struct pt_regs * const reg + { struct frame_head *head = (struct frame_head *)frame_pointer(regs); - unsigned long stack = kernel_trap_sp(regs); - if (!user_mode_vm(regs)) { + if (!user_mode(regs)) { + unsigned long stack = kernel_stack_pointer(regs); if (depth) dump_trace(NULL, regs, (unsigned long *)stack, 0, - &backtrace_ops, &depth); -diff -urNp linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c ---- linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c 2009-07-23 17:34:32.089719706 -0400 +diff -urNp linux-2.6.30.4/arch/x86/oprofile/op_model_p4.c linux-2.6.30.4/arch/x86/oprofile/op_model_p4.c +--- linux-2.6.30.4/arch/x86/oprofile/op_model_p4.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/oprofile/op_model_p4.c 2009-07-30 09:48:09.976413155 -0400 @@ -48,7 +48,7 @@ static inline void setup_num_counters(vo #endif } @@ -15357,10 +15450,10 @@ diff -urNp linux-2.6.29.6/arch/x86/oprofile/op_model_p4.c linux-2.6.29.6/arch/x8 { #ifdef CONFIG_SMP return smp_num_siblings == 2 ? 2 : 1; -diff -urNp linux-2.6.29.6/arch/x86/pci/common.c linux-2.6.29.6/arch/x86/pci/common.c ---- linux-2.6.29.6/arch/x86/pci/common.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/pci/common.c 2009-07-23 17:34:32.089719706 -0400 -@@ -367,7 +367,7 @@ static struct dmi_system_id __devinitdat +diff -urNp linux-2.6.30.4/arch/x86/pci/common.c linux-2.6.30.4/arch/x86/pci/common.c +--- linux-2.6.30.4/arch/x86/pci/common.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/pci/common.c 2009-07-30 09:48:09.976413155 -0400 +@@ -370,7 +370,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "ProLiant DL585 G2"), }, }, @@ -15369,10 +15462,10 @@ diff -urNp linux-2.6.29.6/arch/x86/pci/common.c linux-2.6.29.6/arch/x86/pci/comm }; void __init dmi_check_pciprobe(void) -diff -urNp linux-2.6.29.6/arch/x86/pci/fixup.c linux-2.6.29.6/arch/x86/pci/fixup.c ---- linux-2.6.29.6/arch/x86/pci/fixup.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/pci/fixup.c 2009-07-23 17:34:32.089719706 -0400 -@@ -364,7 +364,7 @@ static struct dmi_system_id __devinitdat +diff -urNp linux-2.6.30.4/arch/x86/pci/fixup.c linux-2.6.30.4/arch/x86/pci/fixup.c +--- linux-2.6.30.4/arch/x86/pci/fixup.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/pci/fixup.c 2009-07-30 09:48:09.976413155 -0400 +@@ -364,7 +364,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_NAME, "MS-6702E"), }, }, @@ -15381,7 +15474,7 @@ diff -urNp linux-2.6.29.6/arch/x86/pci/fixup.c linux-2.6.29.6/arch/x86/pci/fixup }; /* -@@ -435,7 +435,7 @@ static struct dmi_system_id __devinitdat +@@ -435,7 +435,7 @@ static const struct dmi_system_id __devi DMI_MATCH(DMI_PRODUCT_VERSION, "PSA40U"), }, }, @@ -15390,21 +15483,21 @@ diff -urNp linux-2.6.29.6/arch/x86/pci/fixup.c linux-2.6.29.6/arch/x86/pci/fixup }; static void __devinit pci_pre_fixup_toshiba_ohci1394(struct pci_dev *dev) -diff -urNp linux-2.6.29.6/arch/x86/pci/i386.c linux-2.6.29.6/arch/x86/pci/i386.c ---- linux-2.6.29.6/arch/x86/pci/i386.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/pci/i386.c 2009-07-23 18:40:27.495305970 -0400 -@@ -273,7 +273,7 @@ static void pci_track_mmap_page_range(st - reserve_memtype(addr, addr + vma->vm_end - vma->vm_start, flags, NULL); +diff -urNp linux-2.6.30.4/arch/x86/pci/i386.c linux-2.6.30.4/arch/x86/pci/i386.c +--- linux-2.6.30.4/arch/x86/pci/i386.c 2009-07-30 20:32:40.384629006 -0400 ++++ linux-2.6.30.4/arch/x86/pci/i386.c 2009-07-30 20:32:47.941604516 -0400 +@@ -269,7 +269,7 @@ void pcibios_set_master(struct pci_dev * + pci_write_config_byte(dev, PCI_LATENCY_TIMER, lat); } -static struct vm_operations_struct pci_mmap_ops = { +static const struct vm_operations_struct pci_mmap_ops = { - .open = pci_track_mmap_page_range, - .close = pci_unmap_page_range, .access = generic_access_phys, -diff -urNp linux-2.6.29.6/arch/x86/pci/irq.c linux-2.6.29.6/arch/x86/pci/irq.c ---- linux-2.6.29.6/arch/x86/pci/irq.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/pci/irq.c 2009-07-23 17:34:32.089719706 -0400 + }; + +diff -urNp linux-2.6.30.4/arch/x86/pci/irq.c linux-2.6.30.4/arch/x86/pci/irq.c +--- linux-2.6.30.4/arch/x86/pci/irq.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/pci/irq.c 2009-07-30 09:48:09.976413155 -0400 @@ -543,7 +543,7 @@ static __init int intel_router_probe(str static struct pci_device_id __initdata pirq_440gx[] = { { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443GX_0) }, @@ -15423,9 +15516,9 @@ diff -urNp linux-2.6.29.6/arch/x86/pci/irq.c linux-2.6.29.6/arch/x86/pci/irq.c }; int __init pcibios_irq_init(void) -diff -urNp linux-2.6.29.6/arch/x86/pci/pcbios.c linux-2.6.29.6/arch/x86/pci/pcbios.c ---- linux-2.6.29.6/arch/x86/pci/pcbios.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/pci/pcbios.c 2009-07-23 17:34:32.090717052 -0400 +diff -urNp linux-2.6.30.4/arch/x86/pci/pcbios.c linux-2.6.30.4/arch/x86/pci/pcbios.c +--- linux-2.6.30.4/arch/x86/pci/pcbios.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/pci/pcbios.c 2009-07-30 09:48:09.976413155 -0400 @@ -56,50 +56,120 @@ union bios32 { static struct { unsigned long address; @@ -15757,10 +15850,10 @@ diff -urNp linux-2.6.29.6/arch/x86/pci/pcbios.c linux-2.6.29.6/arch/x86/pci/pcbi return !(ret & 0xff00); } EXPORT_SYMBOL(pcibios_set_irq_routing); -diff -urNp linux-2.6.29.6/arch/x86/power/cpu_32.c linux-2.6.29.6/arch/x86/power/cpu_32.c ---- linux-2.6.29.6/arch/x86/power/cpu_32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/power/cpu_32.c 2009-07-23 17:34:32.090717052 -0400 -@@ -67,7 +67,7 @@ static void do_fpu_end(void) +diff -urNp linux-2.6.30.4/arch/x86/power/cpu_32.c linux-2.6.30.4/arch/x86/power/cpu_32.c +--- linux-2.6.30.4/arch/x86/power/cpu_32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/power/cpu_32.c 2009-07-30 09:48:09.976413155 -0400 +@@ -68,7 +68,7 @@ static void do_fpu_end(void) static void fix_processor_context(void) { int cpu = smp_processor_id(); @@ -15769,10 +15862,10 @@ diff -urNp linux-2.6.29.6/arch/x86/power/cpu_32.c linux-2.6.29.6/arch/x86/power/ set_tss_desc(cpu, t); /* * This just modifies memory; should not be -diff -urNp linux-2.6.29.6/arch/x86/power/cpu_64.c linux-2.6.29.6/arch/x86/power/cpu_64.c ---- linux-2.6.29.6/arch/x86/power/cpu_64.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/power/cpu_64.c 2009-07-23 17:34:32.090717052 -0400 -@@ -143,7 +143,11 @@ void restore_processor_state(void) +diff -urNp linux-2.6.30.4/arch/x86/power/cpu_64.c linux-2.6.30.4/arch/x86/power/cpu_64.c +--- linux-2.6.30.4/arch/x86/power/cpu_64.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/power/cpu_64.c 2009-07-30 09:48:09.978339754 -0400 +@@ -144,7 +144,11 @@ void restore_processor_state(void) static void fix_processor_context(void) { int cpu = smp_processor_id(); @@ -15785,7 +15878,7 @@ diff -urNp linux-2.6.29.6/arch/x86/power/cpu_64.c linux-2.6.29.6/arch/x86/power/ /* * This just modifies memory; should not be necessary. But... This -@@ -152,8 +156,16 @@ static void fix_processor_context(void) +@@ -153,8 +157,16 @@ static void fix_processor_context(void) */ set_tss_desc(cpu, t); @@ -15802,9 +15895,9 @@ diff -urNp linux-2.6.29.6/arch/x86/power/cpu_64.c linux-2.6.29.6/arch/x86/power/ syscall_init(); /* This sets MSR_*STAR and related */ load_TR_desc(); /* This does ltr */ load_LDT(¤t->active_mm->context); /* This does lldt */ -diff -urNp linux-2.6.29.6/arch/x86/vdso/Makefile linux-2.6.29.6/arch/x86/vdso/Makefile ---- linux-2.6.29.6/arch/x86/vdso/Makefile 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/vdso/Makefile 2009-07-23 17:34:32.090717052 -0400 +diff -urNp linux-2.6.30.4/arch/x86/vdso/Makefile linux-2.6.30.4/arch/x86/vdso/Makefile +--- linux-2.6.30.4/arch/x86/vdso/Makefile 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/vdso/Makefile 2009-07-30 09:48:09.978339754 -0400 @@ -122,7 +122,7 @@ quiet_cmd_vdso = VDSO $@ $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) @@ -15814,9 +15907,9 @@ diff -urNp linux-2.6.29.6/arch/x86/vdso/Makefile linux-2.6.29.6/arch/x86/vdso/Ma # # Install the unstripped copy of vdso*.so listed in $(vdso-install-y). -diff -urNp linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c ---- linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c 2009-07-23 17:34:32.091740281 -0400 +diff -urNp linux-2.6.30.4/arch/x86/vdso/vclock_gettime.c linux-2.6.30.4/arch/x86/vdso/vclock_gettime.c +--- linux-2.6.30.4/arch/x86/vdso/vclock_gettime.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/vdso/vclock_gettime.c 2009-07-30 09:48:09.978662746 -0400 @@ -26,20 +26,43 @@ #define gtod vdso_vsyscall_gtod_data @@ -15896,10 +15989,10 @@ diff -urNp linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c linux-2.6.29.6/arch/x86 + ((gtod->clock.name[0] == 'h' && gtod->clock.name[1] == 'p' && gtod->clock.name[2] == 'e' && gtod->clock.name[3] == 't' && !gtod->clock.name[4]) || + (gtod->clock.name[0] == 't' && gtod->clock.name[1] == 's' && gtod->clock.name[2] == 'c' && !gtod->clock.name[3])))) + { - BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != - offsetof(struct timespec, tv_nsec) || - sizeof(*tv) != sizeof(struct timespec)); -@@ -116,9 +151,7 @@ notrace int __vdso_gettimeofday(struct t + if (likely(tv != NULL)) { + BUILD_BUG_ON(offsetof(struct timeval, tv_usec) != + offsetof(struct timespec, tv_nsec) || +@@ -118,9 +153,7 @@ notrace int __vdso_gettimeofday(struct t } return 0; } @@ -15910,9 +16003,9 @@ diff -urNp linux-2.6.29.6/arch/x86/vdso/vclock_gettime.c linux-2.6.29.6/arch/x86 } int gettimeofday(struct timeval *, struct timezone *) __attribute__((weak, alias("__vdso_gettimeofday"))); -diff -urNp linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c ---- linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c 2009-07-23 17:34:32.091740281 -0400 +diff -urNp linux-2.6.30.4/arch/x86/vdso/vdso32-setup.c linux-2.6.30.4/arch/x86/vdso/vdso32-setup.c +--- linux-2.6.30.4/arch/x86/vdso/vdso32-setup.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/vdso/vdso32-setup.c 2009-07-30 09:48:09.979439324 -0400 @@ -226,7 +226,7 @@ static inline void map_compat_vdso(int m void enable_sep_cpu(void) { @@ -15992,9 +16085,9 @@ diff -urNp linux-2.6.29.6/arch/x86/vdso/vdso32-setup.c linux-2.6.29.6/arch/x86/v return &gate_vma; return NULL; } -diff -urNp linux-2.6.29.6/arch/x86/vdso/vdso.lds.S linux-2.6.29.6/arch/x86/vdso/vdso.lds.S ---- linux-2.6.29.6/arch/x86/vdso/vdso.lds.S 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/vdso/vdso.lds.S 2009-07-23 17:34:32.091740281 -0400 +diff -urNp linux-2.6.30.4/arch/x86/vdso/vdso.lds.S linux-2.6.30.4/arch/x86/vdso/vdso.lds.S +--- linux-2.6.30.4/arch/x86/vdso/vdso.lds.S 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/vdso/vdso.lds.S 2009-07-30 09:48:09.978662746 -0400 @@ -35,3 +35,9 @@ VDSO64_PRELINK = VDSO_PRELINK; #define VEXTERN(x) VDSO64_ ## x = vdso_ ## x; #include "vextern.h" @@ -16005,9 +16098,9 @@ diff -urNp linux-2.6.29.6/arch/x86/vdso/vdso.lds.S linux-2.6.29.6/arch/x86/vdso/ +VEXTERN(fallback_time) +VEXTERN(getcpu) +#undef VEXTERN -diff -urNp linux-2.6.29.6/arch/x86/vdso/vextern.h linux-2.6.29.6/arch/x86/vdso/vextern.h ---- linux-2.6.29.6/arch/x86/vdso/vextern.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/vdso/vextern.h 2009-07-23 17:34:32.091740281 -0400 +diff -urNp linux-2.6.30.4/arch/x86/vdso/vextern.h linux-2.6.30.4/arch/x86/vdso/vextern.h +--- linux-2.6.30.4/arch/x86/vdso/vextern.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/vdso/vextern.h 2009-07-30 09:48:09.979439324 -0400 @@ -11,6 +11,5 @@ put into vextern.h and be referenced as a pointer with vdso prefix. The main kernel later fills in the values. */ @@ -16015,9 +16108,9 @@ diff -urNp linux-2.6.29.6/arch/x86/vdso/vextern.h linux-2.6.29.6/arch/x86/vdso/v -VEXTERN(jiffies) VEXTERN(vgetcpu_mode) VEXTERN(vsyscall_gtod_data) -diff -urNp linux-2.6.29.6/arch/x86/vdso/vma.c linux-2.6.29.6/arch/x86/vdso/vma.c ---- linux-2.6.29.6/arch/x86/vdso/vma.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/vdso/vma.c 2009-07-23 17:34:37.458887026 -0400 +diff -urNp linux-2.6.30.4/arch/x86/vdso/vma.c linux-2.6.30.4/arch/x86/vdso/vma.c +--- linux-2.6.30.4/arch/x86/vdso/vma.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/vdso/vma.c 2009-07-30 09:48:09.979439324 -0400 @@ -8,6 +8,7 @@ #include <linux/sched.h> #include <linux/init.h> @@ -16060,9 +16153,9 @@ diff -urNp linux-2.6.29.6/arch/x86/vdso/vma.c linux-2.6.29.6/arch/x86/vdso/vma.c - return 0; -} -__setup("vdso=", vdso_setup); -diff -urNp linux-2.6.29.6/arch/x86/xen/debugfs.c linux-2.6.29.6/arch/x86/xen/debugfs.c ---- linux-2.6.29.6/arch/x86/xen/debugfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/xen/debugfs.c 2009-07-23 18:40:27.496274044 -0400 +diff -urNp linux-2.6.30.4/arch/x86/xen/debugfs.c linux-2.6.30.4/arch/x86/xen/debugfs.c +--- linux-2.6.30.4/arch/x86/xen/debugfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/xen/debugfs.c 2009-07-30 09:48:09.979439324 -0400 @@ -100,7 +100,7 @@ static int xen_array_release(struct inod return 0; } @@ -16072,28 +16165,19 @@ diff -urNp linux-2.6.29.6/arch/x86/xen/debugfs.c linux-2.6.29.6/arch/x86/xen/deb .owner = THIS_MODULE, .open = u32_array_open, .release= xen_array_release, -diff -urNp linux-2.6.29.6/arch/x86/xen/enlighten.c linux-2.6.29.6/arch/x86/xen/enlighten.c ---- linux-2.6.29.6/arch/x86/xen/enlighten.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/xen/enlighten.c 2009-07-23 17:34:32.092715999 -0400 -@@ -319,7 +319,7 @@ static void xen_set_ldt(const void *addr - static void xen_load_gdt(const struct desc_ptr *dtr) - { - unsigned long *frames; -- unsigned long va = dtr->address; -+ unsigned long va = (unsigned long)dtr->address; - unsigned int size = dtr->size + 1; - unsigned pages = (size + PAGE_SIZE - 1) / PAGE_SIZE; - int f; -@@ -334,7 +334,7 @@ static void xen_load_gdt(const struct de - mcs = xen_mc_entry(sizeof(*frames) * pages); - frames = mcs.args; - -- for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) { -+ for (f = 0; va < (unsigned long)dtr->address + size; va += PAGE_SIZE, f++) { - frames[f] = virt_to_mfn(va); - make_lowmem_page_readonly((void *)va); - } -@@ -442,7 +442,7 @@ static void xen_write_idt_entry(gate_des +diff -urNp linux-2.6.30.4/arch/x86/xen/enlighten.c linux-2.6.30.4/arch/x86/xen/enlighten.c +--- linux-2.6.30.4/arch/x86/xen/enlighten.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/xen/enlighten.c 2009-08-04 17:23:47.808223131 -0400 +@@ -67,8 +67,6 @@ EXPORT_SYMBOL_GPL(xen_start_info); + + struct shared_info xen_dummy_shared_info; + +-void *xen_initial_gdt; +- + /* + * Point at some empty memory to start with. We map the real shared_info + * page as soon as fixmap is up and running. +@@ -454,7 +452,7 @@ static void xen_write_idt_entry(gate_des preempt_disable(); @@ -16102,7 +16186,34 @@ diff -urNp linux-2.6.29.6/arch/x86/xen/enlighten.c linux-2.6.29.6/arch/x86/xen/e end = start + __get_cpu_var(idt_desc).size + 1; xen_mc_flush(); -@@ -1528,6 +1528,8 @@ static __init pgd_t *xen_setup_kernel_pa +@@ -962,12 +960,6 @@ asmlinkage void __init xen_start_kernel( + */ + load_percpu_segment(0); + #endif +- /* +- * The only reliable way to retain the initial address of the +- * percpu gdt_page is to remember it here, so we can go and +- * mark it RW later, when the initial percpu area is freed. +- */ +- xen_initial_gdt = &per_cpu(gdt_page, 0); + + xen_smp_init(); + +diff -urNp linux-2.6.30.4/arch/x86/xen/Kconfig linux-2.6.30.4/arch/x86/xen/Kconfig +--- linux-2.6.30.4/arch/x86/xen/Kconfig 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/xen/Kconfig 2009-08-02 09:47:15.079210101 -0400 +@@ -8,6 +8,7 @@ config XEN + select PARAVIRT_CLOCK + depends on X86_64 || (X86_32 && X86_PAE && !X86_VISWS) + depends on X86_CMPXCHG && X86_TSC ++ depends on !PAX_KERNEXEC + help + This is the Linux Xen port. Enabling this will allow the + kernel to boot in a paravirtualized environment under the +diff -urNp linux-2.6.30.4/arch/x86/xen/mmu.c linux-2.6.30.4/arch/x86/xen/mmu.c +--- linux-2.6.30.4/arch/x86/xen/mmu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/xen/mmu.c 2009-07-30 09:48:09.980662517 -0400 +@@ -1716,6 +1716,8 @@ __init pgd_t *xen_setup_kernel_pagetable convert_pfn_mfn(init_level4_pgt); convert_pfn_mfn(level3_ident_pgt); convert_pfn_mfn(level3_kernel_pgt); @@ -16111,7 +16222,7 @@ diff -urNp linux-2.6.29.6/arch/x86/xen/enlighten.c linux-2.6.29.6/arch/x86/xen/e l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); -@@ -1546,9 +1548,12 @@ static __init pgd_t *xen_setup_kernel_pa +@@ -1734,9 +1736,12 @@ __init pgd_t *xen_setup_kernel_pagetable set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); @@ -16124,22 +16235,22 @@ diff -urNp linux-2.6.29.6/arch/x86/xen/enlighten.c linux-2.6.29.6/arch/x86/xen/e /* Pin down new L4 */ pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, -diff -urNp linux-2.6.29.6/arch/x86/xen/smp.c linux-2.6.29.6/arch/x86/xen/smp.c ---- linux-2.6.29.6/arch/x86/xen/smp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/x86/xen/smp.c 2009-07-23 17:34:32.092715999 -0400 -@@ -171,11 +171,6 @@ static void __init xen_smp_prepare_boot_ +diff -urNp linux-2.6.30.4/arch/x86/xen/smp.c linux-2.6.30.4/arch/x86/xen/smp.c +--- linux-2.6.30.4/arch/x86/xen/smp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/xen/smp.c 2009-07-30 09:48:09.981489035 -0400 +@@ -167,11 +167,6 @@ static void __init xen_smp_prepare_boot_ { BUG_ON(smp_processor_id() != 0); native_smp_prepare_boot_cpu(); - - /* We've switched to the "real" per-cpu gdt, so make sure the - old memory can be recycled */ -- make_lowmem_page_readwrite(&per_cpu_var(gdt_page)); +- make_lowmem_page_readwrite(xen_initial_gdt); - xen_setup_vcpu_info_placement(); } -@@ -234,8 +229,8 @@ cpu_initialize_context(unsigned int cpu, +@@ -231,8 +226,8 @@ cpu_initialize_context(unsigned int cpu, gdt = get_cpu_gdt_table(cpu); ctxt->flags = VGCF_IN_KERNEL; @@ -16150,9 +16261,21 @@ diff -urNp linux-2.6.29.6/arch/x86/xen/smp.c linux-2.6.29.6/arch/x86/xen/smp.c ctxt->user_regs.ss = __KERNEL_DS; #ifdef CONFIG_X86_32 ctxt->user_regs.fs = __KERNEL_PERCPU; -diff -urNp linux-2.6.29.6/arch/xtensa/include/asm/atomic.h linux-2.6.29.6/arch/xtensa/include/asm/atomic.h ---- linux-2.6.29.6/arch/xtensa/include/asm/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/xtensa/include/asm/atomic.h 2009-07-23 17:34:32.092715999 -0400 +diff -urNp linux-2.6.30.4/arch/x86/xen/xen-ops.h linux-2.6.30.4/arch/x86/xen/xen-ops.h +--- linux-2.6.30.4/arch/x86/xen/xen-ops.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/x86/xen/xen-ops.h 2009-08-04 17:23:47.809460830 -0400 +@@ -10,8 +10,6 @@ + extern const char xen_hypervisor_callback[]; + extern const char xen_failsafe_callback[]; + +-extern void *xen_initial_gdt; +- + struct trap_info; + void xen_copy_trap_info(struct trap_info *traps); + +diff -urNp linux-2.6.30.4/arch/xtensa/include/asm/atomic.h linux-2.6.30.4/arch/xtensa/include/asm/atomic.h +--- linux-2.6.30.4/arch/xtensa/include/asm/atomic.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/xtensa/include/asm/atomic.h 2009-07-30 09:48:09.981489035 -0400 @@ -165,6 +165,9 @@ static inline int atomic_sub_return(int * Atomically increments @v by 1. */ @@ -16163,9 +16286,9 @@ diff -urNp linux-2.6.29.6/arch/xtensa/include/asm/atomic.h linux-2.6.29.6/arch/x /** * atomic_inc - increment atomic variable -diff -urNp linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h ---- linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h 2009-07-23 17:34:32.092715999 -0400 +diff -urNp linux-2.6.30.4/arch/xtensa/include/asm/kmap_types.h linux-2.6.30.4/arch/xtensa/include/asm/kmap_types.h +--- linux-2.6.30.4/arch/xtensa/include/asm/kmap_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/arch/xtensa/include/asm/kmap_types.h 2009-07-30 09:48:09.981489035 -0400 @@ -25,6 +25,7 @@ enum km_type { KM_IRQ1, KM_SOFTIRQ0, @@ -16174,9 +16297,9 @@ diff -urNp linux-2.6.29.6/arch/xtensa/include/asm/kmap_types.h linux-2.6.29.6/ar KM_TYPE_NR }; -diff -urNp linux-2.6.29.6/crypto/lrw.c linux-2.6.29.6/crypto/lrw.c ---- linux-2.6.29.6/crypto/lrw.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/crypto/lrw.c 2009-07-23 17:34:32.092715999 -0400 +diff -urNp linux-2.6.30.4/crypto/lrw.c linux-2.6.30.4/crypto/lrw.c +--- linux-2.6.30.4/crypto/lrw.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/crypto/lrw.c 2009-07-30 09:48:09.982442014 -0400 @@ -60,7 +60,7 @@ static int setkey(struct crypto_tfm *par struct priv *ctx = crypto_tfm_ctx(parent); struct crypto_cipher *child = ctx->child; @@ -16186,9 +16309,9 @@ diff -urNp linux-2.6.29.6/crypto/lrw.c linux-2.6.29.6/crypto/lrw.c int bsize = crypto_cipher_blocksize(child); crypto_cipher_clear_flags(child, CRYPTO_TFM_REQ_MASK); -diff -urNp linux-2.6.29.6/Documentation/dontdiff linux-2.6.29.6/Documentation/dontdiff ---- linux-2.6.29.6/Documentation/dontdiff 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/Documentation/dontdiff 2009-07-23 17:34:32.093837355 -0400 +diff -urNp linux-2.6.30.4/Documentation/dontdiff linux-2.6.30.4/Documentation/dontdiff +--- linux-2.6.30.4/Documentation/dontdiff 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/Documentation/dontdiff 2009-08-04 17:23:49.932547446 -0400 @@ -3,6 +3,7 @@ *.bin *.cpio @@ -16208,15 +16331,7 @@ diff -urNp linux-2.6.29.6/Documentation/dontdiff linux-2.6.29.6/Documentation/do Image Kerntypes Module.markers -@@ -62,7 +67,6 @@ aic7*reg_print.c* - aic7*seq.h* - aicasm - aicdb.h* --asm - asm-offsets.h - asm_offsets.h - autoconf.h* -@@ -77,6 +81,7 @@ btfixupprep +@@ -76,6 +81,7 @@ btfixupprep build bvmlinux bzImage* @@ -16224,7 +16339,7 @@ diff -urNp linux-2.6.29.6/Documentation/dontdiff linux-2.6.29.6/Documentation/do classlist.h* comp*.log compile.h* -@@ -104,6 +109,7 @@ gen_crc32table +@@ -103,9 +109,11 @@ gen_crc32table gen_init_cpio genksyms *_gray256.c @@ -16232,7 +16347,11 @@ diff -urNp linux-2.6.29.6/Documentation/dontdiff linux-2.6.29.6/Documentation/do ihex2fw ikconfig.h* initramfs_data.cpio -@@ -165,6 +171,7 @@ setup ++initramfs_data.cpio.bz2 + initramfs_data.cpio.gz + initramfs_list + kallsyms +@@ -164,6 +172,7 @@ setup setup.bin setup.elf sImage @@ -16240,11 +16359,12 @@ diff -urNp linux-2.6.29.6/Documentation/dontdiff linux-2.6.29.6/Documentation/do sm_tbl* split-include syscalltab.h -@@ -188,12 +195,15 @@ version.h* +@@ -187,12 +196,16 @@ version.h* vmlinux vmlinux-* vmlinux.aout +vmlinux.bin.all ++vmlinux.bin.bz2 vmlinux.lds +vmlinux.relocs vsyscall.lds @@ -16256,9 +16376,9 @@ diff -urNp linux-2.6.29.6/Documentation/dontdiff linux-2.6.29.6/Documentation/do wakeup.bin wakeup.elf wakeup.lds -diff -urNp linux-2.6.29.6/drivers/acpi/blacklist.c linux-2.6.29.6/drivers/acpi/blacklist.c ---- linux-2.6.29.6/drivers/acpi/blacklist.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/blacklist.c 2009-07-23 17:34:32.093837355 -0400 +diff -urNp linux-2.6.30.4/drivers/acpi/blacklist.c linux-2.6.30.4/drivers/acpi/blacklist.c +--- linux-2.6.30.4/drivers/acpi/blacklist.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/acpi/blacklist.c 2009-07-30 09:48:09.982442014 -0400 @@ -71,7 +71,7 @@ static struct acpi_blacklist_item acpi_b {"IBM ", "TP600E ", 0x00000105, ACPI_SIG_DSDT, less_than_or_equal, "Incorrect _ADR", 1}, @@ -16268,22 +16388,10 @@ diff -urNp linux-2.6.29.6/drivers/acpi/blacklist.c linux-2.6.29.6/drivers/acpi/b }; #if CONFIG_ACPI_BLACKLIST_YEAR -diff -urNp linux-2.6.29.6/drivers/acpi/ec.c linux-2.6.29.6/drivers/acpi/ec.c ---- linux-2.6.29.6/drivers/acpi/ec.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/ec.c 2009-07-23 18:40:27.516638001 -0400 -@@ -672,7 +672,7 @@ static int acpi_ec_info_open_fs(struct i - return single_open(file, acpi_ec_read_info, PDE(inode)->data); - } - --static struct file_operations acpi_ec_info_ops = { -+static const struct file_operations acpi_ec_info_ops = { - .open = acpi_ec_info_open_fs, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/drivers/acpi/osl.c linux-2.6.29.6/drivers/acpi/osl.c ---- linux-2.6.29.6/drivers/acpi/osl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/osl.c 2009-07-23 17:34:32.093837355 -0400 -@@ -483,6 +483,8 @@ acpi_os_read_memory(acpi_physical_addres +diff -urNp linux-2.6.30.4/drivers/acpi/osl.c linux-2.6.30.4/drivers/acpi/osl.c +--- linux-2.6.30.4/drivers/acpi/osl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/acpi/osl.c 2009-07-30 09:48:09.986535027 -0400 +@@ -492,6 +492,8 @@ acpi_os_read_memory(acpi_physical_addres void __iomem *virt_addr; virt_addr = ioremap(phys_addr, width); @@ -16292,7 +16400,7 @@ diff -urNp linux-2.6.29.6/drivers/acpi/osl.c linux-2.6.29.6/drivers/acpi/osl.c if (!value) value = &dummy; -@@ -511,6 +513,8 @@ acpi_os_write_memory(acpi_physical_addre +@@ -520,6 +522,8 @@ acpi_os_write_memory(acpi_physical_addre void __iomem *virt_addr; virt_addr = ioremap(phys_addr, width); @@ -16301,10 +16409,10 @@ diff -urNp linux-2.6.29.6/drivers/acpi/osl.c linux-2.6.29.6/drivers/acpi/osl.c switch (width) { case 8: -diff -urNp linux-2.6.29.6/drivers/acpi/processor_core.c linux-2.6.29.6/drivers/acpi/processor_core.c ---- linux-2.6.29.6/drivers/acpi/processor_core.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/processor_core.c 2009-07-23 17:34:32.093837355 -0400 -@@ -678,7 +678,7 @@ static int __cpuinit acpi_processor_star +diff -urNp linux-2.6.30.4/drivers/acpi/processor_core.c linux-2.6.30.4/drivers/acpi/processor_core.c +--- linux-2.6.30.4/drivers/acpi/processor_core.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/acpi/processor_core.c 2009-07-30 09:48:09.986535027 -0400 +@@ -703,7 +703,7 @@ static int __cpuinit acpi_processor_star return 0; } @@ -16313,10 +16421,10 @@ diff -urNp linux-2.6.29.6/drivers/acpi/processor_core.c linux-2.6.29.6/drivers/a /* * Buggy BIOS check -diff -urNp linux-2.6.29.6/drivers/acpi/processor_idle.c linux-2.6.29.6/drivers/acpi/processor_idle.c ---- linux-2.6.29.6/drivers/acpi/processor_idle.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/processor_idle.c 2009-07-23 17:34:32.094936160 -0400 -@@ -156,7 +156,7 @@ static struct dmi_system_id __cpuinitdat +diff -urNp linux-2.6.30.4/drivers/acpi/processor_idle.c linux-2.6.30.4/drivers/acpi/processor_idle.c +--- linux-2.6.30.4/drivers/acpi/processor_idle.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/acpi/processor_idle.c 2009-07-30 09:48:09.987663767 -0400 +@@ -108,7 +108,7 @@ static struct dmi_system_id __cpuinitdat DMI_MATCH(DMI_BIOS_VENDOR,"Phoenix Technologies LTD"), DMI_MATCH(DMI_BIOS_VERSION,"SHE845M0.86C.0013.D.0302131307")}, (void *)2}, @@ -16324,236 +16432,23 @@ diff -urNp linux-2.6.29.6/drivers/acpi/processor_idle.c linux-2.6.29.6/drivers/a + { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL}, }; - static inline u32 ticks_elapsed(u32 t1, u32 t2) -diff -urNp linux-2.6.29.6/drivers/acpi/processor_thermal.c linux-2.6.29.6/drivers/acpi/processor_thermal.c ---- linux-2.6.29.6/drivers/acpi/processor_thermal.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/processor_thermal.c 2009-07-23 18:40:27.533990873 -0400 -@@ -507,7 +507,7 @@ static ssize_t acpi_processor_write_limi - return count; - } - --struct file_operations acpi_processor_limit_fops = { -+const struct file_operations acpi_processor_limit_fops = { - .owner = THIS_MODULE, - .open = acpi_processor_limit_open_fs, - .read = seq_read, -diff -urNp linux-2.6.29.6/drivers/acpi/processor_throttling.c linux-2.6.29.6/drivers/acpi/processor_throttling.c ---- linux-2.6.29.6/drivers/acpi/processor_throttling.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/processor_throttling.c 2009-07-23 18:40:27.545437588 -0400 -@@ -1291,7 +1291,7 @@ static ssize_t acpi_processor_write_thro - return count; - } - --struct file_operations acpi_processor_throttling_fops = { -+const struct file_operations acpi_processor_throttling_fops = { - .owner = THIS_MODULE, - .open = acpi_processor_throttling_open_fs, - .read = seq_read, -diff -urNp linux-2.6.29.6/drivers/acpi/sbs.c linux-2.6.29.6/drivers/acpi/sbs.c ---- linux-2.6.29.6/drivers/acpi/sbs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/sbs.c 2009-07-23 18:40:27.556300663 -0400 -@@ -479,9 +479,9 @@ static int - acpi_sbs_add_fs(struct proc_dir_entry **dir, - struct proc_dir_entry *parent_dir, - char *dir_name, -- struct file_operations *info_fops, -- struct file_operations *state_fops, -- struct file_operations *alarm_fops, void *data) -+ const struct file_operations *info_fops, -+ const struct file_operations *state_fops, -+ const struct file_operations *alarm_fops, void *data) - { - if (!*dir) { - *dir = proc_mkdir(dir_name, parent_dir); -@@ -677,7 +677,7 @@ static int acpi_battery_alarm_open_fs(st - return single_open(file, acpi_battery_read_alarm, PDE(inode)->data); - } - --static struct file_operations acpi_battery_info_fops = { -+static const struct file_operations acpi_battery_info_fops = { - .open = acpi_battery_info_open_fs, - .read = seq_read, - .llseek = seq_lseek, -@@ -685,7 +685,7 @@ static struct file_operations acpi_batte - .owner = THIS_MODULE, - }; - --static struct file_operations acpi_battery_state_fops = { -+static const struct file_operations acpi_battery_state_fops = { - .open = acpi_battery_state_open_fs, - .read = seq_read, - .llseek = seq_lseek, -@@ -693,7 +693,7 @@ static struct file_operations acpi_batte - .owner = THIS_MODULE, - }; - --static struct file_operations acpi_battery_alarm_fops = { -+static const struct file_operations acpi_battery_alarm_fops = { - .open = acpi_battery_alarm_open_fs, - .read = seq_read, - .write = acpi_battery_write_alarm, -@@ -725,7 +725,7 @@ static int acpi_ac_state_open_fs(struct - return single_open(file, acpi_ac_read_state, PDE(inode)->data); - } - --static struct file_operations acpi_ac_state_fops = { -+static const struct file_operations acpi_ac_state_fops = { - .open = acpi_ac_state_open_fs, - .read = seq_read, - .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/drivers/acpi/video.c linux-2.6.29.6/drivers/acpi/video.c ---- linux-2.6.29.6/drivers/acpi/video.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/acpi/video.c 2009-07-23 18:40:27.557273014 -0400 -@@ -189,7 +189,7 @@ struct acpi_video_device { - - /* bus */ - static int acpi_video_bus_info_open_fs(struct inode *inode, struct file *file); --static struct file_operations acpi_video_bus_info_fops = { -+static const struct file_operations acpi_video_bus_info_fops = { - .owner = THIS_MODULE, - .open = acpi_video_bus_info_open_fs, - .read = seq_read, -@@ -198,7 +198,7 @@ static struct file_operations acpi_video - }; - - static int acpi_video_bus_ROM_open_fs(struct inode *inode, struct file *file); --static struct file_operations acpi_video_bus_ROM_fops = { -+static const struct file_operations acpi_video_bus_ROM_fops = { - .owner = THIS_MODULE, - .open = acpi_video_bus_ROM_open_fs, - .read = seq_read, -@@ -208,7 +208,7 @@ static struct file_operations acpi_video - - static int acpi_video_bus_POST_info_open_fs(struct inode *inode, - struct file *file); --static struct file_operations acpi_video_bus_POST_info_fops = { -+static const struct file_operations acpi_video_bus_POST_info_fops = { - .owner = THIS_MODULE, - .open = acpi_video_bus_POST_info_open_fs, - .read = seq_read, -@@ -217,19 +217,29 @@ static struct file_operations acpi_video - }; - - static int acpi_video_bus_POST_open_fs(struct inode *inode, struct file *file); --static struct file_operations acpi_video_bus_POST_fops = { -+static ssize_t -+acpi_video_bus_write_POST(struct file *file, -+ const char __user * buffer, -+ size_t count, loff_t * data); -+static const struct file_operations acpi_video_bus_POST_fops = { - .owner = THIS_MODULE, - .open = acpi_video_bus_POST_open_fs, - .read = seq_read, -+ .write = acpi_video_bus_write_POST, - .llseek = seq_lseek, - .release = single_release, - }; - static int acpi_video_bus_DOS_open_fs(struct inode *inode, struct file *file); --static struct file_operations acpi_video_bus_DOS_fops = { -+static ssize_t -+acpi_video_bus_write_DOS(struct file *file, -+ const char __user * buffer, -+ size_t count, loff_t * data); -+static const struct file_operations acpi_video_bus_DOS_fops = { - .owner = THIS_MODULE, - .open = acpi_video_bus_DOS_open_fs, - .read = seq_read, -+ .write = acpi_video_bus_write_DOS, - .llseek = seq_lseek, - .release = single_release, - }; -@@ -237,7 +247,7 @@ static struct file_operations acpi_video - /* device */ - static int acpi_video_device_info_open_fs(struct inode *inode, - struct file *file); --static struct file_operations acpi_video_device_info_fops = { -+static const struct file_operations acpi_video_device_info_fops = { - .owner = THIS_MODULE, - .open = acpi_video_device_info_open_fs, - .read = seq_read, -@@ -247,27 +257,37 @@ static struct file_operations acpi_video - - static int acpi_video_device_state_open_fs(struct inode *inode, - struct file *file); --static struct file_operations acpi_video_device_state_fops = { -+static ssize_t -+acpi_video_device_write_state(struct file *file, -+ const char __user * buffer, -+ size_t count, loff_t * data); -+static const struct file_operations acpi_video_device_state_fops = { - .owner = THIS_MODULE, - .open = acpi_video_device_state_open_fs, - .read = seq_read, -+ .write = acpi_video_device_write_state, - .llseek = seq_lseek, - .release = single_release, - }; - - static int acpi_video_device_brightness_open_fs(struct inode *inode, +diff -urNp linux-2.6.30.4/drivers/acpi/video.c linux-2.6.30.4/drivers/acpi/video.c +--- linux-2.6.30.4/drivers/acpi/video.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/acpi/video.c 2009-07-30 12:06:52.099841502 -0400 +@@ -282,7 +282,7 @@ static int acpi_video_device_brightness_ struct file *file); + static ssize_t acpi_video_device_write_brightness(struct file *file, + const char __user *buffer, size_t count, loff_t *data); -static struct file_operations acpi_video_device_brightness_fops = { -+static ssize_t -+acpi_video_device_write_brightness(struct file *file, -+ const char __user * buffer, -+ size_t count, loff_t * data); +static const struct file_operations acpi_video_device_brightness_fops = { .owner = THIS_MODULE, .open = acpi_video_device_brightness_open_fs, .read = seq_read, -+ .write = acpi_video_device_write_brightness, - .llseek = seq_lseek, - .release = single_release, - }; - - static int acpi_video_device_EDID_open_fs(struct inode *inode, - struct file *file); --static struct file_operations acpi_video_device_EDID_fops = { -+static const struct file_operations acpi_video_device_EDID_fops = { - .owner = THIS_MODULE, - .open = acpi_video_device_EDID_open_fs, - .read = seq_read, -@@ -1133,8 +1153,6 @@ static int acpi_video_device_add_fs(stru - if (!entry) - goto err_remove_dir; - -- /* 'state' [R/W] */ -- acpi_video_device_state_fops.write = acpi_video_device_write_state; - entry = proc_create_data("state", S_IFREG | S_IRUGO | S_IWUSR, - device_dir, - &acpi_video_device_state_fops, -@@ -1142,9 +1160,6 @@ static int acpi_video_device_add_fs(stru - if (!entry) - goto err_remove_info; - -- /* 'brightness' [R/W] */ -- acpi_video_device_brightness_fops.write = -- acpi_video_device_write_brightness; - entry = proc_create_data("brightness", S_IFREG | S_IRUGO | S_IWUSR, - device_dir, - &acpi_video_device_brightness_fops, -@@ -1426,8 +1441,6 @@ static int acpi_video_bus_add_fs(struct - if (!entry) - goto err_remove_rom; - -- /* 'POST' [R/W] */ -- acpi_video_bus_POST_fops.write = acpi_video_bus_write_POST; - entry = proc_create_data("POST", S_IFREG | S_IRUGO | S_IWUSR, - device_dir, - &acpi_video_bus_POST_fops, -@@ -1435,8 +1448,6 @@ static int acpi_video_bus_add_fs(struct - if (!entry) - goto err_remove_post_info; - -- /* 'DOS' [R/W] */ -- acpi_video_bus_DOS_fops.write = acpi_video_bus_write_DOS; - entry = proc_create_data("DOS", S_IFREG | S_IRUGO | S_IWUSR, - device_dir, - &acpi_video_bus_DOS_fops, -diff -urNp linux-2.6.29.6/drivers/ata/ahci.c linux-2.6.29.6/drivers/ata/ahci.c ---- linux-2.6.29.6/drivers/ata/ahci.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ata/ahci.c 2009-07-23 17:34:32.094936160 -0400 -@@ -611,7 +611,7 @@ static const struct pci_device_id ahci_p +diff -urNp linux-2.6.30.4/drivers/ata/ahci.c linux-2.6.30.4/drivers/ata/ahci.c +--- linux-2.6.30.4/drivers/ata/ahci.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ata/ahci.c 2009-07-30 09:48:09.987663767 -0400 +@@ -622,7 +622,7 @@ static const struct pci_device_id ahci_p { PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_STORAGE_SATA_AHCI, 0xffffff, board_ahci }, @@ -16562,10 +16457,10 @@ diff -urNp linux-2.6.29.6/drivers/ata/ahci.c linux-2.6.29.6/drivers/ata/ahci.c }; -diff -urNp linux-2.6.29.6/drivers/ata/ata_piix.c linux-2.6.29.6/drivers/ata/ata_piix.c ---- linux-2.6.29.6/drivers/ata/ata_piix.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ata/ata_piix.c 2009-07-23 17:34:32.095849165 -0400 -@@ -291,7 +291,7 @@ static const struct pci_device_id piix_p +diff -urNp linux-2.6.30.4/drivers/ata/ata_piix.c linux-2.6.30.4/drivers/ata/ata_piix.c +--- linux-2.6.30.4/drivers/ata/ata_piix.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ata/ata_piix.c 2009-07-30 09:48:09.988577262 -0400 +@@ -293,7 +293,7 @@ static const struct pci_device_id piix_p { 0x8086, 0x3b2d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_2port_sata }, /* SATA Controller IDE (PCH) */ { 0x8086, 0x3b2e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich8_sata }, @@ -16574,16 +16469,16 @@ diff -urNp linux-2.6.29.6/drivers/ata/ata_piix.c linux-2.6.29.6/drivers/ata/ata_ }; static struct pci_driver piix_pci_driver = { -@@ -595,7 +595,7 @@ static const struct ich_laptop ich_lapto - { 0x266F, 0x1025, 0x0066 }, /* ICH6 on ACER Aspire 1694WLMi */ +@@ -607,7 +607,7 @@ static const struct ich_laptop ich_lapto { 0x2653, 0x1043, 0x82D8 }, /* ICH6M on Asus Eee 701 */ + { 0x27df, 0x104d, 0x900e }, /* ICH7 on Sony TZ-90 */ /* end marker */ - { 0, } + { 0, 0, 0 } }; /** -@@ -1054,7 +1054,7 @@ static int piix_broken_suspend(void) +@@ -1073,7 +1073,7 @@ static int piix_broken_suspend(void) }, }, @@ -16592,10 +16487,10 @@ diff -urNp linux-2.6.29.6/drivers/ata/ata_piix.c linux-2.6.29.6/drivers/ata/ata_ }; static const char *oemstrs[] = { "Tecra M3,", -diff -urNp linux-2.6.29.6/drivers/ata/libata-core.c linux-2.6.29.6/drivers/ata/libata-core.c ---- linux-2.6.29.6/drivers/ata/libata-core.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ata/libata-core.c 2009-07-23 17:34:32.096707424 -0400 -@@ -889,7 +889,7 @@ static const struct ata_xfer_ent { +diff -urNp linux-2.6.30.4/drivers/ata/libata-core.c linux-2.6.30.4/drivers/ata/libata-core.c +--- linux-2.6.30.4/drivers/ata/libata-core.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ata/libata-core.c 2009-07-30 09:48:09.989999430 -0400 +@@ -890,7 +890,7 @@ static const struct ata_xfer_ent { { ATA_SHIFT_PIO, ATA_NR_PIO_MODES, XFER_PIO_0 }, { ATA_SHIFT_MWDMA, ATA_NR_MWDMA_MODES, XFER_MW_DMA_0 }, { ATA_SHIFT_UDMA, ATA_NR_UDMA_MODES, XFER_UDMA_0 }, @@ -16604,7 +16499,7 @@ diff -urNp linux-2.6.29.6/drivers/ata/libata-core.c linux-2.6.29.6/drivers/ata/l }; /** -@@ -3105,7 +3105,7 @@ static const struct ata_timing ata_timin +@@ -3129,7 +3129,7 @@ static const struct ata_timing ata_timin { XFER_UDMA_5, 0, 0, 0, 0, 0, 0, 0, 0, 20 }, { XFER_UDMA_6, 0, 0, 0, 0, 0, 0, 0, 0, 15 }, @@ -16613,7 +16508,7 @@ diff -urNp linux-2.6.29.6/drivers/ata/libata-core.c linux-2.6.29.6/drivers/ata/l }; #define ENOUGH(v, unit) (((v)-1)/(unit)+1) -@@ -4267,7 +4267,7 @@ static const struct ata_blacklist_entry +@@ -4293,7 +4293,7 @@ static const struct ata_blacklist_entry { "WD My Book", NULL, ATA_HORKAGE_1_5_GBPS, }, /* End Marker */ @@ -16622,9 +16517,9 @@ diff -urNp linux-2.6.29.6/drivers/ata/libata-core.c linux-2.6.29.6/drivers/ata/l }; static int strn_pattern_cmp(const char *patt, const char *name, int wildchar) -diff -urNp linux-2.6.29.6/drivers/atm/adummy.c linux-2.6.29.6/drivers/atm/adummy.c ---- linux-2.6.29.6/drivers/atm/adummy.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/adummy.c 2009-07-23 17:34:32.096707424 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/adummy.c linux-2.6.30.4/drivers/atm/adummy.c +--- linux-2.6.30.4/drivers/atm/adummy.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/adummy.c 2009-07-30 09:48:09.989999430 -0400 @@ -77,7 +77,7 @@ adummy_send(struct atm_vcc *vcc, struct vcc->pop(vcc, skb); else @@ -16634,9 +16529,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/adummy.c linux-2.6.29.6/drivers/atm/adummy return 0; } -diff -urNp linux-2.6.29.6/drivers/atm/ambassador.c linux-2.6.29.6/drivers/atm/ambassador.c ---- linux-2.6.29.6/drivers/atm/ambassador.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/ambassador.c 2009-07-23 17:34:32.096707424 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/ambassador.c linux-2.6.30.4/drivers/atm/ambassador.c +--- linux-2.6.30.4/drivers/atm/ambassador.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/ambassador.c 2009-07-30 09:48:09.990535817 -0400 @@ -453,7 +453,7 @@ static void tx_complete (amb_dev * dev, PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx); @@ -16673,9 +16568,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/ambassador.c linux-2.6.29.6/drivers/atm/am return -ENOMEM; // ? } -diff -urNp linux-2.6.29.6/drivers/atm/atmtcp.c linux-2.6.29.6/drivers/atm/atmtcp.c ---- linux-2.6.29.6/drivers/atm/atmtcp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/atmtcp.c 2009-07-23 17:34:32.097932924 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/atmtcp.c linux-2.6.30.4/drivers/atm/atmtcp.c +--- linux-2.6.30.4/drivers/atm/atmtcp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/atmtcp.c 2009-07-30 09:48:09.991629377 -0400 @@ -206,7 +206,7 @@ static int atmtcp_v_send(struct atm_vcc if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); @@ -16725,9 +16620,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/atmtcp.c linux-2.6.29.6/drivers/atm/atmtcp done: if (vcc->pop) vcc->pop(vcc,skb); else dev_kfree_skb(skb); -diff -urNp linux-2.6.29.6/drivers/atm/eni.c linux-2.6.29.6/drivers/atm/eni.c ---- linux-2.6.29.6/drivers/atm/eni.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/eni.c 2009-07-23 17:34:32.097932924 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/eni.c linux-2.6.30.4/drivers/atm/eni.c +--- linux-2.6.30.4/drivers/atm/eni.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/eni.c 2009-07-30 09:48:09.991629377 -0400 @@ -525,7 +525,7 @@ static int rx_aal0(struct atm_vcc *vcc) DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n", vcc->dev->number); @@ -16773,9 +16668,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/eni.c linux-2.6.29.6/drivers/atm/eni.c wake_up(&eni_dev->tx_wait); dma_complete++; } -diff -urNp linux-2.6.29.6/drivers/atm/firestream.c linux-2.6.29.6/drivers/atm/firestream.c ---- linux-2.6.29.6/drivers/atm/firestream.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/firestream.c 2009-07-23 17:34:32.098993493 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/firestream.c linux-2.6.30.4/drivers/atm/firestream.c +--- linux-2.6.30.4/drivers/atm/firestream.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/firestream.c 2009-07-30 09:48:09.992530374 -0400 @@ -748,7 +748,7 @@ static void process_txdone_queue (struct } } @@ -16809,9 +16704,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/firestream.c linux-2.6.29.6/drivers/atm/fi break; default: /* Hmm. Haven't written the code to handle the others yet... -- REW */ printk (KERN_WARNING "Don't know what to do with RX status %x: %s.\n", -diff -urNp linux-2.6.29.6/drivers/atm/fore200e.c linux-2.6.29.6/drivers/atm/fore200e.c ---- linux-2.6.29.6/drivers/atm/fore200e.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/fore200e.c 2009-07-23 17:34:32.099818881 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/fore200e.c linux-2.6.30.4/drivers/atm/fore200e.c +--- linux-2.6.30.4/drivers/atm/fore200e.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/fore200e.c 2009-07-30 09:48:09.993922247 -0400 @@ -931,9 +931,9 @@ fore200e_tx_irq(struct fore200e* fore200 #endif /* check error condition */ @@ -16868,9 +16763,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/fore200e.c linux-2.6.29.6/drivers/atm/fore fore200e->tx_sat++; DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n", -diff -urNp linux-2.6.29.6/drivers/atm/he.c linux-2.6.29.6/drivers/atm/he.c ---- linux-2.6.29.6/drivers/atm/he.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/he.c 2009-07-23 18:42:59.306868260 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/he.c linux-2.6.30.4/drivers/atm/he.c +--- linux-2.6.30.4/drivers/atm/he.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/he.c 2009-07-30 09:48:09.994421569 -0400 @@ -1728,7 +1728,7 @@ he_service_rbrq(struct he_dev *he_dev, i if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) { @@ -16952,9 +16847,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/he.c linux-2.6.29.6/drivers/atm/he.c return 0; } -diff -urNp linux-2.6.29.6/drivers/atm/horizon.c linux-2.6.29.6/drivers/atm/horizon.c ---- linux-2.6.29.6/drivers/atm/horizon.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/horizon.c 2009-07-23 17:34:32.100806142 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/horizon.c linux-2.6.30.4/drivers/atm/horizon.c +--- linux-2.6.30.4/drivers/atm/horizon.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/horizon.c 2009-07-30 09:48:09.994421569 -0400 @@ -1033,7 +1033,7 @@ static void rx_schedule (hrz_dev * dev, { struct atm_vcc * vcc = ATM_SKB(skb)->vcc; @@ -16973,9 +16868,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/horizon.c linux-2.6.29.6/drivers/atm/horiz // free the skb hrz_kfree_skb (skb); -diff -urNp linux-2.6.29.6/drivers/atm/idt77252.c linux-2.6.29.6/drivers/atm/idt77252.c ---- linux-2.6.29.6/drivers/atm/idt77252.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/idt77252.c 2009-07-23 17:34:32.101982733 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/idt77252.c linux-2.6.30.4/drivers/atm/idt77252.c +--- linux-2.6.30.4/drivers/atm/idt77252.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/idt77252.c 2009-07-30 09:48:09.995868107 -0400 @@ -810,7 +810,7 @@ drain_scq(struct idt77252_dev *card, str else dev_kfree_skb(skb); @@ -17130,10 +17025,10 @@ diff -urNp linux-2.6.29.6/drivers/atm/idt77252.c linux-2.6.29.6/drivers/atm/idt7 return -ENOMEM; } atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc); -diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase.c ---- linux-2.6.29.6/drivers/atm/iphase.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/iphase.c 2009-07-23 17:34:32.102777929 -0400 -@@ -1125,7 +1125,7 @@ static int rx_pkt(struct atm_dev *dev) +diff -urNp linux-2.6.30.4/drivers/atm/iphase.c linux-2.6.30.4/drivers/atm/iphase.c +--- linux-2.6.30.4/drivers/atm/iphase.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/iphase.c 2009-07-30 09:48:09.996522301 -0400 +@@ -1123,7 +1123,7 @@ static int rx_pkt(struct atm_dev *dev) status = (u_short) (buf_desc_ptr->desc_mode); if (status & (RX_CER | RX_PTE | RX_OFL)) { @@ -17142,7 +17037,7 @@ diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase IF_ERR(printk("IA: bad packet, dropping it");) if (status & RX_CER) { IF_ERR(printk(" cause: packet CRC error\n");) -@@ -1148,7 +1148,7 @@ static int rx_pkt(struct atm_dev *dev) +@@ -1146,7 +1146,7 @@ static int rx_pkt(struct atm_dev *dev) len = dma_addr - buf_addr; if (len > iadev->rx_buf_sz) { printk("Over %d bytes sdu received, dropped!!!\n", iadev->rx_buf_sz); @@ -17151,7 +17046,7 @@ diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase goto out_free_desc; } -@@ -1298,7 +1298,7 @@ static void rx_dle_intr(struct atm_dev * +@@ -1296,7 +1296,7 @@ static void rx_dle_intr(struct atm_dev * ia_vcc = INPH_IA_VCC(vcc); if (ia_vcc == NULL) { @@ -17160,7 +17055,7 @@ diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase dev_kfree_skb_any(skb); atm_return(vcc, atm_guess_pdu2truesize(len)); goto INCR_DLE; -@@ -1310,7 +1310,7 @@ static void rx_dle_intr(struct atm_dev * +@@ -1308,7 +1308,7 @@ static void rx_dle_intr(struct atm_dev * if ((length > iadev->rx_buf_sz) || (length > (skb->len - sizeof(struct cpcs_trailer)))) { @@ -17169,7 +17064,7 @@ diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase IF_ERR(printk("rx_dle_intr: Bad AAL5 trailer %d (skb len %d)", length, skb->len);) dev_kfree_skb_any(skb); -@@ -1326,7 +1326,7 @@ static void rx_dle_intr(struct atm_dev * +@@ -1324,7 +1324,7 @@ static void rx_dle_intr(struct atm_dev * IF_RX(printk("rx_dle_intr: skb push");) vcc->push(vcc,skb); @@ -17178,7 +17073,7 @@ diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase iadev->rx_pkt_cnt++; } INCR_DLE: -@@ -2921,7 +2921,7 @@ static int ia_pkt_tx (struct atm_vcc *vc +@@ -2919,7 +2919,7 @@ static int ia_pkt_tx (struct atm_vcc *vc if ((desc == 0) || (desc > iadev->num_tx_desc)) { IF_ERR(printk(DEV_LABEL "invalid desc for send: %d\n", desc);) @@ -17187,7 +17082,7 @@ diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase if (vcc->pop) vcc->pop(vcc, skb); else -@@ -3026,7 +3026,7 @@ static int ia_pkt_tx (struct atm_vcc *vc +@@ -3024,7 +3024,7 @@ static int ia_pkt_tx (struct atm_vcc *vc ATM_DESC(skb) = vcc->vci; skb_queue_tail(&iadev->tx_dma_q, skb); @@ -17196,9 +17091,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/iphase.c linux-2.6.29.6/drivers/atm/iphase iadev->tx_pkt_cnt++; /* Increment transaction counter */ writel(2, iadev->dma+IPHASE5575_TX_COUNTER); -diff -urNp linux-2.6.29.6/drivers/atm/lanai.c linux-2.6.29.6/drivers/atm/lanai.c ---- linux-2.6.29.6/drivers/atm/lanai.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/lanai.c 2009-07-23 17:34:32.103950524 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/lanai.c linux-2.6.30.4/drivers/atm/lanai.c +--- linux-2.6.30.4/drivers/atm/lanai.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/lanai.c 2009-07-30 09:48:09.997872955 -0400 @@ -1305,7 +1305,7 @@ static void lanai_send_one_aal5(struct l vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0); lanai_endtx(lanai, lvcc); @@ -17253,9 +17148,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/lanai.c linux-2.6.29.6/drivers/atm/lanai.c lvcc->stats.x.aal5.service_rxcrc++; lvcc->rx.buf.ptr = &lvcc->rx.buf.start[SERVICE_GET_END(s) * 4]; cardvcc_write(lvcc, SERVICE_GET_END(s), vcc_rxreadptr); -diff -urNp linux-2.6.29.6/drivers/atm/nicstar.c linux-2.6.29.6/drivers/atm/nicstar.c ---- linux-2.6.29.6/drivers/atm/nicstar.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/nicstar.c 2009-07-23 17:34:32.104830194 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/nicstar.c linux-2.6.30.4/drivers/atm/nicstar.c +--- linux-2.6.30.4/drivers/atm/nicstar.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/nicstar.c 2009-07-30 09:48:09.998576713 -0400 @@ -1723,7 +1723,7 @@ static int ns_send(struct atm_vcc *vcc, if ((vc = (vc_map *) vcc->dev_data) == NULL) { @@ -17458,10 +17353,10 @@ diff -urNp linux-2.6.29.6/drivers/atm/nicstar.c linux-2.6.29.6/drivers/atm/nicst } } -diff -urNp linux-2.6.29.6/drivers/atm/solos-pci.c linux-2.6.29.6/drivers/atm/solos-pci.c ---- linux-2.6.29.6/drivers/atm/solos-pci.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/solos-pci.c 2009-07-23 17:34:32.104830194 -0400 -@@ -261,7 +261,7 @@ void solos_bh(unsigned long card_arg) +diff -urNp linux-2.6.30.4/drivers/atm/solos-pci.c linux-2.6.30.4/drivers/atm/solos-pci.c +--- linux-2.6.30.4/drivers/atm/solos-pci.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/solos-pci.c 2009-07-30 09:48:09.998576713 -0400 +@@ -663,7 +663,7 @@ void solos_bh(unsigned long card_arg) } atm_charge(vcc, skb->truesize); vcc->push(vcc, skb); @@ -17469,31 +17364,19 @@ diff -urNp linux-2.6.29.6/drivers/atm/solos-pci.c linux-2.6.29.6/drivers/atm/sol + atomic_inc_unchecked(&vcc->stats->rx); break; - case PKT_COMMAND: -@@ -487,7 +487,7 @@ static int fpga_tx(struct solos_card *ca - vcc = *(void **)skb->cb; + case PKT_STATUS: +@@ -966,7 +966,7 @@ static uint32_t fpga_tx(struct solos_car + vcc = SKB_CB(oldskb)->vcc; if (vcc) { - atomic_inc(&vcc->stats->tx); + atomic_inc_unchecked(&vcc->stats->tx); - solos_pop(vcc, skb); + solos_pop(vcc, oldskb); } else - dev_kfree_skb_irq(skb); -@@ -517,9 +517,9 @@ static int psend(struct atm_vcc *vcc, st - memcpy(skb2->data, skb->data, skb->len); - skb_put(skb2, skb->len); - vcc->push(vcc, skb2); -- atomic_inc(&vcc->stats->rx); -+ atomic_inc_unchecked(&vcc->stats->rx); - } -- atomic_inc(&vcc->stats->tx); -+ atomic_inc_unchecked(&vcc->stats->tx); - solos_pop(vcc, skb); - return 0; - } -diff -urNp linux-2.6.29.6/drivers/atm/suni.c linux-2.6.29.6/drivers/atm/suni.c ---- linux-2.6.29.6/drivers/atm/suni.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/suni.c 2009-07-23 17:34:32.104830194 -0400 + dev_kfree_skb_irq(oldskb); +diff -urNp linux-2.6.30.4/drivers/atm/suni.c linux-2.6.30.4/drivers/atm/suni.c +--- linux-2.6.30.4/drivers/atm/suni.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/suni.c 2009-07-30 09:48:09.998576713 -0400 @@ -49,7 +49,7 @@ static DEFINE_SPINLOCK(sunis_lock); @@ -17503,9 +17386,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/suni.c linux-2.6.29.6/drivers/atm/suni.c if (atomic_read(&stats->s) < 0) atomic_set(&stats->s,INT_MAX); -diff -urNp linux-2.6.29.6/drivers/atm/uPD98402.c linux-2.6.29.6/drivers/atm/uPD98402.c ---- linux-2.6.29.6/drivers/atm/uPD98402.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/uPD98402.c 2009-07-23 17:34:32.105906562 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/uPD98402.c linux-2.6.30.4/drivers/atm/uPD98402.c +--- linux-2.6.30.4/drivers/atm/uPD98402.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/uPD98402.c 2009-07-30 09:48:09.999830275 -0400 @@ -41,7 +41,7 @@ static int fetch_stats(struct atm_dev *d struct sonet_stats tmp; int error = 0; @@ -17533,9 +17416,9 @@ diff -urNp linux-2.6.29.6/drivers/atm/uPD98402.c linux-2.6.29.6/drivers/atm/uPD9 &PRIV(dev)->sonet_stats.uncorr_hcs); } if ((reason & uPD98402_INT_RFO) && -diff -urNp linux-2.6.29.6/drivers/atm/zatm.c linux-2.6.29.6/drivers/atm/zatm.c ---- linux-2.6.29.6/drivers/atm/zatm.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/atm/zatm.c 2009-07-23 17:34:32.105906562 -0400 +diff -urNp linux-2.6.30.4/drivers/atm/zatm.c linux-2.6.30.4/drivers/atm/zatm.c +--- linux-2.6.30.4/drivers/atm/zatm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/atm/zatm.c 2009-07-30 09:48:09.999830275 -0400 @@ -458,7 +458,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy } if (!size) { @@ -17563,10 +17446,10 @@ diff -urNp linux-2.6.29.6/drivers/atm/zatm.c linux-2.6.29.6/drivers/atm/zatm.c wake_up(&zatm_vcc->tx_wait); } -diff -urNp linux-2.6.29.6/drivers/block/cciss.c linux-2.6.29.6/drivers/block/cciss.c ---- linux-2.6.29.6/drivers/block/cciss.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/block/cciss.c 2009-07-23 18:40:27.585424777 -0400 -@@ -348,7 +348,7 @@ static void cciss_seq_stop(struct seq_fi +diff -urNp linux-2.6.30.4/drivers/block/cciss.c linux-2.6.30.4/drivers/block/cciss.c +--- linux-2.6.30.4/drivers/block/cciss.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/block/cciss.c 2009-07-30 09:48:10.000592968 -0400 +@@ -351,7 +351,7 @@ static void cciss_seq_stop(struct seq_fi h->busy_configuring = 0; } @@ -17575,7 +17458,7 @@ diff -urNp linux-2.6.29.6/drivers/block/cciss.c linux-2.6.29.6/drivers/block/cci .start = cciss_seq_start, .show = cciss_seq_show, .next = cciss_seq_next, -@@ -411,7 +411,7 @@ out: +@@ -414,7 +414,7 @@ out: return err; } @@ -17584,9 +17467,9 @@ diff -urNp linux-2.6.29.6/drivers/block/cciss.c linux-2.6.29.6/drivers/block/cci .owner = THIS_MODULE, .open = cciss_seq_open, .read = seq_read, -diff -urNp linux-2.6.29.6/drivers/char/agp/alpha-agp.c linux-2.6.29.6/drivers/char/agp/alpha-agp.c ---- linux-2.6.29.6/drivers/char/agp/alpha-agp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/agp/alpha-agp.c 2009-07-23 18:40:27.599275730 -0400 +diff -urNp linux-2.6.30.4/drivers/char/agp/alpha-agp.c linux-2.6.30.4/drivers/char/agp/alpha-agp.c +--- linux-2.6.30.4/drivers/char/agp/alpha-agp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/agp/alpha-agp.c 2009-07-30 09:48:10.000592968 -0400 @@ -40,7 +40,7 @@ static struct aper_size_info_fixed alpha { 0, 0, 0 }, /* filled in by alpha_core_agp_setup */ }; @@ -17596,9 +17479,9 @@ diff -urNp linux-2.6.29.6/drivers/char/agp/alpha-agp.c linux-2.6.29.6/drivers/ch .fault = alpha_core_agp_vm_fault, }; -diff -urNp linux-2.6.29.6/drivers/char/agp/frontend.c linux-2.6.29.6/drivers/char/agp/frontend.c ---- linux-2.6.29.6/drivers/char/agp/frontend.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/agp/frontend.c 2009-07-23 17:34:32.106888179 -0400 +diff -urNp linux-2.6.30.4/drivers/char/agp/frontend.c linux-2.6.30.4/drivers/char/agp/frontend.c +--- linux-2.6.30.4/drivers/char/agp/frontend.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/agp/frontend.c 2009-07-30 09:48:10.001783459 -0400 @@ -824,7 +824,7 @@ static int agpioc_reserve_wrap(struct ag if (copy_from_user(&reserve, arg, sizeof(struct agp_region))) return -EFAULT; @@ -17608,10 +17491,10 @@ diff -urNp linux-2.6.29.6/drivers/char/agp/frontend.c linux-2.6.29.6/drivers/cha return -EFAULT; client = agp_find_client_by_pid(reserve.pid); -diff -urNp linux-2.6.29.6/drivers/char/agp/intel-agp.c linux-2.6.29.6/drivers/char/agp/intel-agp.c ---- linux-2.6.29.6/drivers/char/agp/intel-agp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/agp/intel-agp.c 2009-07-23 17:34:32.106888179 -0400 -@@ -2369,7 +2369,7 @@ static struct pci_device_id agp_intel_pc +diff -urNp linux-2.6.30.4/drivers/char/agp/intel-agp.c linux-2.6.30.4/drivers/char/agp/intel-agp.c +--- linux-2.6.30.4/drivers/char/agp/intel-agp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/agp/intel-agp.c 2009-07-30 09:48:10.002661044 -0400 +@@ -2387,7 +2387,7 @@ static struct pci_device_id agp_intel_pc ID(PCI_DEVICE_ID_INTEL_Q45_HB), ID(PCI_DEVICE_ID_INTEL_G45_HB), ID(PCI_DEVICE_ID_INTEL_G41_HB), @@ -17620,9 +17503,9 @@ diff -urNp linux-2.6.29.6/drivers/char/agp/intel-agp.c linux-2.6.29.6/drivers/ch }; MODULE_DEVICE_TABLE(pci, agp_intel_pci_table); -diff -urNp linux-2.6.29.6/drivers/char/apm-emulation.c linux-2.6.29.6/drivers/char/apm-emulation.c ---- linux-2.6.29.6/drivers/char/apm-emulation.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/apm-emulation.c 2009-07-23 18:40:27.609518419 -0400 +diff -urNp linux-2.6.30.4/drivers/char/apm-emulation.c linux-2.6.30.4/drivers/char/apm-emulation.c +--- linux-2.6.30.4/drivers/char/apm-emulation.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/apm-emulation.c 2009-07-30 09:48:10.002661044 -0400 @@ -393,7 +393,7 @@ static int apm_open(struct inode * inode return as ? 0 : -ENOMEM; } @@ -17632,9 +17515,9 @@ diff -urNp linux-2.6.29.6/drivers/char/apm-emulation.c linux-2.6.29.6/drivers/ch .owner = THIS_MODULE, .read = apm_read, .poll = apm_poll, -diff -urNp linux-2.6.29.6/drivers/char/bfin-otp.c linux-2.6.29.6/drivers/char/bfin-otp.c ---- linux-2.6.29.6/drivers/char/bfin-otp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/bfin-otp.c 2009-07-23 18:40:27.623278888 -0400 +diff -urNp linux-2.6.30.4/drivers/char/bfin-otp.c linux-2.6.30.4/drivers/char/bfin-otp.c +--- linux-2.6.30.4/drivers/char/bfin-otp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/bfin-otp.c 2009-07-30 09:48:10.003480690 -0400 @@ -133,7 +133,7 @@ static ssize_t bfin_otp_write(struct fil # define bfin_otp_write NULL #endif @@ -17644,10 +17527,10 @@ diff -urNp linux-2.6.29.6/drivers/char/bfin-otp.c linux-2.6.29.6/drivers/char/bf .owner = THIS_MODULE, .read = bfin_otp_read, .write = bfin_otp_write, -diff -urNp linux-2.6.29.6/drivers/char/hpet.c linux-2.6.29.6/drivers/char/hpet.c ---- linux-2.6.29.6/drivers/char/hpet.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/hpet.c 2009-07-23 17:34:32.107872457 -0400 -@@ -975,7 +975,7 @@ static struct acpi_driver hpet_acpi_driv +diff -urNp linux-2.6.30.4/drivers/char/hpet.c linux-2.6.30.4/drivers/char/hpet.c +--- linux-2.6.30.4/drivers/char/hpet.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/hpet.c 2009-07-30 09:48:10.003480690 -0400 +@@ -995,7 +995,7 @@ static struct acpi_driver hpet_acpi_driv }, }; @@ -17656,10 +17539,10 @@ diff -urNp linux-2.6.29.6/drivers/char/hpet.c linux-2.6.29.6/drivers/char/hpet.c static int __init hpet_init(void) { -diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c ---- linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c 2009-07-23 17:34:32.108842847 -0400 -@@ -408,7 +408,7 @@ struct ipmi_smi { +diff -urNp linux-2.6.30.4/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.30.4/drivers/char/ipmi/ipmi_msghandler.c +--- linux-2.6.30.4/drivers/char/ipmi/ipmi_msghandler.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/ipmi/ipmi_msghandler.c 2009-07-30 09:48:10.004509700 -0400 +@@ -413,7 +413,7 @@ struct ipmi_smi { struct proc_dir_entry *proc_dir; char proc_dir_name[10]; @@ -17668,7 +17551,7 @@ diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.29.6/dri /* * run_to_completion duplicate of smb_info, smi_info -@@ -441,7 +441,7 @@ static DEFINE_MUTEX(smi_watchers_mutex); +@@ -446,7 +446,7 @@ static DEFINE_MUTEX(smi_watchers_mutex); #define ipmi_inc_stat(intf, stat) \ @@ -17677,10 +17560,10 @@ diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_msghandler.c linux-2.6.29.6/dri #define ipmi_get_stat(intf, stat) \ ((unsigned int) atomic_read(&(intf)->stats[IPMI_STAT_ ## stat])) -diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c ---- linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c 2009-07-23 17:34:37.458887026 -0400 -@@ -280,7 +280,7 @@ struct smi_info { +diff -urNp linux-2.6.30.4/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.30.4/drivers/char/ipmi/ipmi_si_intf.c +--- linux-2.6.30.4/drivers/char/ipmi/ipmi_si_intf.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/ipmi/ipmi_si_intf.c 2009-07-30 09:48:10.005414644 -0400 +@@ -277,7 +277,7 @@ struct smi_info { unsigned char slave_addr; /* Counters and things for the proc filesystem. */ @@ -17689,7 +17572,7 @@ diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.29.6/driver struct task_struct *thread; -@@ -288,7 +288,7 @@ struct smi_info { +@@ -285,7 +285,7 @@ struct smi_info { }; #define smi_inc_stat(smi, stat) \ @@ -17698,9 +17581,9 @@ diff -urNp linux-2.6.29.6/drivers/char/ipmi/ipmi_si_intf.c linux-2.6.29.6/driver #define smi_get_stat(smi, stat) \ ((unsigned int) atomic_read(&(smi)->stats[SI_STAT_ ## stat])) -diff -urNp linux-2.6.29.6/drivers/char/keyboard.c linux-2.6.29.6/drivers/char/keyboard.c ---- linux-2.6.29.6/drivers/char/keyboard.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/keyboard.c 2009-07-23 17:34:32.110802772 -0400 +diff -urNp linux-2.6.30.4/drivers/char/keyboard.c linux-2.6.30.4/drivers/char/keyboard.c +--- linux-2.6.30.4/drivers/char/keyboard.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/keyboard.c 2009-07-30 11:10:48.982870250 -0400 @@ -635,6 +635,16 @@ static void k_spec(struct vc_data *vc, u kbd->kbdmode == VC_MEDIUMRAW) && value != KVAL(K_SAK)) @@ -17727,9 +17610,9 @@ diff -urNp linux-2.6.29.6/drivers/char/keyboard.c linux-2.6.29.6/drivers/char/ke }; MODULE_DEVICE_TABLE(input, kbd_ids); -diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c ---- linux-2.6.29.6/drivers/char/mem.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/mem.c 2009-07-23 19:28:45.822497906 -0400 +diff -urNp linux-2.6.30.4/drivers/char/mem.c linux-2.6.30.4/drivers/char/mem.c +--- linux-2.6.30.4/drivers/char/mem.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/mem.c 2009-07-30 12:07:09.578070399 -0400 @@ -18,6 +18,7 @@ #include <linux/raw.h> #include <linux/tty.h> @@ -17761,16 +17644,16 @@ diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c written = 0; #ifdef __ARCH_HAS_NO_PAGE_ZERO_MAPPED -@@ -325,7 +335,7 @@ static void mmap_mem_close(struct vm_are - vma->vm_page_prot); +@@ -301,7 +311,7 @@ static inline int private_mapping_ok(str } + #endif -static struct vm_operations_struct mmap_mem_ops = { +static const struct vm_operations_struct mmap_mem_ops = { - .open = mmap_mem_open, - .close = mmap_mem_close, #ifdef CONFIG_HAVE_IOREMAP_PROT -@@ -350,6 +360,11 @@ static int mmap_mem(struct file * file, + .access = generic_access_phys + #endif +@@ -324,6 +334,11 @@ static int mmap_mem(struct file * file, &vma->vm_page_prot)) return -EINVAL; @@ -17782,7 +17665,7 @@ diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c vma->vm_page_prot = phys_mem_access_prot(file, vma->vm_pgoff, size, vma->vm_page_prot); -@@ -585,6 +600,11 @@ static ssize_t write_kmem(struct file * +@@ -558,6 +573,11 @@ static ssize_t write_kmem(struct file * ssize_t written; char * kbuf; /* k-addr because vwrite() takes vmlist_lock rwlock */ @@ -17794,7 +17677,7 @@ diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c if (p < (unsigned long) high_memory) { wrote = count; -@@ -788,6 +808,16 @@ static loff_t memory_lseek(struct file * +@@ -764,6 +784,16 @@ static loff_t memory_lseek(struct file * static int open_port(struct inode * inode, struct file * filp) { @@ -17811,7 +17694,7 @@ diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; } -@@ -795,7 +825,6 @@ static int open_port(struct inode * inod +@@ -771,7 +801,6 @@ static int open_port(struct inode * inod #define full_lseek null_lseek #define write_zero write_null #define read_full read_zero @@ -17819,7 +17702,7 @@ diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c #define open_kmem open_mem #define open_oldmem open_mem -@@ -935,6 +964,11 @@ static int memory_open(struct inode * in +@@ -911,6 +940,11 @@ static int memory_open(struct inode * in filp->f_op = &oldmem_fops; break; #endif @@ -17831,7 +17714,7 @@ diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c default: unlock_kernel(); return -ENXIO; -@@ -971,6 +1005,9 @@ static const struct { +@@ -947,6 +981,9 @@ static const struct { #ifdef CONFIG_CRASH_DUMP {12,"oldmem", S_IRUSR | S_IWUSR | S_IRGRP, &oldmem_fops}, #endif @@ -17841,9 +17724,9 @@ diff -urNp linux-2.6.29.6/drivers/char/mem.c linux-2.6.29.6/drivers/char/mem.c }; static struct class *mem_class; -diff -urNp linux-2.6.29.6/drivers/char/misc.c linux-2.6.29.6/drivers/char/misc.c ---- linux-2.6.29.6/drivers/char/misc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/misc.c 2009-07-23 18:40:27.623278888 -0400 +diff -urNp linux-2.6.30.4/drivers/char/misc.c linux-2.6.30.4/drivers/char/misc.c +--- linux-2.6.30.4/drivers/char/misc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/misc.c 2009-07-30 09:48:10.006662764 -0400 @@ -91,7 +91,7 @@ static int misc_seq_show(struct seq_file } @@ -17853,9 +17736,9 @@ diff -urNp linux-2.6.29.6/drivers/char/misc.c linux-2.6.29.6/drivers/char/misc.c .start = misc_seq_start, .next = misc_seq_next, .stop = misc_seq_stop, -diff -urNp linux-2.6.29.6/drivers/char/mspec.c linux-2.6.29.6/drivers/char/mspec.c ---- linux-2.6.29.6/drivers/char/mspec.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/mspec.c 2009-07-23 18:40:27.630131161 -0400 +diff -urNp linux-2.6.30.4/drivers/char/mspec.c linux-2.6.30.4/drivers/char/mspec.c +--- linux-2.6.30.4/drivers/char/mspec.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/mspec.c 2009-07-30 09:48:10.006662764 -0400 @@ -239,7 +239,7 @@ mspec_fault(struct vm_area_struct *vma, return VM_FAULT_NOPAGE; } @@ -17865,9 +17748,9 @@ diff -urNp linux-2.6.29.6/drivers/char/mspec.c linux-2.6.29.6/drivers/char/mspec .open = mspec_open, .close = mspec_close, .fault = mspec_fault, -diff -urNp linux-2.6.29.6/drivers/char/nvram.c linux-2.6.29.6/drivers/char/nvram.c ---- linux-2.6.29.6/drivers/char/nvram.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/nvram.c 2009-07-23 17:34:32.110802772 -0400 +diff -urNp linux-2.6.30.4/drivers/char/nvram.c linux-2.6.30.4/drivers/char/nvram.c +--- linux-2.6.30.4/drivers/char/nvram.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/nvram.c 2009-07-30 09:48:10.006662764 -0400 @@ -429,7 +429,10 @@ static const struct file_operations nvra static struct miscdevice nvram_dev = { NVRAM_MINOR, @@ -17880,10 +17763,10 @@ diff -urNp linux-2.6.29.6/drivers/char/nvram.c linux-2.6.29.6/drivers/char/nvram }; static int __init nvram_init(void) -diff -urNp linux-2.6.29.6/drivers/char/random.c linux-2.6.29.6/drivers/char/random.c ---- linux-2.6.29.6/drivers/char/random.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/random.c 2009-07-23 17:34:32.111778535 -0400 -@@ -249,8 +249,13 @@ +diff -urNp linux-2.6.30.4/drivers/char/random.c linux-2.6.30.4/drivers/char/random.c +--- linux-2.6.30.4/drivers/char/random.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/random.c 2009-07-30 11:10:48.992521357 -0400 +@@ -253,8 +253,13 @@ /* * Configuration information */ @@ -17897,7 +17780,7 @@ diff -urNp linux-2.6.29.6/drivers/char/random.c linux-2.6.29.6/drivers/char/rand #define SEC_XFER_SIZE 512 /* -@@ -287,10 +292,17 @@ static struct poolinfo { +@@ -291,10 +296,17 @@ static struct poolinfo { int poolwords; int tap1, tap2, tap3, tap4, tap5; } poolinfo_table[] = { @@ -17915,7 +17798,7 @@ diff -urNp linux-2.6.29.6/drivers/char/random.c linux-2.6.29.6/drivers/char/rand #if 0 /* x^2048 + x^1638 + x^1231 + x^819 + x^411 + x + 1 -- 115 */ { 2048, 1638, 1231, 819, 411, 1 }, -@@ -1200,7 +1212,7 @@ EXPORT_SYMBOL(generate_random_uuid); +@@ -1204,7 +1216,7 @@ EXPORT_SYMBOL(generate_random_uuid); #include <linux/sysctl.h> static int min_read_thresh = 8, min_write_thresh; @@ -17924,9 +17807,9 @@ diff -urNp linux-2.6.29.6/drivers/char/random.c linux-2.6.29.6/drivers/char/rand static int max_write_thresh = INPUT_POOL_WORDS * 32; static char sysctl_bootid[16]; -diff -urNp linux-2.6.29.6/drivers/char/tpm/tpm_bios.c linux-2.6.29.6/drivers/char/tpm/tpm_bios.c ---- linux-2.6.29.6/drivers/char/tpm/tpm_bios.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/tpm/tpm_bios.c 2009-07-23 18:40:27.636145642 -0400 +diff -urNp linux-2.6.30.4/drivers/char/tpm/tpm_bios.c linux-2.6.30.4/drivers/char/tpm/tpm_bios.c +--- linux-2.6.30.4/drivers/char/tpm/tpm_bios.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/tpm/tpm_bios.c 2009-07-30 09:48:10.007651841 -0400 @@ -343,14 +343,14 @@ static int tpm_ascii_bios_measurements_s return 0; } @@ -17944,10 +17827,10 @@ diff -urNp linux-2.6.29.6/drivers/char/tpm/tpm_bios.c linux-2.6.29.6/drivers/cha .start = tpm_bios_measurements_start, .next = tpm_bios_measurements_next, .stop = tpm_bios_measurements_stop, -diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/tty_ldisc.c ---- linux-2.6.29.6/drivers/char/tty_ldisc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/tty_ldisc.c 2009-07-23 17:34:32.112769665 -0400 -@@ -74,7 +74,7 @@ int tty_register_ldisc(int disc, struct +diff -urNp linux-2.6.30.4/drivers/char/tty_ldisc.c linux-2.6.30.4/drivers/char/tty_ldisc.c +--- linux-2.6.30.4/drivers/char/tty_ldisc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/tty_ldisc.c 2009-07-30 09:48:10.008436205 -0400 +@@ -73,7 +73,7 @@ int tty_register_ldisc(int disc, struct spin_lock_irqsave(&tty_ldisc_lock, flags); tty_ldiscs[disc] = new_ldisc; new_ldisc->num = disc; @@ -17956,7 +17839,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t spin_unlock_irqrestore(&tty_ldisc_lock, flags); return ret; -@@ -102,7 +102,7 @@ int tty_unregister_ldisc(int disc) +@@ -101,7 +101,7 @@ int tty_unregister_ldisc(int disc) return -EINVAL; spin_lock_irqsave(&tty_ldisc_lock, flags); @@ -17965,7 +17848,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t ret = -EBUSY; else tty_ldiscs[disc] = NULL; -@@ -139,7 +139,7 @@ static int tty_ldisc_try_get(int disc, s +@@ -138,7 +138,7 @@ static int tty_ldisc_try_get(int disc, s err = -EAGAIN; else { /* lock it */ @@ -17974,7 +17857,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t ld->ops = ldops; err = 0; } -@@ -196,8 +196,8 @@ static void tty_ldisc_put(struct tty_ldi +@@ -195,8 +195,8 @@ static void tty_ldisc_put(struct tty_ldi spin_lock_irqsave(&tty_ldisc_lock, flags); ld = tty_ldiscs[disc]; @@ -17985,7 +17868,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t module_put(ld->owner); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -@@ -264,7 +264,7 @@ const struct file_operations tty_ldiscs_ +@@ -263,7 +263,7 @@ const struct file_operations tty_ldiscs_ static void tty_ldisc_assign(struct tty_struct *tty, struct tty_ldisc *ld) { @@ -17994,7 +17877,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t tty->ldisc = *ld; } -@@ -289,7 +289,7 @@ static int tty_ldisc_try(struct tty_stru +@@ -288,7 +288,7 @@ static int tty_ldisc_try(struct tty_stru spin_lock_irqsave(&tty_ldisc_lock, flags); ld = &tty->ldisc; if (test_bit(TTY_LDISC, &tty->flags)) { @@ -18003,7 +17886,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t ret = 1; } spin_unlock_irqrestore(&tty_ldisc_lock, flags); -@@ -316,7 +316,7 @@ struct tty_ldisc *tty_ldisc_ref_wait(str +@@ -315,7 +315,7 @@ struct tty_ldisc *tty_ldisc_ref_wait(str { /* wait_event is a macro */ wait_event(tty_ldisc_wait, tty_ldisc_try(tty)); @@ -18012,7 +17895,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t return &tty->ldisc; } -@@ -359,11 +359,9 @@ void tty_ldisc_deref(struct tty_ldisc *l +@@ -358,11 +358,9 @@ void tty_ldisc_deref(struct tty_ldisc *l BUG_ON(ld == NULL); spin_lock_irqsave(&tty_ldisc_lock, flags); @@ -18026,7 +17909,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t wake_up(&tty_ldisc_wait); spin_unlock_irqrestore(&tty_ldisc_lock, flags); } -@@ -507,8 +505,8 @@ restart: +@@ -506,8 +504,8 @@ restart: clear_bit(TTY_LDISC, &o_tty->flags); spin_lock_irqsave(&tty_ldisc_lock, flags); @@ -18037,7 +17920,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t /* Free the new ldisc we grabbed. Must drop the lock first. */ spin_unlock_irqrestore(&tty_ldisc_lock, flags); -@@ -520,14 +518,14 @@ restart: +@@ -519,14 +517,14 @@ restart: * and retries if we made tty_ldisc_wait() smarter. * That is up for discussion. */ @@ -18055,7 +17938,7 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t return -ERESTARTSYS; goto restart; } -@@ -670,9 +668,9 @@ void tty_ldisc_release(struct tty_struct +@@ -669,9 +667,9 @@ void tty_ldisc_release(struct tty_struct * side is zero. */ spin_lock_irqsave(&tty_ldisc_lock, flags); @@ -18067,9 +17950,9 @@ diff -urNp linux-2.6.29.6/drivers/char/tty_ldisc.c linux-2.6.29.6/drivers/char/t spin_lock_irqsave(&tty_ldisc_lock, flags); } spin_unlock_irqrestore(&tty_ldisc_lock, flags); -diff -urNp linux-2.6.29.6/drivers/char/vt_ioctl.c linux-2.6.29.6/drivers/char/vt_ioctl.c ---- linux-2.6.29.6/drivers/char/vt_ioctl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/vt_ioctl.c 2009-07-23 17:34:32.112769665 -0400 +diff -urNp linux-2.6.30.4/drivers/char/vt_ioctl.c linux-2.6.30.4/drivers/char/vt_ioctl.c +--- linux-2.6.30.4/drivers/char/vt_ioctl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/vt_ioctl.c 2009-07-30 11:10:49.002716445 -0400 @@ -96,6 +96,12 @@ do_kdsk_ioctl(int cmd, struct kbentry __ case KDSKBENT: if (!perm) @@ -18097,9 +17980,9 @@ diff -urNp linux-2.6.29.6/drivers/char/vt_ioctl.c linux-2.6.29.6/drivers/char/vt q = func_table[i]; first_free = funcbufptr + (funcbufsize - funcbufleft); for (j = i+1; j < MAX_NR_FUNC && !func_table[j]; j++) -diff -urNp linux-2.6.29.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.29.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c ---- linux-2.6.29.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-07-23 18:40:27.636398793 -0400 +diff -urNp linux-2.6.30.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.30.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c +--- linux-2.6.30.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/char/xilinx_hwicap/xilinx_hwicap.c 2009-07-30 09:48:10.008436205 -0400 @@ -559,7 +559,7 @@ static int hwicap_release(struct inode * return status; } @@ -18109,10 +17992,10 @@ diff -urNp linux-2.6.29.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c linux-2.6.2 .owner = THIS_MODULE, .write = hwicap_write, .read = hwicap_read, -diff -urNp linux-2.6.29.6/drivers/edac/edac_core.h linux-2.6.29.6/drivers/edac/edac_core.h ---- linux-2.6.29.6/drivers/edac/edac_core.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/edac/edac_core.h 2009-07-23 17:34:32.113723476 -0400 -@@ -85,11 +85,11 @@ extern int edac_debug_level; +diff -urNp linux-2.6.30.4/drivers/edac/edac_core.h linux-2.6.30.4/drivers/edac/edac_core.h +--- linux-2.6.30.4/drivers/edac/edac_core.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/edac/edac_core.h 2009-07-30 09:48:10.008436205 -0400 +@@ -98,11 +98,11 @@ extern int edac_debug_level; #else /* !CONFIG_EDAC_DEBUG */ @@ -18129,10 +18012,10 @@ diff -urNp linux-2.6.29.6/drivers/edac/edac_core.h linux-2.6.29.6/drivers/edac/e #endif /* !CONFIG_EDAC_DEBUG */ -diff -urNp linux-2.6.29.6/drivers/firmware/dmi_scan.c linux-2.6.29.6/drivers/firmware/dmi_scan.c ---- linux-2.6.29.6/drivers/firmware/dmi_scan.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/firmware/dmi_scan.c 2009-07-23 17:34:32.113723476 -0400 -@@ -389,11 +389,6 @@ void __init dmi_scan_machine(void) +diff -urNp linux-2.6.30.4/drivers/firmware/dmi_scan.c linux-2.6.30.4/drivers/firmware/dmi_scan.c +--- linux-2.6.30.4/drivers/firmware/dmi_scan.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/firmware/dmi_scan.c 2009-07-30 09:48:10.009412825 -0400 +@@ -391,11 +391,6 @@ void __init dmi_scan_machine(void) } } else { @@ -18144,10 +18027,10 @@ diff -urNp linux-2.6.29.6/drivers/firmware/dmi_scan.c linux-2.6.29.6/drivers/fir p = dmi_ioremap(0xF0000, 0x10000); if (p == NULL) goto error; -diff -urNp linux-2.6.29.6/drivers/gpio/gpiolib.c linux-2.6.29.6/drivers/gpio/gpiolib.c ---- linux-2.6.29.6/drivers/gpio/gpiolib.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/gpio/gpiolib.c 2009-07-23 18:40:27.648309826 -0400 -@@ -1235,7 +1235,7 @@ static int gpiolib_open(struct inode *in +diff -urNp linux-2.6.30.4/drivers/gpio/gpiolib.c linux-2.6.30.4/drivers/gpio/gpiolib.c +--- linux-2.6.30.4/drivers/gpio/gpiolib.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/gpio/gpiolib.c 2009-07-30 09:48:10.009412825 -0400 +@@ -1244,7 +1244,7 @@ static int gpiolib_open(struct inode *in return single_open(file, gpiolib_show, NULL); } @@ -18156,10 +18039,10 @@ diff -urNp linux-2.6.29.6/drivers/gpio/gpiolib.c linux-2.6.29.6/drivers/gpio/gpi .open = gpiolib_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_drv.c linux-2.6.29.6/drivers/gpu/drm/drm_drv.c ---- linux-2.6.29.6/drivers/gpu/drm/drm_drv.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/gpu/drm/drm_drv.c 2009-07-23 17:34:32.113723476 -0400 -@@ -461,7 +461,7 @@ int drm_ioctl(struct inode *inode, struc +diff -urNp linux-2.6.30.4/drivers/gpu/drm/drm_drv.c linux-2.6.30.4/drivers/gpu/drm/drm_drv.c +--- linux-2.6.30.4/drivers/gpu/drm/drm_drv.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/gpu/drm/drm_drv.c 2009-07-30 09:48:10.010417819 -0400 +@@ -425,7 +425,7 @@ int drm_ioctl(struct inode *inode, struc char *kdata = NULL; atomic_inc(&dev->ioctl_count); @@ -18168,9 +18051,9 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_drv.c linux-2.6.29.6/drivers/gpu/d ++file_priv->ioctl_count; DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n", -diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_fops.c linux-2.6.29.6/drivers/gpu/drm/drm_fops.c ---- linux-2.6.29.6/drivers/gpu/drm/drm_fops.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/gpu/drm/drm_fops.c 2009-07-23 17:34:32.113723476 -0400 +diff -urNp linux-2.6.30.4/drivers/gpu/drm/drm_fops.c linux-2.6.30.4/drivers/gpu/drm/drm_fops.c +--- linux-2.6.30.4/drivers/gpu/drm/drm_fops.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/gpu/drm/drm_fops.c 2009-07-30 09:48:10.010417819 -0400 @@ -130,9 +130,9 @@ int drm_open(struct inode *inode, struct retcode = drm_open_helper(inode, filp, dev); @@ -18183,7 +18066,7 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_fops.c linux-2.6.29.6/drivers/gpu/ spin_unlock(&dev->count_lock); retcode = drm_setup(dev); goto out; -@@ -436,7 +436,7 @@ int drm_release(struct inode *inode, str +@@ -433,7 +433,7 @@ int drm_release(struct inode *inode, str lock_kernel(); @@ -18192,7 +18075,7 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_fops.c linux-2.6.29.6/drivers/gpu/ if (dev->driver->preclose) dev->driver->preclose(dev, file_priv); -@@ -448,7 +448,7 @@ int drm_release(struct inode *inode, str +@@ -445,7 +445,7 @@ int drm_release(struct inode *inode, str DRM_DEBUG("pid = %d, device = 0x%lx, open_count = %d\n", task_pid_nr(current), (long)old_encode_dev(file_priv->minor->device), @@ -18201,7 +18084,7 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_fops.c linux-2.6.29.6/drivers/gpu/ /* if the master has gone away we can't do anything with the lock */ if (file_priv->minor->master) -@@ -525,9 +525,9 @@ int drm_release(struct inode *inode, str +@@ -522,9 +522,9 @@ int drm_release(struct inode *inode, str * End inline drm_release */ @@ -18213,9 +18096,9 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_fops.c linux-2.6.29.6/drivers/gpu/ if (atomic_read(&dev->ioctl_count)) { DRM_ERROR("Device busy: %d\n", atomic_read(&dev->ioctl_count)); -diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_lock.c linux-2.6.29.6/drivers/gpu/drm/drm_lock.c ---- linux-2.6.29.6/drivers/gpu/drm/drm_lock.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/gpu/drm/drm_lock.c 2009-07-23 17:34:32.114929924 -0400 +diff -urNp linux-2.6.30.4/drivers/gpu/drm/drm_lock.c linux-2.6.30.4/drivers/gpu/drm/drm_lock.c +--- linux-2.6.30.4/drivers/gpu/drm/drm_lock.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/gpu/drm/drm_lock.c 2009-07-30 09:48:10.010417819 -0400 @@ -87,7 +87,7 @@ int drm_lock(struct drm_device *dev, voi if (drm_lock_take(&master->lock, lock->context)) { master->lock.file_priv = file_priv; @@ -18234,10 +18117,10 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_lock.c linux-2.6.29.6/drivers/gpu/ /* kernel_context_switch isn't used by any of the x86 drm * modules but is required by the Sparc driver. -diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_vm.c linux-2.6.29.6/drivers/gpu/drm/drm_vm.c ---- linux-2.6.29.6/drivers/gpu/drm/drm_vm.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/gpu/drm/drm_vm.c 2009-07-23 18:40:27.661305427 -0400 -@@ -367,28 +367,28 @@ static int drm_vm_sg_fault(struct vm_are +diff -urNp linux-2.6.30.4/drivers/gpu/drm/drm_vm.c linux-2.6.30.4/drivers/gpu/drm/drm_vm.c +--- linux-2.6.30.4/drivers/gpu/drm/drm_vm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/gpu/drm/drm_vm.c 2009-07-30 09:48:10.011410038 -0400 +@@ -369,28 +369,28 @@ static int drm_vm_sg_fault(struct vm_are } /** AGP virtual memory operations */ @@ -18270,9 +18153,9 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/drm_vm.c linux-2.6.29.6/drivers/gpu/dr .fault = drm_vm_sg_fault, .open = drm_vm_open, .close = drm_vm_close, -diff -urNp linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c ---- linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c 2009-07-23 17:34:32.114929924 -0400 +diff -urNp linux-2.6.30.4/drivers/gpu/drm/i810/i810_dma.c linux-2.6.30.4/drivers/gpu/drm/i810/i810_dma.c +--- linux-2.6.30.4/drivers/gpu/drm/i810/i810_dma.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/gpu/drm/i810/i810_dma.c 2009-07-30 09:48:10.011410038 -0400 @@ -954,8 +954,8 @@ static int i810_dma_vertex(struct drm_de dma->buflist[vertex->idx], vertex->discard, vertex->used); @@ -18295,11 +18178,11 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/i810/i810_dma.c linux-2.6.29.6/drivers sarea_priv->last_enqueue = dev_priv->counter - 1; sarea_priv->last_dispatch = (int)hw_status[5]; -diff -urNp linux-2.6.29.6/drivers/gpu/drm/i915/i915_drv.c linux-2.6.29.6/drivers/gpu/drm/i915/i915_drv.c ---- linux-2.6.29.6/drivers/gpu/drm/i915/i915_drv.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/gpu/drm/i915/i915_drv.c 2009-07-23 18:40:27.674490572 -0400 -@@ -117,7 +117,7 @@ static int i915_resume(struct drm_device - return ret; +diff -urNp linux-2.6.30.4/drivers/gpu/drm/i915/i915_drv.c linux-2.6.30.4/drivers/gpu/drm/i915/i915_drv.c +--- linux-2.6.30.4/drivers/gpu/drm/i915/i915_drv.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/gpu/drm/i915/i915_drv.c 2009-07-30 12:07:09.579971370 -0400 +@@ -149,7 +149,7 @@ i915_pci_resume(struct pci_dev *pdev) + return i915_resume(dev); } -static struct vm_operations_struct i915_gem_vm_ops = { @@ -18307,10 +18190,10 @@ diff -urNp linux-2.6.29.6/drivers/gpu/drm/i915/i915_drv.c linux-2.6.29.6/drivers .fault = i915_gem_fault, .open = drm_gem_vm_open, .close = drm_gem_vm_close, -diff -urNp linux-2.6.29.6/drivers/hwmon/fschmd.c linux-2.6.29.6/drivers/hwmon/fschmd.c ---- linux-2.6.29.6/drivers/hwmon/fschmd.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/hwmon/fschmd.c 2009-07-23 18:40:27.674490572 -0400 -@@ -840,7 +840,7 @@ static int watchdog_ioctl(struct inode * +diff -urNp linux-2.6.30.4/drivers/hwmon/fschmd.c linux-2.6.30.4/drivers/hwmon/fschmd.c +--- linux-2.6.30.4/drivers/hwmon/fschmd.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/hwmon/fschmd.c 2009-07-30 09:48:10.011410038 -0400 +@@ -915,7 +915,7 @@ static int watchdog_ioctl(struct inode * return ret; } @@ -18319,9 +18202,9 @@ diff -urNp linux-2.6.29.6/drivers/hwmon/fschmd.c linux-2.6.29.6/drivers/hwmon/fs .owner = THIS_MODULE, .llseek = no_llseek, .open = watchdog_open, -diff -urNp linux-2.6.29.6/drivers/hwmon/fscpos.c linux-2.6.29.6/drivers/hwmon/fscpos.c ---- linux-2.6.29.6/drivers/hwmon/fscpos.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/hwmon/fscpos.c 2009-07-23 17:34:32.115850370 -0400 +diff -urNp linux-2.6.30.4/drivers/hwmon/fscpos.c linux-2.6.30.4/drivers/hwmon/fscpos.c +--- linux-2.6.30.4/drivers/hwmon/fscpos.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/hwmon/fscpos.c 2009-07-30 09:48:10.015465337 -0400 @@ -240,7 +240,6 @@ static ssize_t set_pwm(struct i2c_client unsigned long v = simple_strtoul(buf, NULL, 10); @@ -18330,9 +18213,9 @@ diff -urNp linux-2.6.29.6/drivers/hwmon/fscpos.c linux-2.6.29.6/drivers/hwmon/fs if (v > 255) v = 255; mutex_lock(&data->update_lock); -diff -urNp linux-2.6.29.6/drivers/hwmon/k8temp.c linux-2.6.29.6/drivers/hwmon/k8temp.c ---- linux-2.6.29.6/drivers/hwmon/k8temp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/hwmon/k8temp.c 2009-07-23 17:34:32.115850370 -0400 +diff -urNp linux-2.6.30.4/drivers/hwmon/k8temp.c linux-2.6.30.4/drivers/hwmon/k8temp.c +--- linux-2.6.30.4/drivers/hwmon/k8temp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/hwmon/k8temp.c 2009-07-30 09:48:10.016410845 -0400 @@ -138,7 +138,7 @@ static DEVICE_ATTR(name, S_IRUGO, show_n static struct pci_device_id k8temp_ids[] = { @@ -18342,9 +18225,9 @@ diff -urNp linux-2.6.29.6/drivers/hwmon/k8temp.c linux-2.6.29.6/drivers/hwmon/k8 }; MODULE_DEVICE_TABLE(pci, k8temp_ids); -diff -urNp linux-2.6.29.6/drivers/hwmon/sis5595.c linux-2.6.29.6/drivers/hwmon/sis5595.c ---- linux-2.6.29.6/drivers/hwmon/sis5595.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/hwmon/sis5595.c 2009-07-23 17:34:32.115850370 -0400 +diff -urNp linux-2.6.30.4/drivers/hwmon/sis5595.c linux-2.6.30.4/drivers/hwmon/sis5595.c +--- linux-2.6.30.4/drivers/hwmon/sis5595.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/hwmon/sis5595.c 2009-07-30 09:48:10.016410845 -0400 @@ -699,7 +699,7 @@ static struct sis5595_data *sis5595_upda static struct pci_device_id sis5595_pci_ids[] = { @@ -18354,9 +18237,9 @@ diff -urNp linux-2.6.29.6/drivers/hwmon/sis5595.c linux-2.6.29.6/drivers/hwmon/s }; MODULE_DEVICE_TABLE(pci, sis5595_pci_ids); -diff -urNp linux-2.6.29.6/drivers/hwmon/via686a.c linux-2.6.29.6/drivers/hwmon/via686a.c ---- linux-2.6.29.6/drivers/hwmon/via686a.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/hwmon/via686a.c 2009-07-23 17:34:32.116869808 -0400 +diff -urNp linux-2.6.30.4/drivers/hwmon/via686a.c linux-2.6.30.4/drivers/hwmon/via686a.c +--- linux-2.6.30.4/drivers/hwmon/via686a.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/hwmon/via686a.c 2009-07-30 09:48:10.016410845 -0400 @@ -769,7 +769,7 @@ static struct via686a_data *via686a_upda static struct pci_device_id via686a_pci_ids[] = { @@ -18366,9 +18249,9 @@ diff -urNp linux-2.6.29.6/drivers/hwmon/via686a.c linux-2.6.29.6/drivers/hwmon/v }; MODULE_DEVICE_TABLE(pci, via686a_pci_ids); -diff -urNp linux-2.6.29.6/drivers/hwmon/vt8231.c linux-2.6.29.6/drivers/hwmon/vt8231.c ---- linux-2.6.29.6/drivers/hwmon/vt8231.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/hwmon/vt8231.c 2009-07-23 17:34:32.116869808 -0400 +diff -urNp linux-2.6.30.4/drivers/hwmon/vt8231.c linux-2.6.30.4/drivers/hwmon/vt8231.c +--- linux-2.6.30.4/drivers/hwmon/vt8231.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/hwmon/vt8231.c 2009-07-30 09:48:10.017409539 -0400 @@ -699,7 +699,7 @@ static struct platform_driver vt8231_dri static struct pci_device_id vt8231_pci_ids[] = { @@ -18378,9 +18261,9 @@ diff -urNp linux-2.6.29.6/drivers/hwmon/vt8231.c linux-2.6.29.6/drivers/hwmon/vt }; MODULE_DEVICE_TABLE(pci, vt8231_pci_ids); -diff -urNp linux-2.6.29.6/drivers/hwmon/w83791d.c linux-2.6.29.6/drivers/hwmon/w83791d.c ---- linux-2.6.29.6/drivers/hwmon/w83791d.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/hwmon/w83791d.c 2009-07-23 17:34:32.117858467 -0400 +diff -urNp linux-2.6.30.4/drivers/hwmon/w83791d.c linux-2.6.30.4/drivers/hwmon/w83791d.c +--- linux-2.6.30.4/drivers/hwmon/w83791d.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/hwmon/w83791d.c 2009-07-30 09:48:10.017409539 -0400 @@ -330,8 +330,8 @@ static int w83791d_detect(struct i2c_cli struct i2c_board_info *info); static int w83791d_remove(struct i2c_client *client); @@ -18392,10 +18275,10 @@ diff -urNp linux-2.6.29.6/drivers/hwmon/w83791d.c linux-2.6.29.6/drivers/hwmon/w static struct w83791d_data *w83791d_update_device(struct device *dev); #ifdef DEBUG -diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c ---- linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c 2009-07-23 17:34:32.117858467 -0400 -@@ -577,7 +577,7 @@ static struct pci_device_id i801_ids[] = +diff -urNp linux-2.6.30.4/drivers/i2c/busses/i2c-i801.c linux-2.6.30.4/drivers/i2c/busses/i2c-i801.c +--- linux-2.6.30.4/drivers/i2c/busses/i2c-i801.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/i2c/busses/i2c-i801.c 2009-07-30 09:48:10.018424106 -0400 +@@ -578,7 +578,7 @@ static struct pci_device_id i801_ids[] = { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_4) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_ICH10_5) }, { PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_PCH_SMBUS) }, @@ -18404,9 +18287,9 @@ diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-i801.c linux-2.6.29.6/drivers/i }; MODULE_DEVICE_TABLE (pci, i801_ids); -diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c ---- linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c 2009-07-23 17:34:32.118755337 -0400 +diff -urNp linux-2.6.30.4/drivers/i2c/busses/i2c-piix4.c linux-2.6.30.4/drivers/i2c/busses/i2c-piix4.c +--- linux-2.6.30.4/drivers/i2c/busses/i2c-piix4.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/i2c/busses/i2c-piix4.c 2009-07-30 09:48:10.018424106 -0400 @@ -123,7 +123,7 @@ static struct dmi_system_id __devinitdat .ident = "IBM", .matches = { DMI_MATCH(DMI_SYS_VENDOR, "IBM"), }, @@ -18416,18 +18299,18 @@ diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-piix4.c linux-2.6.29.6/drivers/ }; static int __devinit piix4_setup(struct pci_dev *PIIX4_dev, -@@ -423,7 +423,7 @@ static struct pci_device_id piix4_ids[] - PCI_DEVICE_ID_SERVERWORKS_CSB6) }, - { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, +@@ -489,7 +489,7 @@ static struct pci_device_id piix4_ids[] PCI_DEVICE_ID_SERVERWORKS_HT1000SB) }, + { PCI_DEVICE(PCI_VENDOR_ID_SERVERWORKS, + PCI_DEVICE_ID_SERVERWORKS_HT1100LD) }, - { 0, } + { 0, 0, 0, 0, 0, 0, 0 } }; MODULE_DEVICE_TABLE (pci, piix4_ids); -diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c ---- linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c 2009-07-23 17:34:32.118755337 -0400 +diff -urNp linux-2.6.30.4/drivers/i2c/busses/i2c-sis630.c linux-2.6.30.4/drivers/i2c/busses/i2c-sis630.c +--- linux-2.6.30.4/drivers/i2c/busses/i2c-sis630.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/i2c/busses/i2c-sis630.c 2009-07-30 09:48:10.018424106 -0400 @@ -471,7 +471,7 @@ static struct i2c_adapter sis630_adapter static struct pci_device_id sis630_ids[] __devinitdata = { { PCI_DEVICE(PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503) }, @@ -18437,9 +18320,9 @@ diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-sis630.c linux-2.6.29.6/drivers }; MODULE_DEVICE_TABLE (pci, sis630_ids); -diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c ---- linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c 2009-07-23 17:34:32.118755337 -0400 +diff -urNp linux-2.6.30.4/drivers/i2c/busses/i2c-sis96x.c linux-2.6.30.4/drivers/i2c/busses/i2c-sis96x.c +--- linux-2.6.30.4/drivers/i2c/busses/i2c-sis96x.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/i2c/busses/i2c-sis96x.c 2009-07-30 09:48:10.018424106 -0400 @@ -247,7 +247,7 @@ static struct i2c_adapter sis96x_adapter static struct pci_device_id sis96x_ids[] = { @@ -18449,9 +18332,9 @@ diff -urNp linux-2.6.29.6/drivers/i2c/busses/i2c-sis96x.c linux-2.6.29.6/drivers }; MODULE_DEVICE_TABLE (pci, sis96x_ids); -diff -urNp linux-2.6.29.6/drivers/ieee1394/dma.c linux-2.6.29.6/drivers/ieee1394/dma.c ---- linux-2.6.29.6/drivers/ieee1394/dma.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/dma.c 2009-07-23 18:40:27.685680148 -0400 +diff -urNp linux-2.6.30.4/drivers/ieee1394/dma.c linux-2.6.30.4/drivers/ieee1394/dma.c +--- linux-2.6.30.4/drivers/ieee1394/dma.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/dma.c 2009-07-30 09:48:10.018424106 -0400 @@ -247,7 +247,7 @@ static int dma_region_pagefault(struct v return 0; } @@ -18461,9 +18344,9 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/dma.c linux-2.6.29.6/drivers/ieee1394 .fault = dma_region_pagefault, }; -diff -urNp linux-2.6.29.6/drivers/ieee1394/dv1394.c linux-2.6.29.6/drivers/ieee1394/dv1394.c ---- linux-2.6.29.6/drivers/ieee1394/dv1394.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/dv1394.c 2009-07-23 17:34:32.119753604 -0400 +diff -urNp linux-2.6.30.4/drivers/ieee1394/dv1394.c linux-2.6.30.4/drivers/ieee1394/dv1394.c +--- linux-2.6.30.4/drivers/ieee1394/dv1394.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/dv1394.c 2009-07-30 09:48:10.020336753 -0400 @@ -739,7 +739,7 @@ static void frame_prepare(struct video_c based upon DIF section and sequence */ @@ -18473,7 +18356,7 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/dv1394.c linux-2.6.29.6/drivers/ieee1 frame_put_packet (struct frame *f, struct packet *p) { int section_type = p->data[0] >> 5; /* section type is in bits 5 - 7 */ -@@ -2181,7 +2181,7 @@ static struct ieee1394_device_id dv1394_ +@@ -2177,7 +2177,7 @@ static const struct ieee1394_device_id d .specifier_id = AVC_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = AVC_SW_VERSION_ENTRY & 0xffffff }, @@ -18482,10 +18365,10 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/dv1394.c linux-2.6.29.6/drivers/ieee1 }; MODULE_DEVICE_TABLE(ieee1394, dv1394_id_table); -diff -urNp linux-2.6.29.6/drivers/ieee1394/eth1394.c linux-2.6.29.6/drivers/ieee1394/eth1394.c ---- linux-2.6.29.6/drivers/ieee1394/eth1394.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/eth1394.c 2009-07-23 17:34:32.119753604 -0400 -@@ -445,7 +445,7 @@ static struct ieee1394_device_id eth1394 +diff -urNp linux-2.6.30.4/drivers/ieee1394/eth1394.c linux-2.6.30.4/drivers/ieee1394/eth1394.c +--- linux-2.6.30.4/drivers/ieee1394/eth1394.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/eth1394.c 2009-07-30 09:48:10.020336753 -0400 +@@ -445,7 +445,7 @@ static const struct ieee1394_device_id e .specifier_id = ETHER1394_GASP_SPECIFIER_ID, .version = ETHER1394_GASP_VERSION, }, @@ -18494,9 +18377,9 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/eth1394.c linux-2.6.29.6/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, eth1394_id_table); -diff -urNp linux-2.6.29.6/drivers/ieee1394/hosts.c linux-2.6.29.6/drivers/ieee1394/hosts.c ---- linux-2.6.29.6/drivers/ieee1394/hosts.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/hosts.c 2009-07-23 17:34:32.120767858 -0400 +diff -urNp linux-2.6.30.4/drivers/ieee1394/hosts.c linux-2.6.30.4/drivers/ieee1394/hosts.c +--- linux-2.6.30.4/drivers/ieee1394/hosts.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/hosts.c 2009-07-30 09:48:10.020336753 -0400 @@ -78,6 +78,7 @@ static int dummy_isoctl(struct hpsb_iso } @@ -18505,9 +18388,9 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/hosts.c linux-2.6.29.6/drivers/ieee13 .transmit_packet = dummy_transmit_packet, .devctl = dummy_devctl, .isoctl = dummy_isoctl -diff -urNp linux-2.6.29.6/drivers/ieee1394/ohci1394.c linux-2.6.29.6/drivers/ieee1394/ohci1394.c ---- linux-2.6.29.6/drivers/ieee1394/ohci1394.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/ohci1394.c 2009-07-23 17:34:32.120767858 -0400 +diff -urNp linux-2.6.30.4/drivers/ieee1394/ohci1394.c linux-2.6.30.4/drivers/ieee1394/ohci1394.c +--- linux-2.6.30.4/drivers/ieee1394/ohci1394.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/ohci1394.c 2009-07-30 09:48:10.020862787 -0400 @@ -147,9 +147,9 @@ printk(level "%s: " fmt "\n" , OHCI1394_ printk(level "%s: fw-host%d: " fmt "\n" , OHCI1394_DRIVER_NAME, ohci->host->id , ## args) @@ -18529,10 +18412,10 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/ohci1394.c linux-2.6.29.6/drivers/iee }; MODULE_DEVICE_TABLE(pci, ohci1394_pci_tbl); -diff -urNp linux-2.6.29.6/drivers/ieee1394/raw1394.c linux-2.6.29.6/drivers/ieee1394/raw1394.c ---- linux-2.6.29.6/drivers/ieee1394/raw1394.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/raw1394.c 2009-07-23 17:34:32.121756795 -0400 -@@ -2995,7 +2995,7 @@ static struct ieee1394_device_id raw1394 +diff -urNp linux-2.6.30.4/drivers/ieee1394/raw1394.c linux-2.6.30.4/drivers/ieee1394/raw1394.c +--- linux-2.6.30.4/drivers/ieee1394/raw1394.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/raw1394.c 2009-07-30 09:48:10.022270946 -0400 +@@ -2999,7 +2999,7 @@ static const struct ieee1394_device_id r .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff}, @@ -18541,10 +18424,10 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/raw1394.c linux-2.6.29.6/drivers/ieee }; MODULE_DEVICE_TABLE(ieee1394, raw1394_id_table); -diff -urNp linux-2.6.29.6/drivers/ieee1394/sbp2.c linux-2.6.29.6/drivers/ieee1394/sbp2.c ---- linux-2.6.29.6/drivers/ieee1394/sbp2.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/sbp2.c 2009-07-23 17:34:32.122774195 -0400 -@@ -290,7 +290,7 @@ static struct ieee1394_device_id sbp2_id +diff -urNp linux-2.6.30.4/drivers/ieee1394/sbp2.c linux-2.6.30.4/drivers/ieee1394/sbp2.c +--- linux-2.6.30.4/drivers/ieee1394/sbp2.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/sbp2.c 2009-07-30 09:48:10.022270946 -0400 +@@ -290,7 +290,7 @@ static const struct ieee1394_device_id s .match_flags = IEEE1394_MATCH_SPECIFIER_ID | IEEE1394_MATCH_VERSION, .specifier_id = SBP2_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = SBP2_SW_VERSION_ENTRY & 0xffffff}, @@ -18553,7 +18436,7 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/sbp2.c linux-2.6.29.6/drivers/ieee139 }; MODULE_DEVICE_TABLE(ieee1394, sbp2_id_table); -@@ -2112,7 +2112,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot +@@ -2111,7 +2111,7 @@ MODULE_DESCRIPTION("IEEE-1394 SBP-2 prot MODULE_SUPPORTED_DEVICE(SBP2_DEVICE_NAME); MODULE_LICENSE("GPL"); @@ -18562,10 +18445,10 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/sbp2.c linux-2.6.29.6/drivers/ieee139 { int ret; -diff -urNp linux-2.6.29.6/drivers/ieee1394/video1394.c linux-2.6.29.6/drivers/ieee1394/video1394.c ---- linux-2.6.29.6/drivers/ieee1394/video1394.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/ieee1394/video1394.c 2009-07-23 17:34:32.123823981 -0400 -@@ -1310,7 +1310,7 @@ static struct ieee1394_device_id video13 +diff -urNp linux-2.6.30.4/drivers/ieee1394/video1394.c linux-2.6.30.4/drivers/ieee1394/video1394.c +--- linux-2.6.30.4/drivers/ieee1394/video1394.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/ieee1394/video1394.c 2009-07-30 09:48:10.022535006 -0400 +@@ -1310,7 +1310,7 @@ static const struct ieee1394_device_id v .specifier_id = CAMERA_UNIT_SPEC_ID_ENTRY & 0xffffff, .version = (CAMERA_SW_VERSION_ENTRY + 2) & 0xffffff }, @@ -18574,9 +18457,9 @@ diff -urNp linux-2.6.29.6/drivers/ieee1394/video1394.c linux-2.6.29.6/drivers/ie }; MODULE_DEVICE_TABLE(ieee1394, video1394_id_table); -diff -urNp linux-2.6.29.6/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.29.6/drivers/infiniband/hw/ehca/ehca_uverbs.c ---- linux-2.6.29.6/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-07-23 18:40:27.691179918 -0400 +diff -urNp linux-2.6.30.4/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.30.4/drivers/infiniband/hw/ehca/ehca_uverbs.c +--- linux-2.6.30.4/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/infiniband/hw/ehca/ehca_uverbs.c 2009-07-30 09:48:10.023536535 -0400 @@ -95,7 +95,7 @@ static void ehca_mm_close(struct vm_area vma->vm_start, vma->vm_end, *count); } @@ -18586,9 +18469,9 @@ diff -urNp linux-2.6.29.6/drivers/infiniband/hw/ehca/ehca_uverbs.c linux-2.6.29. .open = ehca_mm_open, .close = ehca_mm_close, }; -diff -urNp linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_file_ops.c linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_file_ops.c ---- linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-07-23 18:40:27.711522279 -0400 +diff -urNp linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_file_ops.c linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_file_ops.c +--- linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_file_ops.c 2009-07-30 09:48:10.023536535 -0400 @@ -1151,7 +1151,7 @@ static int ipath_file_vma_fault(struct v return 0; } @@ -18598,9 +18481,9 @@ diff -urNp linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_file_ops.c linux-2.6 .fault = ipath_file_vma_fault, }; -diff -urNp linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_mmap.c linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_mmap.c ---- linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-07-23 18:40:27.724998803 -0400 +diff -urNp linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_mmap.c linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_mmap.c +--- linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/infiniband/hw/ipath/ipath_mmap.c 2009-07-30 09:48:10.024683962 -0400 @@ -74,7 +74,7 @@ static void ipath_vma_close(struct vm_ar kref_put(&ip->ref, ipath_release_mmap_info); } @@ -18610,9 +18493,9 @@ diff -urNp linux-2.6.29.6/drivers/infiniband/hw/ipath/ipath_mmap.c linux-2.6.29. .open = ipath_vma_open, .close = ipath_vma_close, }; -diff -urNp linux-2.6.29.6/drivers/input/keyboard/atkbd.c linux-2.6.29.6/drivers/input/keyboard/atkbd.c ---- linux-2.6.29.6/drivers/input/keyboard/atkbd.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/input/keyboard/atkbd.c 2009-07-23 17:34:32.123823981 -0400 +diff -urNp linux-2.6.30.4/drivers/input/keyboard/atkbd.c linux-2.6.30.4/drivers/input/keyboard/atkbd.c +--- linux-2.6.30.4/drivers/input/keyboard/atkbd.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/input/keyboard/atkbd.c 2009-07-30 09:48:10.024683962 -0400 @@ -1166,7 +1166,7 @@ static struct serio_device_id atkbd_seri .id = SERIO_ANY, .extra = SERIO_ANY, @@ -18622,10 +18505,10 @@ diff -urNp linux-2.6.29.6/drivers/input/keyboard/atkbd.c linux-2.6.29.6/drivers/ }; MODULE_DEVICE_TABLE(serio, atkbd_serio_ids); -diff -urNp linux-2.6.29.6/drivers/input/mouse/lifebook.c linux-2.6.29.6/drivers/input/mouse/lifebook.c ---- linux-2.6.29.6/drivers/input/mouse/lifebook.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/input/mouse/lifebook.c 2009-07-23 17:34:32.124774542 -0400 -@@ -110,7 +110,7 @@ static const struct dmi_system_id lifebo +diff -urNp linux-2.6.30.4/drivers/input/mouse/lifebook.c linux-2.6.30.4/drivers/input/mouse/lifebook.c +--- linux-2.6.30.4/drivers/input/mouse/lifebook.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/input/mouse/lifebook.c 2009-07-30 09:48:10.025535593 -0400 +@@ -116,7 +116,7 @@ static const struct dmi_system_id lifebo DMI_MATCH(DMI_PRODUCT_NAME, "LifeBook B142"), }, }, @@ -18634,9 +18517,9 @@ diff -urNp linux-2.6.29.6/drivers/input/mouse/lifebook.c linux-2.6.29.6/drivers/ }; static psmouse_ret_t lifebook_process_byte(struct psmouse *psmouse) -diff -urNp linux-2.6.29.6/drivers/input/mouse/psmouse-base.c linux-2.6.29.6/drivers/input/mouse/psmouse-base.c ---- linux-2.6.29.6/drivers/input/mouse/psmouse-base.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/input/mouse/psmouse-base.c 2009-07-23 17:34:32.124774542 -0400 +diff -urNp linux-2.6.30.4/drivers/input/mouse/psmouse-base.c linux-2.6.30.4/drivers/input/mouse/psmouse-base.c +--- linux-2.6.30.4/drivers/input/mouse/psmouse-base.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/input/mouse/psmouse-base.c 2009-07-30 09:48:10.025535593 -0400 @@ -1378,7 +1378,7 @@ static struct serio_device_id psmouse_se .id = SERIO_ANY, .extra = SERIO_ANY, @@ -18646,9 +18529,9 @@ diff -urNp linux-2.6.29.6/drivers/input/mouse/psmouse-base.c linux-2.6.29.6/driv }; MODULE_DEVICE_TABLE(serio, psmouse_serio_ids); -diff -urNp linux-2.6.29.6/drivers/input/mouse/synaptics.c linux-2.6.29.6/drivers/input/mouse/synaptics.c ---- linux-2.6.29.6/drivers/input/mouse/synaptics.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/input/mouse/synaptics.c 2009-07-23 17:34:32.124774542 -0400 +diff -urNp linux-2.6.30.4/drivers/input/mouse/synaptics.c linux-2.6.30.4/drivers/input/mouse/synaptics.c +--- linux-2.6.30.4/drivers/input/mouse/synaptics.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/input/mouse/synaptics.c 2009-07-30 09:48:10.026633372 -0400 @@ -412,7 +412,7 @@ static void synaptics_process_packet(str break; case 2: @@ -18667,10 +18550,10 @@ diff -urNp linux-2.6.29.6/drivers/input/mouse/synaptics.c linux-2.6.29.6/drivers }; #endif -diff -urNp linux-2.6.29.6/drivers/input/mousedev.c linux-2.6.29.6/drivers/input/mousedev.c ---- linux-2.6.29.6/drivers/input/mousedev.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/input/mousedev.c 2009-07-23 17:34:32.125938815 -0400 -@@ -1062,7 +1062,7 @@ static struct input_handler mousedev_han +diff -urNp linux-2.6.30.4/drivers/input/mousedev.c linux-2.6.30.4/drivers/input/mousedev.c +--- linux-2.6.30.4/drivers/input/mousedev.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/input/mousedev.c 2009-07-30 09:48:10.026633372 -0400 +@@ -1059,7 +1059,7 @@ static struct input_handler mousedev_han #ifdef CONFIG_INPUT_MOUSEDEV_PSAUX static struct miscdevice psaux_mouse = { @@ -18679,11 +18562,11 @@ diff -urNp linux-2.6.29.6/drivers/input/mousedev.c linux-2.6.29.6/drivers/input/ }; static int psaux_registered; #endif -diff -urNp linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h ---- linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h 2009-07-23 17:34:32.125938815 -0400 -@@ -151,7 +151,7 @@ static struct dmi_system_id __initdata i - DMI_MATCH(DMI_PRODUCT_VERSION, "01"), +diff -urNp linux-2.6.30.4/drivers/input/serio/i8042-x86ia64io.h linux-2.6.30.4/drivers/input/serio/i8042-x86ia64io.h +--- linux-2.6.30.4/drivers/input/serio/i8042-x86ia64io.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/input/serio/i8042-x86ia64io.h 2009-07-30 09:48:10.027427071 -0400 +@@ -159,7 +159,7 @@ static struct dmi_system_id __initdata i + DMI_MATCH(DMI_PRODUCT_VERSION, "Rev 1"), }, }, - { } @@ -18691,7 +18574,7 @@ diff -urNp linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.6/d }; /* -@@ -366,7 +366,7 @@ static struct dmi_system_id __initdata i +@@ -374,7 +374,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_PRODUCT_NAME, "Vostro1510"), }, }, @@ -18699,9 +18582,18 @@ diff -urNp linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.6/d + { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } }; + static struct dmi_system_id __initdata i8042_dmi_reset_table[] = { +@@ -392,7 +392,7 @@ static struct dmi_system_id __initdata i + DMI_MATCH(DMI_BOARD_VENDOR, "LG Electronics Inc."), + }, + }, +- { } ++ { NULL, NULL, {DMI_MATCH(DMI_NONE, {0})}, NULL } + }; + #ifdef CONFIG_PNP -@@ -378,7 +378,7 @@ static struct dmi_system_id __initdata i - DMI_MATCH(DMI_BOARD_VENDOR, "Intel Corporation"), +@@ -411,7 +411,7 @@ static struct dmi_system_id __initdata i + DMI_MATCH(DMI_BOARD_VENDOR, "MICRO-STAR INTERNATIONAL CO., LTD"), }, }, - { } @@ -18709,7 +18601,7 @@ diff -urNp linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.6/d }; #endif -@@ -445,7 +445,7 @@ static struct dmi_system_id __initdata i +@@ -478,7 +478,7 @@ static struct dmi_system_id __initdata i DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 4280"), }, }, @@ -18718,10 +18610,10 @@ diff -urNp linux-2.6.29.6/drivers/input/serio/i8042-x86ia64io.h linux-2.6.29.6/d }; #endif /* CONFIG_X86 */ -diff -urNp linux-2.6.29.6/drivers/input/serio/serio_raw.c linux-2.6.29.6/drivers/input/serio/serio_raw.c ---- linux-2.6.29.6/drivers/input/serio/serio_raw.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/input/serio/serio_raw.c 2009-07-23 17:34:32.126724952 -0400 -@@ -378,7 +378,7 @@ static struct serio_device_id serio_raw_ +diff -urNp linux-2.6.30.4/drivers/input/serio/serio_raw.c linux-2.6.30.4/drivers/input/serio/serio_raw.c +--- linux-2.6.30.4/drivers/input/serio/serio_raw.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/input/serio/serio_raw.c 2009-07-30 09:48:10.027427071 -0400 +@@ -376,7 +376,7 @@ static struct serio_device_id serio_raw_ .id = SERIO_ANY, .extra = SERIO_ANY, }, @@ -18730,9 +18622,9 @@ diff -urNp linux-2.6.29.6/drivers/input/serio/serio_raw.c linux-2.6.29.6/drivers }; MODULE_DEVICE_TABLE(serio, serio_raw_serio_ids); -diff -urNp linux-2.6.29.6/drivers/isdn/capi/kcapi_proc.c linux-2.6.29.6/drivers/isdn/capi/kcapi_proc.c ---- linux-2.6.29.6/drivers/isdn/capi/kcapi_proc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/isdn/capi/kcapi_proc.c 2009-07-23 18:40:27.725292323 -0400 +diff -urNp linux-2.6.30.4/drivers/isdn/capi/kcapi_proc.c linux-2.6.30.4/drivers/isdn/capi/kcapi_proc.c +--- linux-2.6.30.4/drivers/isdn/capi/kcapi_proc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/isdn/capi/kcapi_proc.c 2009-07-30 09:48:10.027427071 -0400 @@ -89,14 +89,14 @@ static int contrstats_show(struct seq_fi return 0; } @@ -18767,7 +18659,7 @@ diff -urNp linux-2.6.29.6/drivers/isdn/capi/kcapi_proc.c linux-2.6.29.6/drivers/ .start = applications_start, .next = applications_next, .stop = applications_stop, -@@ -262,7 +262,7 @@ static int capi_driver_show(struct seq_f +@@ -264,7 +264,7 @@ static int capi_driver_show(struct seq_f return 0; } @@ -18776,10 +18668,10 @@ diff -urNp linux-2.6.29.6/drivers/isdn/capi/kcapi_proc.c linux-2.6.29.6/drivers/ .start = capi_driver_start, .next = capi_driver_next, .stop = capi_driver_stop, -diff -urNp linux-2.6.29.6/drivers/isdn/mISDN/timerdev.c linux-2.6.29.6/drivers/isdn/mISDN/timerdev.c ---- linux-2.6.29.6/drivers/isdn/mISDN/timerdev.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/isdn/mISDN/timerdev.c 2009-07-23 18:40:27.725292323 -0400 -@@ -260,7 +260,7 @@ mISDN_ioctl(struct inode *inode, struct +diff -urNp linux-2.6.30.4/drivers/isdn/mISDN/timerdev.c linux-2.6.30.4/drivers/isdn/mISDN/timerdev.c +--- linux-2.6.30.4/drivers/isdn/mISDN/timerdev.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/isdn/mISDN/timerdev.c 2009-07-30 09:48:10.028469662 -0400 +@@ -259,7 +259,7 @@ mISDN_ioctl(struct inode *inode, struct return ret; } @@ -18788,9 +18680,9 @@ diff -urNp linux-2.6.29.6/drivers/isdn/mISDN/timerdev.c linux-2.6.29.6/drivers/i .read = mISDN_read, .poll = mISDN_poll, .ioctl = mISDN_ioctl, -diff -urNp linux-2.6.29.6/drivers/lguest/core.c linux-2.6.29.6/drivers/lguest/core.c ---- linux-2.6.29.6/drivers/lguest/core.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/lguest/core.c 2009-07-23 17:34:32.126724952 -0400 +diff -urNp linux-2.6.30.4/drivers/lguest/core.c linux-2.6.30.4/drivers/lguest/core.c +--- linux-2.6.30.4/drivers/lguest/core.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/lguest/core.c 2009-07-30 09:48:10.028469662 -0400 @@ -80,9 +80,17 @@ static __init int map_switcher(void) * (SWITCHER_ADDR). We might not get it in theory, but in practice * it's worked so far. The end address needs +1 because __get_vm_area @@ -18809,9 +18701,9 @@ diff -urNp linux-2.6.29.6/drivers/lguest/core.c linux-2.6.29.6/drivers/lguest/co if (!switcher_vma) { err = -ENOMEM; printk("lguest: could not map switcher pages high\n"); -diff -urNp linux-2.6.29.6/drivers/lguest/lguest_user.c linux-2.6.29.6/drivers/lguest/lguest_user.c ---- linux-2.6.29.6/drivers/lguest/lguest_user.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/lguest/lguest_user.c 2009-07-23 18:40:27.725292323 -0400 +diff -urNp linux-2.6.30.4/drivers/lguest/lguest_user.c linux-2.6.30.4/drivers/lguest/lguest_user.c +--- linux-2.6.30.4/drivers/lguest/lguest_user.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/lguest/lguest_user.c 2009-07-30 09:48:10.028469662 -0400 @@ -329,7 +329,7 @@ static int close(struct inode *inode, st * We begin our understanding with the Host kernel interface which the Launcher * uses: reading and writing a character device called /dev/lguest. All the @@ -18821,10 +18713,10 @@ diff -urNp linux-2.6.29.6/drivers/lguest/lguest_user.c linux-2.6.29.6/drivers/lg .owner = THIS_MODULE, .release = close, .write = write, -diff -urNp linux-2.6.29.6/drivers/md/bitmap.c linux-2.6.29.6/drivers/md/bitmap.c ---- linux-2.6.29.6/drivers/md/bitmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/md/bitmap.c 2009-07-23 17:34:32.126724952 -0400 -@@ -57,7 +57,7 @@ +diff -urNp linux-2.6.30.4/drivers/md/bitmap.c linux-2.6.30.4/drivers/md/bitmap.c +--- linux-2.6.30.4/drivers/md/bitmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/md/bitmap.c 2009-07-30 09:48:10.029590223 -0400 +@@ -58,7 +58,7 @@ # if DEBUG > 0 # define PRINTK(x...) printk(KERN_DEBUG x) # else @@ -18833,10 +18725,10 @@ diff -urNp linux-2.6.29.6/drivers/md/bitmap.c linux-2.6.29.6/drivers/md/bitmap.c # endif #endif -diff -urNp linux-2.6.29.6/drivers/md/md.c linux-2.6.29.6/drivers/md/md.c ---- linux-2.6.29.6/drivers/md/md.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/md/md.c 2009-07-23 18:40:27.467400762 -0400 -@@ -5637,7 +5637,7 @@ static int md_seq_show(struct seq_file * +diff -urNp linux-2.6.30.4/drivers/md/md.c linux-2.6.30.4/drivers/md/md.c +--- linux-2.6.30.4/drivers/md/md.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/md/md.c 2009-07-30 09:48:10.031075937 -0400 +@@ -5973,7 +5973,7 @@ static int md_seq_show(struct seq_file * chunk_kb ? "KB" : "B"); if (bitmap->file) { seq_printf(seq, ", file: "); @@ -18845,19 +18737,46 @@ diff -urNp linux-2.6.29.6/drivers/md/md.c linux-2.6.29.6/drivers/md/md.c } seq_printf(seq, "\n"); -@@ -5651,7 +5651,7 @@ static int md_seq_show(struct seq_file * - return 0; +diff -urNp linux-2.6.30.4/drivers/md/md.h linux-2.6.30.4/drivers/md/md.h +--- linux-2.6.30.4/drivers/md/md.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/md/md.h 2009-07-30 09:48:10.031075937 -0400 +@@ -299,7 +299,7 @@ static inline void rdev_dec_pending(mdk_ + + static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) + { +- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); ++ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); } --static struct seq_operations md_seq_ops = { -+static const struct seq_operations md_seq_ops = { - .start = md_seq_start, - .next = md_seq_next, - .stop = md_seq_stop, -diff -urNp linux-2.6.29.6/drivers/media/video/cafe_ccic.c linux-2.6.29.6/drivers/media/video/cafe_ccic.c ---- linux-2.6.29.6/drivers/media/video/cafe_ccic.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/cafe_ccic.c 2009-07-23 18:40:27.758392151 -0400 -@@ -1428,7 +1428,7 @@ static void cafe_v4l_vm_close(struct vm_ + struct mdk_personality +diff -urNp linux-2.6.30.4/drivers/media/dvb/dvb-core/dmxdev.c linux-2.6.30.4/drivers/media/dvb/dvb-core/dmxdev.c +--- linux-2.6.30.4/drivers/media/dvb/dvb-core/dmxdev.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/dvb/dvb-core/dmxdev.c 2009-07-30 12:06:52.108842402 -0400 +@@ -1092,7 +1092,7 @@ static unsigned int dvb_dvr_poll(struct + return mask; + } + +-static struct file_operations dvb_dvr_fops = { ++static const struct file_operations dvb_dvr_fops = { + .owner = THIS_MODULE, + .read = dvb_dvr_read, + .write = dvb_dvr_write, +diff -urNp linux-2.6.30.4/drivers/media/dvb/firewire/firedtv-ci.c linux-2.6.30.4/drivers/media/dvb/firewire/firedtv-ci.c +--- linux-2.6.30.4/drivers/media/dvb/firewire/firedtv-ci.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/dvb/firewire/firedtv-ci.c 2009-07-30 12:06:52.110732547 -0400 +@@ -215,7 +215,7 @@ static unsigned int fdtv_ca_io_poll(stru + return POLLIN; + } + +-static struct file_operations fdtv_ca_fops = { ++static const struct file_operations fdtv_ca_fops = { + .owner = THIS_MODULE, + .ioctl = dvb_generic_ioctl, + .open = dvb_generic_open, +diff -urNp linux-2.6.30.4/drivers/media/video/cafe_ccic.c linux-2.6.30.4/drivers/media/video/cafe_ccic.c +--- linux-2.6.30.4/drivers/media/video/cafe_ccic.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/cafe_ccic.c 2009-07-30 09:48:10.031530096 -0400 +@@ -1326,7 +1326,7 @@ static void cafe_v4l_vm_close(struct vm_ mutex_unlock(&sbuf->cam->s_mutex); } @@ -18866,9 +18785,9 @@ diff -urNp linux-2.6.29.6/drivers/media/video/cafe_ccic.c linux-2.6.29.6/drivers .open = cafe_v4l_vm_open, .close = cafe_v4l_vm_close }; -diff -urNp linux-2.6.29.6/drivers/media/video/et61x251/et61x251_core.c linux-2.6.29.6/drivers/media/video/et61x251/et61x251_core.c ---- linux-2.6.29.6/drivers/media/video/et61x251/et61x251_core.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/et61x251/et61x251_core.c 2009-07-23 18:40:27.771668760 -0400 +diff -urNp linux-2.6.30.4/drivers/media/video/et61x251/et61x251_core.c linux-2.6.30.4/drivers/media/video/et61x251/et61x251_core.c +--- linux-2.6.30.4/drivers/media/video/et61x251/et61x251_core.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/et61x251/et61x251_core.c 2009-07-30 09:48:10.031530096 -0400 @@ -1494,7 +1494,7 @@ static void et61x251_vm_close(struct vm_ } @@ -18878,10 +18797,10 @@ diff -urNp linux-2.6.29.6/drivers/media/video/et61x251/et61x251_core.c linux-2.6 .open = et61x251_vm_open, .close = et61x251_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/gspca/gspca.c linux-2.6.29.6/drivers/media/video/gspca/gspca.c ---- linux-2.6.29.6/drivers/media/video/gspca/gspca.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/gspca/gspca.c 2009-07-23 18:40:27.778527732 -0400 -@@ -98,7 +98,7 @@ static void gspca_vm_close(struct vm_are +diff -urNp linux-2.6.30.4/drivers/media/video/gspca/gspca.c linux-2.6.30.4/drivers/media/video/gspca/gspca.c +--- linux-2.6.30.4/drivers/media/video/gspca/gspca.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/gspca/gspca.c 2009-07-30 09:48:10.032627590 -0400 +@@ -99,7 +99,7 @@ static void gspca_vm_close(struct vm_are frame->v4l2_buf.flags &= ~V4L2_BUF_FLAG_MAPPED; } @@ -18890,10 +18809,10 @@ diff -urNp linux-2.6.29.6/drivers/media/video/gspca/gspca.c linux-2.6.29.6/drive .open = gspca_vm_open, .close = gspca_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/meye.c linux-2.6.29.6/drivers/media/video/meye.c ---- linux-2.6.29.6/drivers/media/video/meye.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/meye.c 2009-07-23 18:40:27.788416673 -0400 -@@ -1628,7 +1628,7 @@ static void meye_vm_close(struct vm_area +diff -urNp linux-2.6.30.4/drivers/media/video/meye.c linux-2.6.30.4/drivers/media/video/meye.c +--- linux-2.6.30.4/drivers/media/video/meye.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/meye.c 2009-07-30 09:48:10.032627590 -0400 +@@ -1589,7 +1589,7 @@ static void meye_vm_close(struct vm_area meye.vma_use_count[idx]--; } @@ -18902,9 +18821,9 @@ diff -urNp linux-2.6.29.6/drivers/media/video/meye.c linux-2.6.29.6/drivers/medi .open = meye_vm_open, .close = meye_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.29.6/drivers/media/video/sn9c102/sn9c102_core.c ---- linux-2.6.29.6/drivers/media/video/sn9c102/sn9c102_core.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/sn9c102/sn9c102_core.c 2009-07-23 18:40:27.796800559 -0400 +diff -urNp linux-2.6.30.4/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.30.4/drivers/media/video/sn9c102/sn9c102_core.c +--- linux-2.6.30.4/drivers/media/video/sn9c102/sn9c102_core.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/sn9c102/sn9c102_core.c 2009-07-30 09:48:10.033630131 -0400 @@ -2075,7 +2075,7 @@ static void sn9c102_vm_close(struct vm_a } @@ -18914,9 +18833,9 @@ diff -urNp linux-2.6.29.6/drivers/media/video/sn9c102/sn9c102_core.c linux-2.6.2 .open = sn9c102_vm_open, .close = sn9c102_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/stk-webcam.c linux-2.6.29.6/drivers/media/video/stk-webcam.c ---- linux-2.6.29.6/drivers/media/video/stk-webcam.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/stk-webcam.c 2009-07-23 18:40:27.803525619 -0400 +diff -urNp linux-2.6.30.4/drivers/media/video/stk-webcam.c linux-2.6.30.4/drivers/media/video/stk-webcam.c +--- linux-2.6.30.4/drivers/media/video/stk-webcam.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/stk-webcam.c 2009-07-30 09:48:10.033630131 -0400 @@ -789,7 +789,7 @@ static void stk_v4l_vm_close(struct vm_a if (sbuf->mapcount == 0) sbuf->v4lbuf.flags &= ~V4L2_BUF_FLAG_MAPPED; @@ -18926,10 +18845,10 @@ diff -urNp linux-2.6.29.6/drivers/media/video/stk-webcam.c linux-2.6.29.6/driver .open = stk_v4l_vm_open, .close = stk_v4l_vm_close }; -diff -urNp linux-2.6.29.6/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.29.6/drivers/media/video/uvc/uvc_v4l2.c ---- linux-2.6.29.6/drivers/media/video/uvc/uvc_v4l2.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/uvc/uvc_v4l2.c 2009-07-23 18:40:27.817489179 -0400 -@@ -1030,7 +1030,7 @@ static void uvc_vm_close(struct vm_area_ +diff -urNp linux-2.6.30.4/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.30.4/drivers/media/video/uvc/uvc_v4l2.c +--- linux-2.6.30.4/drivers/media/video/uvc/uvc_v4l2.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/uvc/uvc_v4l2.c 2009-07-30 09:48:10.034661447 -0400 +@@ -1036,7 +1036,7 @@ static void uvc_vm_close(struct vm_area_ buffer->vma_use_count--; } @@ -18938,9 +18857,9 @@ diff -urNp linux-2.6.29.6/drivers/media/video/uvc/uvc_v4l2.c linux-2.6.29.6/driv .open = uvc_vm_open, .close = uvc_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/videobuf-dma-contig.c linux-2.6.29.6/drivers/media/video/videobuf-dma-contig.c ---- linux-2.6.29.6/drivers/media/video/videobuf-dma-contig.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/videobuf-dma-contig.c 2009-07-23 18:40:27.828475979 -0400 +diff -urNp linux-2.6.30.4/drivers/media/video/videobuf-dma-contig.c linux-2.6.30.4/drivers/media/video/videobuf-dma-contig.c +--- linux-2.6.30.4/drivers/media/video/videobuf-dma-contig.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/videobuf-dma-contig.c 2009-07-30 09:48:10.034661447 -0400 @@ -103,7 +103,7 @@ static void videobuf_vm_close(struct vm_ } } @@ -18950,10 +18869,10 @@ diff -urNp linux-2.6.29.6/drivers/media/video/videobuf-dma-contig.c linux-2.6.29 .open = videobuf_vm_open, .close = videobuf_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/vino.c linux-2.6.29.6/drivers/media/video/vino.c ---- linux-2.6.29.6/drivers/media/video/vino.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/vino.c 2009-07-23 18:40:27.838748348 -0400 -@@ -4088,7 +4088,7 @@ static void vino_vm_close(struct vm_area +diff -urNp linux-2.6.30.4/drivers/media/video/vino.c linux-2.6.30.4/drivers/media/video/vino.c +--- linux-2.6.30.4/drivers/media/video/vino.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/vino.c 2009-07-30 09:48:10.035537043 -0400 +@@ -3858,7 +3858,7 @@ static void vino_vm_close(struct vm_area dprintk("vino_vm_close(): count = %d\n", fb->map_count); } @@ -18962,9 +18881,9 @@ diff -urNp linux-2.6.29.6/drivers/media/video/vino.c linux-2.6.29.6/drivers/medi .open = vino_vm_open, .close = vino_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/zc0301/zc0301_core.c linux-2.6.29.6/drivers/media/video/zc0301/zc0301_core.c ---- linux-2.6.29.6/drivers/media/video/zc0301/zc0301_core.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/zc0301/zc0301_core.c 2009-07-23 18:40:27.845358958 -0400 +diff -urNp linux-2.6.30.4/drivers/media/video/zc0301/zc0301_core.c linux-2.6.30.4/drivers/media/video/zc0301/zc0301_core.c +--- linux-2.6.30.4/drivers/media/video/zc0301/zc0301_core.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/zc0301/zc0301_core.c 2009-07-30 09:48:10.036598829 -0400 @@ -933,7 +933,7 @@ static void zc0301_vm_close(struct vm_ar } @@ -18974,11 +18893,11 @@ diff -urNp linux-2.6.29.6/drivers/media/video/zc0301/zc0301_core.c linux-2.6.29. .open = zc0301_vm_open, .close = zc0301_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/media/video/zoran/zoran_driver.c linux-2.6.29.6/drivers/media/video/zoran/zoran_driver.c ---- linux-2.6.29.6/drivers/media/video/zoran/zoran_driver.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/media/video/zoran/zoran_driver.c 2009-07-23 18:40:27.858649863 -0400 -@@ -4359,7 +4359,7 @@ zoran_vm_close (struct vm_area_struct *v - } +diff -urNp linux-2.6.30.4/drivers/media/video/zoran/zoran_driver.c linux-2.6.30.4/drivers/media/video/zoran/zoran_driver.c +--- linux-2.6.30.4/drivers/media/video/zoran/zoran_driver.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/media/video/zoran/zoran_driver.c 2009-07-30 12:07:09.597971485 -0400 +@@ -3177,7 +3177,7 @@ zoran_vm_close (struct vm_area_struct *v + mutex_unlock(&zr->resource_lock); } -static struct vm_operations_struct zoran_vm_ops = { @@ -18986,9 +18905,9 @@ diff -urNp linux-2.6.29.6/drivers/media/video/zoran/zoran_driver.c linux-2.6.29. .open = zoran_vm_open, .close = zoran_vm_close, }; -diff -urNp linux-2.6.29.6/drivers/misc/ibmasm/ibmasmfs.c linux-2.6.29.6/drivers/misc/ibmasm/ibmasmfs.c ---- linux-2.6.29.6/drivers/misc/ibmasm/ibmasmfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/misc/ibmasm/ibmasmfs.c 2009-07-23 18:40:27.864885246 -0400 +diff -urNp linux-2.6.30.4/drivers/misc/ibmasm/ibmasmfs.c linux-2.6.30.4/drivers/misc/ibmasm/ibmasmfs.c +--- linux-2.6.30.4/drivers/misc/ibmasm/ibmasmfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/misc/ibmasm/ibmasmfs.c 2009-07-30 09:48:10.036598829 -0400 @@ -97,7 +97,7 @@ static int ibmasmfs_get_super(struct fil return get_sb_single(fst, flags, data, ibmasmfs_fill_super, mnt); } @@ -18998,9 +18917,9 @@ diff -urNp linux-2.6.29.6/drivers/misc/ibmasm/ibmasmfs.c linux-2.6.29.6/drivers/ .statfs = simple_statfs, .drop_inode = generic_delete_inode, }; -diff -urNp linux-2.6.29.6/drivers/misc/phantom.c linux-2.6.29.6/drivers/misc/phantom.c ---- linux-2.6.29.6/drivers/misc/phantom.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/misc/phantom.c 2009-07-23 18:40:27.874264006 -0400 +diff -urNp linux-2.6.30.4/drivers/misc/phantom.c linux-2.6.30.4/drivers/misc/phantom.c +--- linux-2.6.30.4/drivers/misc/phantom.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/misc/phantom.c 2009-07-30 09:48:10.037448258 -0400 @@ -271,7 +271,7 @@ static unsigned int phantom_poll(struct return mask; } @@ -19010,10 +18929,10 @@ diff -urNp linux-2.6.29.6/drivers/misc/phantom.c linux-2.6.29.6/drivers/misc/pha .open = phantom_open, .release = phantom_release, .unlocked_ioctl = phantom_ioctl, -diff -urNp linux-2.6.29.6/drivers/misc/sgi-gru/grufile.c linux-2.6.29.6/drivers/misc/sgi-gru/grufile.c ---- linux-2.6.29.6/drivers/misc/sgi-gru/grufile.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/misc/sgi-gru/grufile.c 2009-07-23 18:40:27.879624060 -0400 -@@ -63,7 +63,7 @@ struct gru_stats_s gru_stats; +diff -urNp linux-2.6.30.4/drivers/misc/sgi-gru/grufile.c linux-2.6.30.4/drivers/misc/sgi-gru/grufile.c +--- linux-2.6.30.4/drivers/misc/sgi-gru/grufile.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/misc/sgi-gru/grufile.c 2009-07-30 17:46:03.273720317 -0400 +@@ -53,7 +53,7 @@ struct gru_stats_s gru_stats; /* Guaranteed user available resources on each node */ static int max_user_cbrs, max_user_dsr_bytes; @@ -19022,7 +18941,7 @@ diff -urNp linux-2.6.29.6/drivers/misc/sgi-gru/grufile.c linux-2.6.29.6/drivers/ static struct miscdevice gru_miscdev; -@@ -464,7 +464,7 @@ static void __exit gru_exit(void) +@@ -460,7 +460,7 @@ static void __exit gru_exit(void) gru_proc_exit(); } @@ -19031,19 +18950,43 @@ diff -urNp linux-2.6.29.6/drivers/misc/sgi-gru/grufile.c linux-2.6.29.6/drivers/ .owner = THIS_MODULE, .unlocked_ioctl = gru_file_unlocked_ioctl, .mmap = gru_file_mmap, -@@ -476,7 +476,7 @@ static struct miscdevice gru_miscdev = { +@@ -472,7 +472,7 @@ static struct miscdevice gru_miscdev = { .fops = &gru_fops, }; -struct vm_operations_struct gru_vm_ops = { -+struct const vm_operations_struct gru_vm_ops = { ++const struct vm_operations_struct gru_vm_ops = { .close = gru_vma_close, .fault = gru_fault, }; -diff -urNp linux-2.6.29.6/drivers/mtd/devices/doc2000.c linux-2.6.29.6/drivers/mtd/devices/doc2000.c ---- linux-2.6.29.6/drivers/mtd/devices/doc2000.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/mtd/devices/doc2000.c 2009-07-23 17:34:32.128864545 -0400 -@@ -777,7 +777,7 @@ static int doc_write(struct mtd_info *mt +diff -urNp linux-2.6.30.4/drivers/misc/sgi-gru/grutables.h linux-2.6.30.4/drivers/misc/sgi-gru/grutables.h +--- linux-2.6.30.4/drivers/misc/sgi-gru/grutables.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/misc/sgi-gru/grutables.h 2009-07-30 17:46:28.013592240 -0400 +@@ -589,7 +589,7 @@ static inline void unlock_tgh_handle(str + */ + struct gru_unload_context_req; + +-extern struct vm_operations_struct gru_vm_ops; ++extern const struct vm_operations_struct gru_vm_ops; + extern struct device *grudev; + + extern struct gru_vma_data *gru_alloc_vma_data(struct vm_area_struct *vma, +diff -urNp linux-2.6.30.4/drivers/mmc/core/debugfs.c linux-2.6.30.4/drivers/mmc/core/debugfs.c +--- linux-2.6.30.4/drivers/mmc/core/debugfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/mmc/core/debugfs.c 2009-07-30 12:06:52.113899680 -0400 +@@ -240,7 +240,7 @@ static int mmc_ext_csd_release(struct in + return 0; + } + +-static struct file_operations mmc_dbg_ext_csd_fops = { ++static const struct file_operations mmc_dbg_ext_csd_fops = { + .open = mmc_ext_csd_open, + .read = mmc_ext_csd_read, + .release = mmc_ext_csd_release, +diff -urNp linux-2.6.30.4/drivers/mtd/devices/doc2000.c linux-2.6.30.4/drivers/mtd/devices/doc2000.c +--- linux-2.6.30.4/drivers/mtd/devices/doc2000.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/mtd/devices/doc2000.c 2009-07-30 09:48:10.037448258 -0400 +@@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt /* The ECC will not be calculated correctly if less than 512 is written */ /* DBB- @@ -19052,10 +18995,10 @@ diff -urNp linux-2.6.29.6/drivers/mtd/devices/doc2000.c linux-2.6.29.6/drivers/m printk(KERN_WARNING "ECC needs a full sector write (adr: %lx size %lx)\n", (long) to, (long) len); -diff -urNp linux-2.6.29.6/drivers/mtd/devices/doc2001.c linux-2.6.29.6/drivers/mtd/devices/doc2001.c ---- linux-2.6.29.6/drivers/mtd/devices/doc2001.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/mtd/devices/doc2001.c 2009-07-23 17:34:32.128864545 -0400 -@@ -396,6 +396,8 @@ static int doc_read (struct mtd_info *mt +diff -urNp linux-2.6.30.4/drivers/mtd/devices/doc2001.c linux-2.6.30.4/drivers/mtd/devices/doc2001.c +--- linux-2.6.30.4/drivers/mtd/devices/doc2001.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/mtd/devices/doc2001.c 2009-07-30 11:10:49.040301758 -0400 +@@ -395,6 +395,8 @@ static int doc_read (struct mtd_info *mt /* Don't allow read past end of device */ if (from >= this->totlen) return -EINVAL; @@ -19064,9 +19007,9 @@ diff -urNp linux-2.6.29.6/drivers/mtd/devices/doc2001.c linux-2.6.29.6/drivers/m /* Don't allow a single read to cross a 512-byte block boundary */ if (from + len > ((from | 0x1ff) + 1)) -diff -urNp linux-2.6.29.6/drivers/mtd/ubi/build.c linux-2.6.29.6/drivers/mtd/ubi/build.c ---- linux-2.6.29.6/drivers/mtd/ubi/build.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/mtd/ubi/build.c 2009-07-23 17:34:32.128864545 -0400 +diff -urNp linux-2.6.30.4/drivers/mtd/ubi/build.c linux-2.6.30.4/drivers/mtd/ubi/build.c +--- linux-2.6.30.4/drivers/mtd/ubi/build.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/mtd/ubi/build.c 2009-07-30 09:48:10.038828720 -0400 @@ -1112,7 +1112,7 @@ static int __init bytes_str_to_int(const unsigned long result; @@ -19076,57 +19019,9 @@ diff -urNp linux-2.6.29.6/drivers/mtd/ubi/build.c linux-2.6.29.6/drivers/mtd/ubi printk(KERN_ERR "UBI error: incorrect bytes count: \"%s\"\n", str); return -EINVAL; -diff -urNp linux-2.6.29.6/drivers/net/bonding/bond_main.c linux-2.6.29.6/drivers/net/bonding/bond_main.c ---- linux-2.6.29.6/drivers/net/bonding/bond_main.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/bonding/bond_main.c 2009-07-23 18:40:27.880597977 -0400 -@@ -3368,7 +3368,7 @@ static int bond_info_seq_show(struct seq - return 0; - } - --static struct seq_operations bond_info_seq_ops = { -+static const struct seq_operations bond_info_seq_ops = { - .start = bond_info_seq_start, - .next = bond_info_seq_next, - .stop = bond_info_seq_stop, -diff -urNp linux-2.6.29.6/drivers/net/hamradio/bpqether.c linux-2.6.29.6/drivers/net/hamradio/bpqether.c ---- linux-2.6.29.6/drivers/net/hamradio/bpqether.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/hamradio/bpqether.c 2009-07-23 18:40:27.886801730 -0400 -@@ -454,7 +454,7 @@ static int bpq_seq_show(struct seq_file - return 0; - } - --static struct seq_operations bpq_seqops = { -+static const struct seq_operations bpq_seqops = { - .start = bpq_seq_start, - .next = bpq_seq_next, - .stop = bpq_seq_stop, -diff -urNp linux-2.6.29.6/drivers/net/hamradio/scc.c linux-2.6.29.6/drivers/net/hamradio/scc.c ---- linux-2.6.29.6/drivers/net/hamradio/scc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/hamradio/scc.c 2009-07-23 18:40:27.887355447 -0400 -@@ -2073,7 +2073,7 @@ static int scc_net_seq_show(struct seq_f - return 0; - } - --static struct seq_operations scc_net_seq_ops = { -+static const struct seq_operations scc_net_seq_ops = { - .start = scc_net_seq_start, - .next = scc_net_seq_next, - .stop = scc_net_seq_stop, -diff -urNp linux-2.6.29.6/drivers/net/hamradio/yam.c linux-2.6.29.6/drivers/net/hamradio/yam.c ---- linux-2.6.29.6/drivers/net/hamradio/yam.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/hamradio/yam.c 2009-07-23 18:40:27.889386996 -0400 -@@ -787,7 +787,7 @@ static int yam_seq_show(struct seq_file - return 0; - } - --static struct seq_operations yam_seqops = { -+static const struct seq_operations yam_seqops = { - .start = yam_seq_start, - .next = yam_seq_next, - .stop = yam_seq_stop, -diff -urNp linux-2.6.29.6/drivers/net/irda/vlsi_ir.c linux-2.6.29.6/drivers/net/irda/vlsi_ir.c ---- linux-2.6.29.6/drivers/net/irda/vlsi_ir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/irda/vlsi_ir.c 2009-07-23 17:34:32.129778413 -0400 +diff -urNp linux-2.6.30.4/drivers/net/irda/vlsi_ir.c linux-2.6.30.4/drivers/net/irda/vlsi_ir.c +--- linux-2.6.30.4/drivers/net/irda/vlsi_ir.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/net/irda/vlsi_ir.c 2009-07-30 09:48:10.038828720 -0400 @@ -906,13 +906,12 @@ static int vlsi_hard_start_xmit(struct s /* no race - tx-ring already empty */ vlsi_set_baud(idev, iobase); @@ -19143,9 +19038,9 @@ diff -urNp linux-2.6.29.6/drivers/net/irda/vlsi_ir.c linux-2.6.29.6/drivers/net/ spin_unlock_irqrestore(&idev->lock, flags); dev_kfree_skb_any(skb); return 0; -diff -urNp linux-2.6.29.6/drivers/net/pcnet32.c linux-2.6.29.6/drivers/net/pcnet32.c ---- linux-2.6.29.6/drivers/net/pcnet32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/pcnet32.c 2009-07-23 17:34:32.129778413 -0400 +diff -urNp linux-2.6.30.4/drivers/net/pcnet32.c linux-2.6.30.4/drivers/net/pcnet32.c +--- linux-2.6.30.4/drivers/net/pcnet32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/net/pcnet32.c 2009-07-30 09:48:10.039525961 -0400 @@ -78,7 +78,7 @@ static int cards_found; /* * VLB I/O addresses @@ -19155,42 +19050,9 @@ diff -urNp linux-2.6.29.6/drivers/net/pcnet32.c linux-2.6.29.6/drivers/net/pcnet { 0x300, 0x320, 0x340, 0x360, 0 }; static int pcnet32_debug = 0; -diff -urNp linux-2.6.29.6/drivers/net/pppoe.c linux-2.6.29.6/drivers/net/pppoe.c ---- linux-2.6.29.6/drivers/net/pppoe.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/pppoe.c 2009-07-23 18:40:27.897571007 -0400 -@@ -1030,7 +1030,7 @@ static void pppoe_seq_stop(struct seq_fi - read_unlock_bh(&pppoe_hash_lock); - } - --static struct seq_operations pppoe_seq_ops = { -+static const struct seq_operations pppoe_seq_ops = { - .start = pppoe_seq_start, - .next = pppoe_seq_next, - .stop = pppoe_seq_stop, -diff -urNp linux-2.6.29.6/drivers/net/pppol2tp.c linux-2.6.29.6/drivers/net/pppol2tp.c ---- linux-2.6.29.6/drivers/net/pppol2tp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/pppol2tp.c 2009-07-23 18:40:27.913336405 -0400 -@@ -2517,7 +2517,7 @@ out: - return 0; - } - --static struct seq_operations pppol2tp_seq_ops = { -+static const struct seq_operations pppol2tp_seq_ops = { - .start = pppol2tp_seq_start, - .next = pppol2tp_seq_next, - .stop = pppol2tp_seq_stop, -@@ -2565,7 +2565,7 @@ static int pppol2tp_proc_release(struct - return seq_release(inode, file); - } - --static struct file_operations pppol2tp_proc_fops = { -+static const struct file_operations pppol2tp_proc_fops = { - .owner = THIS_MODULE, - .open = pppol2tp_proc_open, - .read = seq_read, -diff -urNp linux-2.6.29.6/drivers/net/tg3.h linux-2.6.29.6/drivers/net/tg3.h ---- linux-2.6.29.6/drivers/net/tg3.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/tg3.h 2009-07-23 17:34:32.130708691 -0400 +diff -urNp linux-2.6.30.4/drivers/net/tg3.h linux-2.6.30.4/drivers/net/tg3.h +--- linux-2.6.30.4/drivers/net/tg3.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/net/tg3.h 2009-07-30 09:48:10.040563677 -0400 @@ -89,6 +89,7 @@ #define CHIPREV_ID_5750_A0 0x4000 #define CHIPREV_ID_5750_A1 0x4001 @@ -19199,46 +19061,10 @@ diff -urNp linux-2.6.29.6/drivers/net/tg3.h linux-2.6.29.6/drivers/net/tg3.h #define CHIPREV_ID_5750_C2 0x4202 #define CHIPREV_ID_5752_A0_HW 0x5000 #define CHIPREV_ID_5752_A0 0x6000 -diff -urNp linux-2.6.29.6/drivers/net/wireless/ath5k/debug.c linux-2.6.29.6/drivers/net/wireless/ath5k/debug.c ---- linux-2.6.29.6/drivers/net/wireless/ath5k/debug.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/wireless/ath5k/debug.c 2009-07-23 18:40:27.920274556 -0400 -@@ -165,7 +165,7 @@ static int reg_show(struct seq_file *seq - return 0; - } - --static struct seq_operations register_seq_ops = { -+static const struct seq_operations register_seq_ops = { - .start = reg_start, - .next = reg_next, - .stop = reg_stop, -diff -urNp linux-2.6.29.6/drivers/net/wireless/libertas/debugfs.c linux-2.6.29.6/drivers/net/wireless/libertas/debugfs.c ---- linux-2.6.29.6/drivers/net/wireless/libertas/debugfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/wireless/libertas/debugfs.c 2009-07-23 18:40:27.933357619 -0400 -@@ -938,7 +938,7 @@ static ssize_t lbs_debugfs_write(struct - return (ssize_t)cnt; - } - --static struct file_operations lbs_debug_fops = { -+static const struct file_operations lbs_debug_fops = { - .owner = THIS_MODULE, - .open = open_file_generic, - .write = lbs_debugfs_write, -diff -urNp linux-2.6.29.6/drivers/net/wireless/strip.c linux-2.6.29.6/drivers/net/wireless/strip.c ---- linux-2.6.29.6/drivers/net/wireless/strip.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/net/wireless/strip.c 2009-07-23 18:40:27.958265010 -0400 -@@ -1125,7 +1125,7 @@ static int strip_seq_show(struct seq_fil - } - - --static struct seq_operations strip_seq_ops = { -+static const struct seq_operations strip_seq_ops = { - .start = strip_seq_start, - .next = strip_seq_next, - .stop = strip_seq_stop, -diff -urNp linux-2.6.29.6/drivers/oprofile/buffer_sync.c linux-2.6.29.6/drivers/oprofile/buffer_sync.c ---- linux-2.6.29.6/drivers/oprofile/buffer_sync.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/oprofile/buffer_sync.c 2009-07-23 17:34:32.130708691 -0400 -@@ -335,7 +335,7 @@ static void add_data(struct op_entry *en +diff -urNp linux-2.6.30.4/drivers/oprofile/buffer_sync.c linux-2.6.30.4/drivers/oprofile/buffer_sync.c +--- linux-2.6.30.4/drivers/oprofile/buffer_sync.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/oprofile/buffer_sync.c 2009-07-30 09:48:10.040563677 -0400 +@@ -341,7 +341,7 @@ static void add_data(struct op_entry *en if (cookie == NO_COOKIE) offset = pc; if (cookie == INVALID_COOKIE) { @@ -19247,7 +19073,7 @@ diff -urNp linux-2.6.29.6/drivers/oprofile/buffer_sync.c linux-2.6.29.6/drivers/ offset = pc; } if (cookie != last_cookie) { -@@ -379,14 +379,14 @@ add_sample(struct mm_struct *mm, struct +@@ -385,14 +385,14 @@ add_sample(struct mm_struct *mm, struct /* add userspace sample */ if (!mm) { @@ -19264,7 +19090,7 @@ diff -urNp linux-2.6.29.6/drivers/oprofile/buffer_sync.c linux-2.6.29.6/drivers/ return 0; } -@@ -555,7 +555,7 @@ void sync_buffer(int cpu) +@@ -561,7 +561,7 @@ void sync_buffer(int cpu) /* ignore backtraces if failed to add a sample */ if (state == sb_bt_start) { state = sb_bt_ignore; @@ -19273,9 +19099,9 @@ diff -urNp linux-2.6.29.6/drivers/oprofile/buffer_sync.c linux-2.6.29.6/drivers/ } } release_mm(mm); -diff -urNp linux-2.6.29.6/drivers/oprofile/event_buffer.c linux-2.6.29.6/drivers/oprofile/event_buffer.c ---- linux-2.6.29.6/drivers/oprofile/event_buffer.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/oprofile/event_buffer.c 2009-07-23 17:34:32.130708691 -0400 +diff -urNp linux-2.6.30.4/drivers/oprofile/event_buffer.c linux-2.6.30.4/drivers/oprofile/event_buffer.c +--- linux-2.6.30.4/drivers/oprofile/event_buffer.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/oprofile/event_buffer.c 2009-07-30 09:48:10.040563677 -0400 @@ -42,7 +42,7 @@ static atomic_t buffer_ready = ATOMIC_IN void add_event_entry(unsigned long value) { @@ -19285,9 +19111,9 @@ diff -urNp linux-2.6.29.6/drivers/oprofile/event_buffer.c linux-2.6.29.6/drivers return; } -diff -urNp linux-2.6.29.6/drivers/oprofile/oprofilefs.c linux-2.6.29.6/drivers/oprofile/oprofilefs.c ---- linux-2.6.29.6/drivers/oprofile/oprofilefs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/oprofile/oprofilefs.c 2009-07-23 18:40:27.469277997 -0400 +diff -urNp linux-2.6.30.4/drivers/oprofile/oprofilefs.c linux-2.6.30.4/drivers/oprofile/oprofilefs.c +--- linux-2.6.30.4/drivers/oprofile/oprofilefs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/oprofile/oprofilefs.c 2009-07-30 09:48:10.043540480 -0400 @@ -35,7 +35,7 @@ static struct inode *oprofilefs_get_inod } @@ -19306,9 +19132,9 @@ diff -urNp linux-2.6.29.6/drivers/oprofile/oprofilefs.c linux-2.6.29.6/drivers/o { struct dentry *d = __oprofilefs_create_file(sb, root, name, &atomic_ro_fops, 0444); -diff -urNp linux-2.6.29.6/drivers/oprofile/oprofile_stats.h linux-2.6.29.6/drivers/oprofile/oprofile_stats.h ---- linux-2.6.29.6/drivers/oprofile/oprofile_stats.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/oprofile/oprofile_stats.h 2009-07-23 17:34:32.131798606 -0400 +diff -urNp linux-2.6.30.4/drivers/oprofile/oprofile_stats.h linux-2.6.30.4/drivers/oprofile/oprofile_stats.h +--- linux-2.6.30.4/drivers/oprofile/oprofile_stats.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/oprofile/oprofile_stats.h 2009-07-30 09:48:10.043540480 -0400 @@ -13,10 +13,10 @@ #include <asm/atomic.h> @@ -19324,9 +19150,9 @@ diff -urNp linux-2.6.29.6/drivers/oprofile/oprofile_stats.h linux-2.6.29.6/drive }; extern struct oprofile_stat_struct oprofile_stats; -diff -urNp linux-2.6.29.6/drivers/pci/hotplug/cpqphp.h linux-2.6.29.6/drivers/pci/hotplug/cpqphp.h ---- linux-2.6.29.6/drivers/pci/hotplug/cpqphp.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pci/hotplug/cpqphp.h 2009-07-23 18:40:27.972087415 -0400 +diff -urNp linux-2.6.30.4/drivers/pci/hotplug/cpqphp.h linux-2.6.30.4/drivers/pci/hotplug/cpqphp.h +--- linux-2.6.30.4/drivers/pci/hotplug/cpqphp.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pci/hotplug/cpqphp.h 2009-07-30 09:48:10.043540480 -0400 @@ -449,7 +449,7 @@ extern u8 cpqhp_disk_irq; /* inline functions */ @@ -19336,9 +19162,9 @@ diff -urNp linux-2.6.29.6/drivers/pci/hotplug/cpqphp.h linux-2.6.29.6/drivers/pc { return hotplug_slot_name(slot->hotplug_slot); } -diff -urNp linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c ---- linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c 2009-07-23 17:34:32.131798606 -0400 +diff -urNp linux-2.6.30.4/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.30.4/drivers/pci/hotplug/cpqphp_nvram.c +--- linux-2.6.30.4/drivers/pci/hotplug/cpqphp_nvram.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pci/hotplug/cpqphp_nvram.c 2009-07-30 09:48:10.043540480 -0400 @@ -425,9 +425,13 @@ static u32 store_HRT (void __iomem *rom_ void compaq_nvram_init (void __iomem *rom_start) @@ -19353,21 +19179,9 @@ diff -urNp linux-2.6.29.6/drivers/pci/hotplug/cpqphp_nvram.c linux-2.6.29.6/driv dbg("int15 entry = %p\n", compaq_int15_entry_point); /* initialize our int15 lock */ -diff -urNp linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c ---- linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv.c 2009-07-23 17:34:32.131798606 -0400 -@@ -59,7 +59,7 @@ static struct pcie_port_service_id aer_i - .port_type = PCIE_RC_PORT, - .service_type = PCIE_PORT_SERVICE_AER, - }, -- { /* end: all zeroes */ } -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }; - - static struct pci_error_handlers aer_error_handlers = { -diff -urNp linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c ---- linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c 2009-07-23 17:34:32.132779386 -0400 +diff -urNp linux-2.6.30.4/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.30.4/drivers/pci/pcie/aer/aerdrv_core.c +--- linux-2.6.30.4/drivers/pci/pcie/aer/aerdrv_core.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pci/pcie/aer/aerdrv_core.c 2009-07-30 09:48:10.044753152 -0400 @@ -670,7 +670,7 @@ static void aer_isr_one_error(struct pci struct aer_err_source *e_src) { @@ -19377,10 +19191,10 @@ diff -urNp linux-2.6.29.6/drivers/pci/pcie/aer/aerdrv_core.c linux-2.6.29.6/driv int i; u16 id; -diff -urNp linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c ---- linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c 2009-07-23 17:34:32.132779386 -0400 -@@ -260,7 +260,7 @@ static void pcie_portdrv_err_resume(stru +diff -urNp linux-2.6.30.4/drivers/pci/pcie/portdrv_pci.c linux-2.6.30.4/drivers/pci/pcie/portdrv_pci.c +--- linux-2.6.30.4/drivers/pci/pcie/portdrv_pci.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pci/pcie/portdrv_pci.c 2009-07-30 09:48:10.044753152 -0400 +@@ -249,7 +249,7 @@ static void pcie_portdrv_err_resume(stru static const struct pci_device_id port_pci_ids[] = { { /* handle any PCI-Express port */ PCI_DEVICE_CLASS(((PCI_CLASS_BRIDGE_PCI << 8) | 0x00), ~0), @@ -19389,9 +19203,9 @@ diff -urNp linux-2.6.29.6/drivers/pci/pcie/portdrv_pci.c linux-2.6.29.6/drivers/ }; MODULE_DEVICE_TABLE(pci, port_pci_ids); -diff -urNp linux-2.6.29.6/drivers/pci/proc.c linux-2.6.29.6/drivers/pci/proc.c ---- linux-2.6.29.6/drivers/pci/proc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pci/proc.c 2009-07-23 17:34:32.132779386 -0400 +diff -urNp linux-2.6.30.4/drivers/pci/proc.c linux-2.6.30.4/drivers/pci/proc.c +--- linux-2.6.30.4/drivers/pci/proc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pci/proc.c 2009-07-30 11:10:49.067392504 -0400 @@ -480,7 +480,16 @@ static const struct file_operations proc static int __init pci_proc_init(void) { @@ -19409,9 +19223,9 @@ diff -urNp linux-2.6.29.6/drivers/pci/proc.c linux-2.6.29.6/drivers/pci/proc.c proc_create("devices", 0, proc_bus_pci_dir, &proc_bus_pci_dev_operations); proc_initialized = 1; -diff -urNp linux-2.6.29.6/drivers/pcmcia/ti113x.h linux-2.6.29.6/drivers/pcmcia/ti113x.h ---- linux-2.6.29.6/drivers/pcmcia/ti113x.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pcmcia/ti113x.h 2009-07-23 17:34:32.132779386 -0400 +diff -urNp linux-2.6.30.4/drivers/pcmcia/ti113x.h linux-2.6.30.4/drivers/pcmcia/ti113x.h +--- linux-2.6.30.4/drivers/pcmcia/ti113x.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pcmcia/ti113x.h 2009-07-30 09:48:10.044753152 -0400 @@ -903,7 +903,7 @@ static struct pci_device_id ene_tune_tbl DEVID(PCI_VENDOR_ID_MOTOROLA, 0x3410, 0xECC0, PCI_ANY_ID, ENE_TEST_C9_TLTENABLE | ENE_TEST_C9_PFENABLE, ENE_TEST_C9_TLTENABLE), @@ -19421,9 +19235,9 @@ diff -urNp linux-2.6.29.6/drivers/pcmcia/ti113x.h linux-2.6.29.6/drivers/pcmcia/ }; static void ene_tune_bridge(struct pcmcia_socket *sock, struct pci_bus *bus) -diff -urNp linux-2.6.29.6/drivers/pcmcia/yenta_socket.c linux-2.6.29.6/drivers/pcmcia/yenta_socket.c ---- linux-2.6.29.6/drivers/pcmcia/yenta_socket.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pcmcia/yenta_socket.c 2009-07-23 17:34:32.133745041 -0400 +diff -urNp linux-2.6.30.4/drivers/pcmcia/yenta_socket.c linux-2.6.30.4/drivers/pcmcia/yenta_socket.c +--- linux-2.6.30.4/drivers/pcmcia/yenta_socket.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pcmcia/yenta_socket.c 2009-07-30 09:48:10.045642944 -0400 @@ -1366,7 +1366,7 @@ static struct pci_device_id yenta_table /* match any cardbus bridge */ @@ -19433,9 +19247,9 @@ diff -urNp linux-2.6.29.6/drivers/pcmcia/yenta_socket.c linux-2.6.29.6/drivers/p }; MODULE_DEVICE_TABLE(pci, yenta_table); -diff -urNp linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c ---- linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c 2009-07-23 17:34:32.133745041 -0400 +diff -urNp linux-2.6.30.4/drivers/pnp/pnpbios/bioscalls.c linux-2.6.30.4/drivers/pnp/pnpbios/bioscalls.c +--- linux-2.6.30.4/drivers/pnp/pnpbios/bioscalls.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pnp/pnpbios/bioscalls.c 2009-07-30 09:48:10.045642944 -0400 @@ -60,7 +60,7 @@ set_base(gdt[(selname) >> 3], (u32)(addr set_limit(gdt[(selname) >> 3], size); \ } while(0) @@ -19528,9 +19342,9 @@ diff -urNp linux-2.6.29.6/drivers/pnp/pnpbios/bioscalls.c linux-2.6.29.6/drivers +#endif + } -diff -urNp linux-2.6.29.6/drivers/pnp/quirks.c linux-2.6.29.6/drivers/pnp/quirks.c ---- linux-2.6.29.6/drivers/pnp/quirks.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pnp/quirks.c 2009-07-23 17:34:32.133745041 -0400 +diff -urNp linux-2.6.30.4/drivers/pnp/quirks.c linux-2.6.30.4/drivers/pnp/quirks.c +--- linux-2.6.30.4/drivers/pnp/quirks.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pnp/quirks.c 2009-07-30 09:48:10.045642944 -0400 @@ -327,7 +327,7 @@ static struct pnp_fixup pnp_fixups[] = { /* PnP resources that might overlap PCI BARs */ {"PNP0c01", quirk_system_pci_resources}, @@ -19540,9 +19354,9 @@ diff -urNp linux-2.6.29.6/drivers/pnp/quirks.c linux-2.6.29.6/drivers/pnp/quirks }; void pnp_fixup_device(struct pnp_dev *dev) -diff -urNp linux-2.6.29.6/drivers/pnp/resource.c linux-2.6.29.6/drivers/pnp/resource.c ---- linux-2.6.29.6/drivers/pnp/resource.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/pnp/resource.c 2009-07-23 17:34:32.133745041 -0400 +diff -urNp linux-2.6.30.4/drivers/pnp/resource.c linux-2.6.30.4/drivers/pnp/resource.c +--- linux-2.6.30.4/drivers/pnp/resource.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/pnp/resource.c 2009-07-30 09:48:10.045642944 -0400 @@ -355,7 +355,7 @@ int pnp_check_irq(struct pnp_dev *dev, s return 1; @@ -19561,10 +19375,10 @@ diff -urNp linux-2.6.29.6/drivers/pnp/resource.c linux-2.6.29.6/drivers/pnp/reso return 0; /* check if the resource is reserved */ -diff -urNp linux-2.6.29.6/drivers/s390/cio/qdio_debug.c linux-2.6.29.6/drivers/s390/cio/qdio_debug.c ---- linux-2.6.29.6/drivers/s390/cio/qdio_debug.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/s390/cio/qdio_debug.c 2009-07-23 18:40:27.977694137 -0400 -@@ -144,7 +144,7 @@ static void remove_debugfs_entry(struct +diff -urNp linux-2.6.30.4/drivers/s390/cio/qdio_debug.c linux-2.6.30.4/drivers/s390/cio/qdio_debug.c +--- linux-2.6.30.4/drivers/s390/cio/qdio_debug.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/s390/cio/qdio_debug.c 2009-07-30 09:48:10.046735063 -0400 +@@ -145,7 +145,7 @@ static void remove_debugfs_entry(struct } } @@ -19573,9 +19387,9 @@ diff -urNp linux-2.6.29.6/drivers/s390/cio/qdio_debug.c linux-2.6.29.6/drivers/s .owner = THIS_MODULE, .open = qstat_seq_open, .read = seq_read, -diff -urNp linux-2.6.29.6/drivers/s390/cio/qdio_perf.c linux-2.6.29.6/drivers/s390/cio/qdio_perf.c ---- linux-2.6.29.6/drivers/s390/cio/qdio_perf.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/s390/cio/qdio_perf.c 2009-07-23 18:40:27.982430466 -0400 +diff -urNp linux-2.6.30.4/drivers/s390/cio/qdio_perf.c linux-2.6.30.4/drivers/s390/cio/qdio_perf.c +--- linux-2.6.30.4/drivers/s390/cio/qdio_perf.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/s390/cio/qdio_perf.c 2009-07-30 09:48:10.046735063 -0400 @@ -96,7 +96,7 @@ static int qdio_perf_seq_open(struct ino return single_open(filp, qdio_perf_proc_show, NULL); } @@ -19585,9 +19399,9 @@ diff -urNp linux-2.6.29.6/drivers/s390/cio/qdio_perf.c linux-2.6.29.6/drivers/s3 .owner = THIS_MODULE, .open = qdio_perf_seq_open, .read = seq_read, -diff -urNp linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c ---- linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c 2009-07-23 17:34:32.134722055 -0400 +diff -urNp linux-2.6.30.4/drivers/scsi/libfc/fc_exch.c linux-2.6.30.4/drivers/scsi/libfc/fc_exch.c +--- linux-2.6.30.4/drivers/scsi/libfc/fc_exch.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/scsi/libfc/fc_exch.c 2009-07-30 09:48:10.047458850 -0400 @@ -84,12 +84,12 @@ struct fc_exch_mgr { * all together if not used XXX */ @@ -19705,84 +19519,9 @@ diff -urNp linux-2.6.29.6/drivers/scsi/libfc/fc_exch.c linux-2.6.29.6/drivers/sc FC_DEBUG_EXCH("non-BLS response to sequence"); } fc_frame_free(fp); -diff -urNp linux-2.6.29.6/drivers/scsi/lpfc/lpfc_debugfs.c linux-2.6.29.6/drivers/scsi/lpfc/lpfc_debugfs.c ---- linux-2.6.29.6/drivers/scsi/lpfc/lpfc_debugfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/scsi/lpfc/lpfc_debugfs.c 2009-07-23 18:40:27.982430466 -0400 -@@ -1132,7 +1132,7 @@ lpfc_debugfs_dumpDataDif_release(struct - } - - #undef lpfc_debugfs_op_disc_trc --static struct file_operations lpfc_debugfs_op_disc_trc = { -+static const struct file_operations lpfc_debugfs_op_disc_trc = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_disc_trc_open, - .llseek = lpfc_debugfs_lseek, -@@ -1141,7 +1141,7 @@ static struct file_operations lpfc_debug - }; - - #undef lpfc_debugfs_op_nodelist --static struct file_operations lpfc_debugfs_op_nodelist = { -+static const struct file_operations lpfc_debugfs_op_nodelist = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_nodelist_open, - .llseek = lpfc_debugfs_lseek, -@@ -1150,7 +1150,7 @@ static struct file_operations lpfc_debug - }; - - #undef lpfc_debugfs_op_hbqinfo --static struct file_operations lpfc_debugfs_op_hbqinfo = { -+static const struct file_operations lpfc_debugfs_op_hbqinfo = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_hbqinfo_open, - .llseek = lpfc_debugfs_lseek, -@@ -1159,7 +1159,7 @@ static struct file_operations lpfc_debug - }; - - #undef lpfc_debugfs_op_dumpHBASlim --static struct file_operations lpfc_debugfs_op_dumpHBASlim = { -+static const struct file_operations lpfc_debugfs_op_dumpHBASlim = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_dumpHBASlim_open, - .llseek = lpfc_debugfs_lseek, -@@ -1168,7 +1168,7 @@ static struct file_operations lpfc_debug - }; - - #undef lpfc_debugfs_op_dumpHostSlim --static struct file_operations lpfc_debugfs_op_dumpHostSlim = { -+static const struct file_operations lpfc_debugfs_op_dumpHostSlim = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_dumpHostSlim_open, - .llseek = lpfc_debugfs_lseek, -@@ -1177,7 +1177,7 @@ static struct file_operations lpfc_debug - }; - - #undef lpfc_debugfs_op_dumpData --static struct file_operations lpfc_debugfs_op_dumpData = { -+static const struct file_operations lpfc_debugfs_op_dumpData = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_dumpData_open, - .llseek = lpfc_debugfs_lseek, -@@ -1187,7 +1187,7 @@ static struct file_operations lpfc_debug - }; - - #undef lpfc_debugfs_op_dumpDif --static struct file_operations lpfc_debugfs_op_dumpDif = { -+static const struct file_operations lpfc_debugfs_op_dumpDif = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_dumpDif_open, - .llseek = lpfc_debugfs_lseek, -@@ -1197,7 +1197,7 @@ static struct file_operations lpfc_debug - }; - - #undef lpfc_debugfs_op_slow_ring_trc --static struct file_operations lpfc_debugfs_op_slow_ring_trc = { -+static const struct file_operations lpfc_debugfs_op_slow_ring_trc = { - .owner = THIS_MODULE, - .open = lpfc_debugfs_slow_ring_trc_open, - .llseek = lpfc_debugfs_lseek, -diff -urNp linux-2.6.29.6/drivers/scsi/scsi_logging.h linux-2.6.29.6/drivers/scsi/scsi_logging.h ---- linux-2.6.29.6/drivers/scsi/scsi_logging.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/scsi/scsi_logging.h 2009-07-23 17:34:32.134722055 -0400 +diff -urNp linux-2.6.30.4/drivers/scsi/scsi_logging.h linux-2.6.30.4/drivers/scsi/scsi_logging.h +--- linux-2.6.30.4/drivers/scsi/scsi_logging.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/scsi/scsi_logging.h 2009-07-30 09:48:10.047458850 -0400 @@ -51,7 +51,7 @@ do { \ } while (0); \ } while (0) @@ -19792,10 +19531,10 @@ diff -urNp linux-2.6.29.6/drivers/scsi/scsi_logging.h linux-2.6.29.6/drivers/scs #endif /* CONFIG_SCSI_LOGGING */ /* -diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c ---- linux-2.6.29.6/drivers/scsi/sg.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/scsi/sg.c 2009-07-23 18:40:27.983261819 -0400 -@@ -1197,7 +1197,7 @@ sg_vma_fault(struct vm_area_struct *vma, +diff -urNp linux-2.6.30.4/drivers/scsi/sg.c linux-2.6.30.4/drivers/scsi/sg.c +--- linux-2.6.30.4/drivers/scsi/sg.c 2009-07-30 20:32:40.512605937 -0400 ++++ linux-2.6.30.4/drivers/scsi/sg.c 2009-07-30 20:32:47.966608613 -0400 +@@ -1186,7 +1186,7 @@ sg_vma_fault(struct vm_area_struct *vma, return VM_FAULT_SIGBUS; } @@ -19804,7 +19543,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .fault = sg_vma_fault, }; -@@ -1329,7 +1329,7 @@ static void sg_rq_end_io(struct request +@@ -1318,7 +1318,7 @@ static void sg_rq_end_io(struct request } } @@ -19813,7 +19552,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .owner = THIS_MODULE, .read = sg_read, .write = sg_write, -@@ -2222,8 +2222,11 @@ static int sg_proc_seq_show_int(struct s +@@ -2194,8 +2194,11 @@ static int sg_proc_seq_show_int(struct s static int sg_proc_single_open_adio(struct inode *inode, struct file *file); static ssize_t sg_proc_write_adio(struct file *filp, const char __user *buffer, size_t count, loff_t *off); @@ -19827,7 +19566,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .open = sg_proc_single_open_adio, .write = sg_proc_write_adio, .release = single_release, -@@ -2232,7 +2235,10 @@ static struct file_operations adio_fops +@@ -2204,7 +2207,10 @@ static struct file_operations adio_fops static int sg_proc_single_open_dressz(struct inode *inode, struct file *file); static ssize_t sg_proc_write_dressz(struct file *filp, const char __user *buffer, size_t count, loff_t *off); @@ -19839,7 +19578,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .open = sg_proc_single_open_dressz, .write = sg_proc_write_dressz, .release = single_release, -@@ -2240,14 +2246,20 @@ static struct file_operations dressz_fop +@@ -2212,14 +2218,20 @@ static struct file_operations dressz_fop static int sg_proc_seq_show_version(struct seq_file *s, void *v); static int sg_proc_single_open_version(struct inode *inode, struct file *file); @@ -19862,7 +19601,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .open = sg_proc_single_open_devhdr, .release = single_release, }; -@@ -2257,11 +2269,14 @@ static int sg_proc_open_dev(struct inode +@@ -2229,11 +2241,14 @@ static int sg_proc_open_dev(struct inode static void * dev_seq_start(struct seq_file *s, loff_t *pos); static void * dev_seq_next(struct seq_file *s, void *v, loff_t *pos); static void dev_seq_stop(struct seq_file *s, void *v); @@ -19879,7 +19618,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .start = dev_seq_start, .next = dev_seq_next, .stop = dev_seq_stop, -@@ -2270,11 +2285,14 @@ static struct seq_operations dev_seq_ops +@@ -2242,11 +2257,14 @@ static struct seq_operations dev_seq_ops static int sg_proc_seq_show_devstrs(struct seq_file *s, void *v); static int sg_proc_open_devstrs(struct inode *inode, struct file *file); @@ -19896,7 +19635,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .start = dev_seq_start, .next = dev_seq_next, .stop = dev_seq_stop, -@@ -2283,11 +2301,14 @@ static struct seq_operations devstrs_seq +@@ -2255,11 +2273,14 @@ static struct seq_operations devstrs_seq static int sg_proc_seq_show_debug(struct seq_file *s, void *v); static int sg_proc_open_debug(struct inode *inode, struct file *file); @@ -19913,7 +19652,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c .start = dev_seq_start, .next = dev_seq_next, .stop = dev_seq_stop, -@@ -2297,7 +2318,7 @@ static struct seq_operations debug_seq_o +@@ -2269,7 +2290,7 @@ static struct seq_operations debug_seq_o struct sg_proc_leaf { const char * name; @@ -19922,7 +19661,7 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c }; static struct sg_proc_leaf sg_proc_leaf_arr[] = { -@@ -2323,9 +2344,6 @@ sg_proc_init(void) +@@ -2295,9 +2316,6 @@ sg_proc_init(void) for (k = 0; k < num_leaves; ++k) { leaf = &sg_proc_leaf_arr[k]; mask = leaf->fops->write ? S_IRUGO | S_IWUSR : S_IRUGO; @@ -19932,10 +19671,10 @@ diff -urNp linux-2.6.29.6/drivers/scsi/sg.c linux-2.6.29.6/drivers/scsi/sg.c proc_create(leaf->name, mask, sg_proc_sgp, leaf->fops); } return 0; -diff -urNp linux-2.6.29.6/drivers/serial/8250_pci.c linux-2.6.29.6/drivers/serial/8250_pci.c ---- linux-2.6.29.6/drivers/serial/8250_pci.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/serial/8250_pci.c 2009-07-23 17:34:32.135751373 -0400 -@@ -3162,7 +3162,7 @@ static struct pci_device_id serial_pci_t +diff -urNp linux-2.6.30.4/drivers/serial/8250_pci.c linux-2.6.30.4/drivers/serial/8250_pci.c +--- linux-2.6.30.4/drivers/serial/8250_pci.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/serial/8250_pci.c 2009-07-30 09:48:10.048531085 -0400 +@@ -3572,7 +3572,7 @@ static struct pci_device_id serial_pci_t PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_COMMUNICATION_MULTISERIAL << 8, 0xffff00, pbn_default }, @@ -19944,9 +19683,9 @@ diff -urNp linux-2.6.29.6/drivers/serial/8250_pci.c linux-2.6.29.6/drivers/seria }; static struct pci_driver serial_pci_driver = { -diff -urNp linux-2.6.29.6/drivers/spi/spidev.c linux-2.6.29.6/drivers/spi/spidev.c ---- linux-2.6.29.6/drivers/spi/spidev.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/spi/spidev.c 2009-07-23 18:40:27.984271636 -0400 +diff -urNp linux-2.6.30.4/drivers/spi/spidev.c linux-2.6.30.4/drivers/spi/spidev.c +--- linux-2.6.30.4/drivers/spi/spidev.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/spi/spidev.c 2009-07-30 09:48:10.049614710 -0400 @@ -532,7 +532,7 @@ static int spidev_release(struct inode * return status; } @@ -19956,23 +19695,11 @@ diff -urNp linux-2.6.29.6/drivers/spi/spidev.c linux-2.6.29.6/drivers/spi/spidev .owner = THIS_MODULE, /* REVISIT switch to aio primitives, so that userspace * gets more complete API coverage. It'll simplify things -diff -urNp linux-2.6.29.6/drivers/staging/altpciechdma/altpciechdma.c linux-2.6.29.6/drivers/staging/altpciechdma/altpciechdma.c ---- linux-2.6.29.6/drivers/staging/altpciechdma/altpciechdma.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/altpciechdma/altpciechdma.c 2009-07-23 18:40:27.989802153 -0400 -@@ -1085,7 +1085,7 @@ static ssize_t sg_write(struct file *fil - /* - * character device file operations - */ --static struct file_operations sg_fops = { -+static const struct file_operations sg_fops = { - .owner = THIS_MODULE, - .open = sg_open, - .release = sg_close, -diff -urNp linux-2.6.29.6/drivers/staging/android/binder.c linux-2.6.29.6/drivers/staging/android/binder.c ---- linux-2.6.29.6/drivers/staging/android/binder.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/android/binder.c 2009-07-23 18:40:28.031683554 -0400 -@@ -2660,7 +2660,7 @@ static void binder_vma_close(struct vm_a - proc->vma = NULL; +diff -urNp linux-2.6.30.4/drivers/staging/android/binder.c linux-2.6.30.4/drivers/staging/android/binder.c +--- linux-2.6.30.4/drivers/staging/android/binder.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/android/binder.c 2009-07-30 12:07:09.614975906 -0400 +@@ -2699,7 +2699,7 @@ static void binder_vma_close(struct vm_a + binder_defer_work(proc, BINDER_DEFERRED_PUT_FILES); } -static struct vm_operations_struct binder_vm_ops = { @@ -19980,7 +19707,7 @@ diff -urNp linux-2.6.29.6/drivers/staging/android/binder.c linux-2.6.29.6/driver .open = binder_vma_open, .close = binder_vma_close, }; -@@ -3464,7 +3464,7 @@ static int binder_read_proc_transaction_ +@@ -3579,7 +3579,7 @@ static int binder_read_proc_transaction_ return len < count ? len : count; } @@ -19989,9 +19716,9 @@ diff -urNp linux-2.6.29.6/drivers/staging/android/binder.c linux-2.6.29.6/driver .owner = THIS_MODULE, .poll = binder_poll, .unlocked_ioctl = binder_ioctl, -diff -urNp linux-2.6.29.6/drivers/staging/android/logger.c linux-2.6.29.6/drivers/staging/android/logger.c ---- linux-2.6.29.6/drivers/staging/android/logger.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/android/logger.c 2009-07-23 18:40:28.043741799 -0400 +diff -urNp linux-2.6.30.4/drivers/staging/android/logger.c linux-2.6.30.4/drivers/staging/android/logger.c +--- linux-2.6.30.4/drivers/staging/android/logger.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/android/logger.c 2009-07-30 09:48:10.050638667 -0400 @@ -519,7 +519,7 @@ static long logger_ioctl(struct file *fi return ret; } @@ -20001,9 +19728,9 @@ diff -urNp linux-2.6.29.6/drivers/staging/android/logger.c linux-2.6.29.6/driver .owner = THIS_MODULE, .read = logger_read, .aio_write = logger_aio_write, -diff -urNp linux-2.6.29.6/drivers/staging/android/ram_console.c linux-2.6.29.6/drivers/staging/android/ram_console.c ---- linux-2.6.29.6/drivers/staging/android/ram_console.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/android/ram_console.c 2009-07-23 18:40:28.044366592 -0400 +diff -urNp linux-2.6.30.4/drivers/staging/android/ram_console.c linux-2.6.30.4/drivers/staging/android/ram_console.c +--- linux-2.6.30.4/drivers/staging/android/ram_console.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/android/ram_console.c 2009-07-30 09:48:10.050638667 -0400 @@ -365,7 +365,7 @@ static ssize_t ram_console_read_old(stru return count; } @@ -20013,10 +19740,31 @@ diff -urNp linux-2.6.29.6/drivers/staging/android/ram_console.c linux-2.6.29.6/d .owner = THIS_MODULE, .read = ram_console_read_old, }; -diff -urNp linux-2.6.29.6/drivers/staging/comedi/comedi_fops.c linux-2.6.29.6/drivers/staging/comedi/comedi_fops.c ---- linux-2.6.29.6/drivers/staging/comedi/comedi_fops.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/comedi/comedi_fops.c 2009-07-23 18:40:28.047286541 -0400 -@@ -1385,7 +1385,7 @@ void comedi_unmap(struct vm_area_struct +diff -urNp linux-2.6.30.4/drivers/staging/b3dfg/b3dfg.c linux-2.6.30.4/drivers/staging/b3dfg/b3dfg.c +--- linux-2.6.30.4/drivers/staging/b3dfg/b3dfg.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/b3dfg/b3dfg.c 2009-07-30 12:07:09.622002360 -0400 +@@ -455,7 +455,7 @@ static int b3dfg_vma_fault(struct vm_are + return VM_FAULT_NOPAGE; + } + +-static struct vm_operations_struct b3dfg_vm_ops = { ++static const struct vm_operations_struct b3dfg_vm_ops = { + .fault = b3dfg_vma_fault, + }; + +@@ -855,7 +855,7 @@ static int b3dfg_mmap(struct file *filp, + return r; + } + +-static struct file_operations b3dfg_fops = { ++static const struct file_operations b3dfg_fops = { + .owner = THIS_MODULE, + .open = b3dfg_open, + .release = b3dfg_release, +diff -urNp linux-2.6.30.4/drivers/staging/comedi/comedi_fops.c linux-2.6.30.4/drivers/staging/comedi/comedi_fops.c +--- linux-2.6.30.4/drivers/staging/comedi/comedi_fops.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/comedi/comedi_fops.c 2009-07-30 09:48:10.051586138 -0400 +@@ -1395,7 +1395,7 @@ void comedi_unmap(struct vm_area_struct mutex_unlock(&dev->mutex); } @@ -20025,10 +19773,10 @@ diff -urNp linux-2.6.29.6/drivers/staging/comedi/comedi_fops.c linux-2.6.29.6/dr .close = comedi_unmap, }; -diff -urNp linux-2.6.29.6/drivers/staging/epl/EplApiLinuxKernel.c linux-2.6.29.6/drivers/staging/epl/EplApiLinuxKernel.c ---- linux-2.6.29.6/drivers/staging/epl/EplApiLinuxKernel.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/epl/EplApiLinuxKernel.c 2009-07-23 18:40:28.056426086 -0400 -@@ -231,7 +231,7 @@ EXPORT_NO_SYMBOLS; +diff -urNp linux-2.6.30.4/drivers/staging/epl/EplApiLinuxKernel.c linux-2.6.30.4/drivers/staging/epl/EplApiLinuxKernel.c +--- linux-2.6.30.4/drivers/staging/epl/EplApiLinuxKernel.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/epl/EplApiLinuxKernel.c 2009-07-30 09:48:10.051586138 -0400 +@@ -203,7 +203,7 @@ static int EplLinIoctl(struct inode *pDe module_init(EplLinInit); module_exit(EplLinExit); @@ -20037,9 +19785,9 @@ diff -urNp linux-2.6.29.6/drivers/staging/epl/EplApiLinuxKernel.c linux-2.6.29.6 .owner = THIS_MODULE, .open = EplLinOpen, .release = EplLinRelease, -diff -urNp linux-2.6.29.6/drivers/staging/go7007/go7007-v4l2.c linux-2.6.29.6/drivers/staging/go7007/go7007-v4l2.c ---- linux-2.6.29.6/drivers/staging/go7007/go7007-v4l2.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/go7007/go7007-v4l2.c 2009-07-23 18:40:28.061800902 -0400 +diff -urNp linux-2.6.30.4/drivers/staging/go7007/go7007-v4l2.c linux-2.6.30.4/drivers/staging/go7007/go7007-v4l2.c +--- linux-2.6.30.4/drivers/staging/go7007/go7007-v4l2.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/go7007/go7007-v4l2.c 2009-07-30 09:48:10.052768252 -0400 @@ -1717,7 +1717,7 @@ static int go7007_vm_fault(struct vm_are return 0; } @@ -20049,125 +19797,10 @@ diff -urNp linux-2.6.29.6/drivers/staging/go7007/go7007-v4l2.c linux-2.6.29.6/dr .open = go7007_vm_open, .close = go7007_vm_close, .fault = go7007_vm_fault, -diff -urNp linux-2.6.29.6/drivers/staging/me4000/me4000.c linux-2.6.29.6/drivers/staging/me4000/me4000.c ---- linux-2.6.29.6/drivers/staging/me4000/me4000.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/me4000/me4000.c 2009-07-23 18:40:28.080446994 -0400 -@@ -309,7 +309,7 @@ static struct pci_driver me4000_driver = - .probe = me4000_probe - }; - --static struct file_operations me4000_ao_fops_sing = { -+static const struct file_operations me4000_ao_fops_sing = { - .owner = THIS_MODULE, - .write = me4000_ao_write_sing, - .ioctl = me4000_ao_ioctl_sing, -@@ -317,7 +317,7 @@ static struct file_operations me4000_ao_ - .release = me4000_release, - }; - --static struct file_operations me4000_ao_fops_wrap = { -+static const struct file_operations me4000_ao_fops_wrap = { - .owner = THIS_MODULE, - .write = me4000_ao_write_wrap, - .ioctl = me4000_ao_ioctl_wrap, -@@ -325,7 +325,7 @@ static struct file_operations me4000_ao_ - .release = me4000_release, - }; - --static struct file_operations me4000_ao_fops_cont = { -+static const struct file_operations me4000_ao_fops_cont = { - .owner = THIS_MODULE, - .write = me4000_ao_write_cont, - .poll = me4000_ao_poll_cont, -@@ -335,14 +335,14 @@ static struct file_operations me4000_ao_ - .fsync = me4000_ao_fsync_cont, - }; - --static struct file_operations me4000_ai_fops_sing = { -+static const struct file_operations me4000_ai_fops_sing = { - .owner = THIS_MODULE, - .ioctl = me4000_ai_ioctl_sing, - .open = me4000_open, - .release = me4000_release, - }; - --static struct file_operations me4000_ai_fops_cont_sw = { -+static const struct file_operations me4000_ai_fops_cont_sw = { - .owner = THIS_MODULE, - .read = me4000_ai_read, - .poll = me4000_ai_poll, -@@ -352,7 +352,7 @@ static struct file_operations me4000_ai_ - .fasync = me4000_ai_fasync, - }; - --static struct file_operations me4000_ai_fops_cont_et = { -+static const struct file_operations me4000_ai_fops_cont_et = { - .owner = THIS_MODULE, - .read = me4000_ai_read, - .poll = me4000_ai_poll, -@@ -361,7 +361,7 @@ static struct file_operations me4000_ai_ - .release = me4000_release, - }; - --static struct file_operations me4000_ai_fops_cont_et_value = { -+static const struct file_operations me4000_ai_fops_cont_et_value = { - .owner = THIS_MODULE, - .read = me4000_ai_read, - .poll = me4000_ai_poll, -@@ -370,7 +370,7 @@ static struct file_operations me4000_ai_ - .release = me4000_release, - }; - --static struct file_operations me4000_ai_fops_cont_et_chanlist = { -+static const struct file_operations me4000_ai_fops_cont_et_chanlist = { - .owner = THIS_MODULE, - .read = me4000_ai_read, - .poll = me4000_ai_poll, -@@ -379,21 +379,21 @@ static struct file_operations me4000_ai_ - .release = me4000_release, - }; - --static struct file_operations me4000_dio_fops = { -+static const struct file_operations me4000_dio_fops = { - .owner = THIS_MODULE, - .ioctl = me4000_dio_ioctl, - .open = me4000_open, - .release = me4000_release, - }; - --static struct file_operations me4000_cnt_fops = { -+static const struct file_operations me4000_cnt_fops = { - .owner = THIS_MODULE, - .ioctl = me4000_cnt_ioctl, - .open = me4000_open, - .release = me4000_release, - }; - --static struct file_operations me4000_ext_int_fops = { -+static const struct file_operations me4000_ext_int_fops = { - .owner = THIS_MODULE, - .ioctl = me4000_ext_int_ioctl, - .open = me4000_open, -@@ -401,13 +401,13 @@ static struct file_operations me4000_ext - .fasync = me4000_ext_int_fasync, - }; - --static struct file_operations *me4000_ao_fops_array[] = { -+static const struct file_operations *me4000_ao_fops_array[] = { - &me4000_ao_fops_sing, // single operations - &me4000_ao_fops_wrap, // wraparound operations - &me4000_ao_fops_cont, // continous operations - }; - --static struct file_operations *me4000_ai_fops_array[] = { -+static const struct file_operations *me4000_ai_fops_array[] = { - &me4000_ai_fops_sing, // single operations - &me4000_ai_fops_cont_sw, // continuous operations with software start - &me4000_ai_fops_cont_et, // continous operations with external trigger -diff -urNp linux-2.6.29.6/drivers/staging/meilhaus/memain.c linux-2.6.29.6/drivers/staging/meilhaus/memain.c ---- linux-2.6.29.6/drivers/staging/meilhaus/memain.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/meilhaus/memain.c 2009-07-23 18:40:28.086506170 -0400 -@@ -107,7 +107,7 @@ static struct cdev *cdevp; +diff -urNp linux-2.6.30.4/drivers/staging/meilhaus/memain.c linux-2.6.30.4/drivers/staging/meilhaus/memain.c +--- linux-2.6.30.4/drivers/staging/meilhaus/memain.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/meilhaus/memain.c 2009-07-30 09:48:10.052768252 -0400 +@@ -108,7 +108,7 @@ static struct cdev *cdevp; /* File operations provided by the module */ @@ -20176,9 +19809,9 @@ diff -urNp linux-2.6.29.6/drivers/staging/meilhaus/memain.c linux-2.6.29.6/drive .owner = THIS_MODULE, .ioctl = me_ioctl, .open = me_open, -diff -urNp linux-2.6.29.6/drivers/staging/panel/panel.c linux-2.6.29.6/drivers/staging/panel/panel.c ---- linux-2.6.29.6/drivers/staging/panel/panel.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/panel/panel.c 2009-07-23 18:40:28.087439625 -0400 +diff -urNp linux-2.6.30.4/drivers/staging/panel/panel.c linux-2.6.30.4/drivers/staging/panel/panel.c +--- linux-2.6.30.4/drivers/staging/panel/panel.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/panel/panel.c 2009-07-30 09:48:10.053870849 -0400 @@ -1263,7 +1263,7 @@ static int lcd_release(struct inode *ino return 0; } @@ -20197,9 +19830,9 @@ diff -urNp linux-2.6.29.6/drivers/staging/panel/panel.c linux-2.6.29.6/drivers/s .read = keypad_read, /* read */ .open = keypad_open, /* open */ .release = keypad_release, /* close */ -diff -urNp linux-2.6.29.6/drivers/staging/poch/poch.c linux-2.6.29.6/drivers/staging/poch/poch.c ---- linux-2.6.29.6/drivers/staging/poch/poch.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/poch/poch.c 2009-07-23 18:40:28.100950832 -0400 +diff -urNp linux-2.6.30.4/drivers/staging/poch/poch.c linux-2.6.30.4/drivers/staging/poch/poch.c +--- linux-2.6.30.4/drivers/staging/poch/poch.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/poch/poch.c 2009-07-30 09:48:10.053870849 -0400 @@ -1056,7 +1056,7 @@ static int poch_ioctl(struct inode *inod return 0; } @@ -20209,9 +19842,9 @@ diff -urNp linux-2.6.29.6/drivers/staging/poch/poch.c linux-2.6.29.6/drivers/sta .owner = THIS_MODULE, .open = poch_open, .release = poch_release, -diff -urNp linux-2.6.29.6/drivers/staging/rspiusb/rspiusb.c linux-2.6.29.6/drivers/staging/rspiusb/rspiusb.c ---- linux-2.6.29.6/drivers/staging/rspiusb/rspiusb.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/staging/rspiusb/rspiusb.c 2009-07-23 18:40:28.104254239 -0400 +diff -urNp linux-2.6.30.4/drivers/staging/rspiusb/rspiusb.c linux-2.6.30.4/drivers/staging/rspiusb/rspiusb.c +--- linux-2.6.30.4/drivers/staging/rspiusb/rspiusb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/staging/rspiusb/rspiusb.c 2009-07-30 09:48:10.053870849 -0400 @@ -708,7 +708,7 @@ static int MapUserBuffer(struct ioctl_st return 0; } @@ -20221,10 +19854,10 @@ diff -urNp linux-2.6.29.6/drivers/staging/rspiusb/rspiusb.c linux-2.6.29.6/drive .owner = THIS_MODULE, .ioctl = piusb_ioctl, .open = piusb_open, -diff -urNp linux-2.6.29.6/drivers/uio/uio.c linux-2.6.29.6/drivers/uio/uio.c ---- linux-2.6.29.6/drivers/uio/uio.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/uio/uio.c 2009-07-23 18:40:28.106388317 -0400 -@@ -636,7 +636,7 @@ static int uio_vma_fault(struct vm_area_ +diff -urNp linux-2.6.30.4/drivers/uio/uio.c linux-2.6.30.4/drivers/uio/uio.c +--- linux-2.6.30.4/drivers/uio/uio.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/uio/uio.c 2009-07-30 09:48:10.053870849 -0400 +@@ -658,7 +658,7 @@ static int uio_vma_fault(struct vm_area_ return 0; } @@ -20233,9 +19866,9 @@ diff -urNp linux-2.6.29.6/drivers/uio/uio.c linux-2.6.29.6/drivers/uio/uio.c .open = uio_vma_open, .close = uio_vma_close, .fault = uio_vma_fault, -diff -urNp linux-2.6.29.6/drivers/usb/atm/usbatm.c linux-2.6.29.6/drivers/usb/atm/usbatm.c ---- linux-2.6.29.6/drivers/usb/atm/usbatm.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/atm/usbatm.c 2009-07-23 17:34:32.135751373 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/atm/usbatm.c linux-2.6.30.4/drivers/usb/atm/usbatm.c +--- linux-2.6.30.4/drivers/usb/atm/usbatm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/atm/usbatm.c 2009-07-30 09:48:10.055402995 -0400 @@ -333,7 +333,7 @@ static void usbatm_extract_one_cell(stru if (printk_ratelimit()) atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n", @@ -20298,10 +19931,10 @@ diff -urNp linux-2.6.29.6/drivers/usb/atm/usbatm.c linux-2.6.29.6/drivers/usb/at skb = skb_dequeue(&instance->sndqueue); } -diff -urNp linux-2.6.29.6/drivers/usb/class/cdc-acm.c linux-2.6.29.6/drivers/usb/class/cdc-acm.c ---- linux-2.6.29.6/drivers/usb/class/cdc-acm.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/class/cdc-acm.c 2009-07-23 17:34:32.135751373 -0400 -@@ -1397,7 +1397,7 @@ static struct usb_device_id acm_ids[] = +diff -urNp linux-2.6.30.4/drivers/usb/class/cdc-acm.c linux-2.6.30.4/drivers/usb/class/cdc-acm.c +--- linux-2.6.30.4/drivers/usb/class/cdc-acm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/class/cdc-acm.c 2009-07-30 09:48:10.055402995 -0400 +@@ -1403,7 +1403,7 @@ static struct usb_device_id acm_ids[] = USB_CDC_ACM_PROTO_AT_CDMA) }, /* NOTE: COMM/ACM/0xff is likely MSFT RNDIS ... NOT a modem!! */ @@ -20310,9 +19943,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/class/cdc-acm.c linux-2.6.29.6/drivers/usb }; MODULE_DEVICE_TABLE (usb, acm_ids); -diff -urNp linux-2.6.29.6/drivers/usb/class/usblp.c linux-2.6.29.6/drivers/usb/class/usblp.c ---- linux-2.6.29.6/drivers/usb/class/usblp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/class/usblp.c 2009-07-23 17:34:32.136781202 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/class/usblp.c linux-2.6.30.4/drivers/usb/class/usblp.c +--- linux-2.6.30.4/drivers/usb/class/usblp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/class/usblp.c 2009-07-30 09:48:10.055402995 -0400 @@ -228,7 +228,7 @@ static const struct quirk_printer_struct { 0x0482, 0x0010, USBLP_QUIRK_BIDIR }, /* Kyocera Mita FS 820, by zut <kernel@zut.de> */ { 0x04f9, 0x000d, USBLP_QUIRK_BIDIR }, /* Brother Industries, Ltd HL-1440 Laser Printer */ @@ -20322,7 +19955,7 @@ diff -urNp linux-2.6.29.6/drivers/usb/class/usblp.c linux-2.6.29.6/drivers/usb/c }; static int usblp_wwait(struct usblp *usblp, int nonblock); -@@ -1403,7 +1403,7 @@ static struct usb_device_id usblp_ids [] +@@ -1406,7 +1406,7 @@ static struct usb_device_id usblp_ids [] { USB_INTERFACE_INFO(7, 1, 2) }, { USB_INTERFACE_INFO(7, 1, 3) }, { USB_DEVICE(0x04b8, 0x0202) }, /* Seiko Epson Receipt Printer M129C */ @@ -20331,9 +19964,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/class/usblp.c linux-2.6.29.6/drivers/usb/c }; MODULE_DEVICE_TABLE (usb, usblp_ids); -diff -urNp linux-2.6.29.6/drivers/usb/class/usbtmc.c linux-2.6.29.6/drivers/usb/class/usbtmc.c ---- linux-2.6.29.6/drivers/usb/class/usbtmc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/class/usbtmc.c 2009-07-23 18:40:28.107490981 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/class/usbtmc.c linux-2.6.30.4/drivers/usb/class/usbtmc.c +--- linux-2.6.30.4/drivers/usb/class/usbtmc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/class/usbtmc.c 2009-07-30 09:48:10.055402995 -0400 @@ -954,7 +954,7 @@ static long usbtmc_ioctl(struct file *fi return retval; } @@ -20343,10 +19976,10 @@ diff -urNp linux-2.6.29.6/drivers/usb/class/usbtmc.c linux-2.6.29.6/drivers/usb/ .owner = THIS_MODULE, .read = usbtmc_read, .write = usbtmc_write, -diff -urNp linux-2.6.29.6/drivers/usb/core/hub.c linux-2.6.29.6/drivers/usb/core/hub.c ---- linux-2.6.29.6/drivers/usb/core/hub.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/core/hub.c 2009-07-23 17:34:32.136781202 -0400 -@@ -3193,7 +3193,7 @@ static struct usb_device_id hub_id_table +diff -urNp linux-2.6.30.4/drivers/usb/core/hub.c linux-2.6.30.4/drivers/usb/core/hub.c +--- linux-2.6.30.4/drivers/usb/core/hub.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/core/hub.c 2009-07-30 09:48:10.057446184 -0400 +@@ -3194,7 +3194,7 @@ static struct usb_device_id hub_id_table .bDeviceClass = USB_CLASS_HUB}, { .match_flags = USB_DEVICE_ID_MATCH_INT_CLASS, .bInterfaceClass = USB_CLASS_HUB}, @@ -20355,9 +19988,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/core/hub.c linux-2.6.29.6/drivers/usb/core }; MODULE_DEVICE_TABLE (usb, hub_id_table); -diff -urNp linux-2.6.29.6/drivers/usb/core/inode.c linux-2.6.29.6/drivers/usb/core/inode.c ---- linux-2.6.29.6/drivers/usb/core/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/core/inode.c 2009-07-23 18:40:28.126687499 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/core/inode.c linux-2.6.30.4/drivers/usb/core/inode.c +--- linux-2.6.30.4/drivers/usb/core/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/core/inode.c 2009-07-30 09:48:10.057446184 -0400 @@ -47,7 +47,7 @@ #define USBFS_DEFAULT_BUSMODE (S_IXUGO | S_IRUGO) #define USBFS_DEFAULT_LISTMODE S_IRUGO @@ -20376,22 +20009,23 @@ diff -urNp linux-2.6.29.6/drivers/usb/core/inode.c linux-2.6.29.6/drivers/usb/co .statfs = simple_statfs, .drop_inode = generic_delete_inode, .remount_fs = remount, -diff -urNp linux-2.6.29.6/drivers/usb/core/message.c linux-2.6.29.6/drivers/usb/core/message.c ---- linux-2.6.29.6/drivers/usb/core/message.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/core/message.c 2009-07-23 17:34:32.137720292 -0400 -@@ -866,7 +866,8 @@ char *usb_cache_string(struct usb_device +diff -urNp linux-2.6.30.4/drivers/usb/core/message.c linux-2.6.30.4/drivers/usb/core/message.c +--- linux-2.6.30.4/drivers/usb/core/message.c 2009-07-30 20:32:40.522633558 -0400 ++++ linux-2.6.30.4/drivers/usb/core/message.c 2009-07-30 20:32:47.970590702 -0400 +@@ -890,8 +890,8 @@ char *usb_cache_string(struct usb_device + buf = kmalloc(256, GFP_KERNEL); if (buf) { len = usb_string(udev, index, buf, 256); - if (len > 0) { +- if (len > 0) { - smallbuf = kmalloc(++len, GFP_KERNEL); -+ ++len; ++ if (len++ > 0) { + smallbuf = kmalloc(len, GFP_KERNEL); if (!smallbuf) return buf; memcpy(smallbuf, buf, len); -diff -urNp linux-2.6.29.6/drivers/usb/gadget/inode.c linux-2.6.29.6/drivers/usb/gadget/inode.c ---- linux-2.6.29.6/drivers/usb/gadget/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/gadget/inode.c 2009-07-23 18:40:28.126687499 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/gadget/inode.c linux-2.6.30.4/drivers/usb/gadget/inode.c +--- linux-2.6.30.4/drivers/usb/gadget/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/gadget/inode.c 2009-07-30 09:48:10.057446184 -0400 @@ -2035,7 +2035,7 @@ gadgetfs_create_file (struct super_block return inode; } @@ -20401,9 +20035,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/gadget/inode.c linux-2.6.29.6/drivers/usb/ .statfs = simple_statfs, .drop_inode = generic_delete_inode, }; -diff -urNp linux-2.6.29.6/drivers/usb/gadget/printer.c linux-2.6.29.6/drivers/usb/gadget/printer.c ---- linux-2.6.29.6/drivers/usb/gadget/printer.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/gadget/printer.c 2009-07-23 18:40:28.127445994 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/gadget/printer.c linux-2.6.30.4/drivers/usb/gadget/printer.c +--- linux-2.6.30.4/drivers/usb/gadget/printer.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/gadget/printer.c 2009-07-30 09:48:10.059376894 -0400 @@ -875,7 +875,7 @@ printer_ioctl(struct file *fd, unsigned } @@ -20413,9 +20047,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/gadget/printer.c linux-2.6.29.6/drivers/us .owner = THIS_MODULE, .open = printer_open, .read = printer_read, -diff -urNp linux-2.6.29.6/drivers/usb/host/ehci-pci.c linux-2.6.29.6/drivers/usb/host/ehci-pci.c ---- linux-2.6.29.6/drivers/usb/host/ehci-pci.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/host/ehci-pci.c 2009-07-23 17:34:32.137720292 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/host/ehci-pci.c linux-2.6.30.4/drivers/usb/host/ehci-pci.c +--- linux-2.6.30.4/drivers/usb/host/ehci-pci.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/host/ehci-pci.c 2009-07-30 09:48:10.059376894 -0400 @@ -418,7 +418,7 @@ static const struct pci_device_id pci_id PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_EHCI, ~0), .driver_data = (unsigned long) &ehci_pci_hc_driver, @@ -20425,9 +20059,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/host/ehci-pci.c linux-2.6.29.6/drivers/usb }; MODULE_DEVICE_TABLE(pci, pci_ids); -diff -urNp linux-2.6.29.6/drivers/usb/host/uhci-hcd.c linux-2.6.29.6/drivers/usb/host/uhci-hcd.c ---- linux-2.6.29.6/drivers/usb/host/uhci-hcd.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/host/uhci-hcd.c 2009-07-23 17:34:32.138862216 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/host/uhci-hcd.c linux-2.6.30.4/drivers/usb/host/uhci-hcd.c +--- linux-2.6.30.4/drivers/usb/host/uhci-hcd.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/host/uhci-hcd.c 2009-07-30 09:48:10.059941908 -0400 @@ -927,7 +927,7 @@ static const struct pci_device_id uhci_p /* handle any USB UHCI controller */ PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_UHCI, ~0), @@ -20437,9 +20071,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/host/uhci-hcd.c linux-2.6.29.6/drivers/usb }; MODULE_DEVICE_TABLE(pci, uhci_pci_ids); -diff -urNp linux-2.6.29.6/drivers/usb/host/whci/debug.c linux-2.6.29.6/drivers/usb/host/whci/debug.c ---- linux-2.6.29.6/drivers/usb/host/whci/debug.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/host/whci/debug.c 2009-07-23 18:40:28.128284960 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/host/whci/debug.c linux-2.6.30.4/drivers/usb/host/whci/debug.c +--- linux-2.6.30.4/drivers/usb/host/whci/debug.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/host/whci/debug.c 2009-07-30 09:48:10.059941908 -0400 @@ -134,7 +134,7 @@ static int pzl_open(struct inode *inode, return single_open(file, pzl_print, inode->i_private); } @@ -20467,10 +20101,10 @@ diff -urNp linux-2.6.29.6/drivers/usb/host/whci/debug.c linux-2.6.29.6/drivers/u .open = pzl_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/drivers/usb/mon/mon_bin.c linux-2.6.29.6/drivers/usb/mon/mon_bin.c ---- linux-2.6.29.6/drivers/usb/mon/mon_bin.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/mon/mon_bin.c 2009-07-23 18:40:28.128284960 -0400 -@@ -1094,7 +1094,7 @@ static int mon_bin_vma_fault(struct vm_a +diff -urNp linux-2.6.30.4/drivers/usb/mon/mon_bin.c linux-2.6.30.4/drivers/usb/mon/mon_bin.c +--- linux-2.6.30.4/drivers/usb/mon/mon_bin.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/mon/mon_bin.c 2009-07-30 09:48:10.059941908 -0400 +@@ -1184,7 +1184,7 @@ static int mon_bin_vma_fault(struct vm_a return 0; } @@ -20479,9 +20113,9 @@ diff -urNp linux-2.6.29.6/drivers/usb/mon/mon_bin.c linux-2.6.29.6/drivers/usb/m .open = mon_bin_vma_open, .close = mon_bin_vma_close, .fault = mon_bin_vma_fault, -diff -urNp linux-2.6.29.6/drivers/usb/storage/debug.h linux-2.6.29.6/drivers/usb/storage/debug.h ---- linux-2.6.29.6/drivers/usb/storage/debug.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/storage/debug.h 2009-07-23 17:34:32.138862216 -0400 +diff -urNp linux-2.6.30.4/drivers/usb/storage/debug.h linux-2.6.30.4/drivers/usb/storage/debug.h +--- linux-2.6.30.4/drivers/usb/storage/debug.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/storage/debug.h 2009-07-30 09:48:10.059941908 -0400 @@ -54,9 +54,9 @@ void usb_stor_show_sense( unsigned char #define US_DEBUGPX(x...) printk( x ) #define US_DEBUG(x) x @@ -20495,30 +20129,33 @@ diff -urNp linux-2.6.29.6/drivers/usb/storage/debug.h linux-2.6.29.6/drivers/usb #endif #endif -diff -urNp linux-2.6.29.6/drivers/usb/storage/usb.c linux-2.6.29.6/drivers/usb/storage/usb.c ---- linux-2.6.29.6/drivers/usb/storage/usb.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/usb/storage/usb.c 2009-07-23 17:34:32.138862216 -0400 -@@ -141,7 +141,7 @@ static struct usb_device_id storage_usb_ - #undef COMPLIANT_DEV - #undef USUAL_DEV - /* Terminating entry */ -- { } -+ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } - }; - - MODULE_DEVICE_TABLE (usb, storage_usb_ids); -@@ -184,7 +184,7 @@ static struct us_unusual_dev us_unusual_ - # undef USUAL_DEV - - /* Terminating entry */ -- { NULL } -+ { NULL, NULL, 0, 0, NULL } +diff -urNp linux-2.6.30.4/drivers/usb/storage/usb.c linux-2.6.30.4/drivers/usb/storage/usb.c +--- linux-2.6.30.4/drivers/usb/storage/usb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/storage/usb.c 2009-07-30 09:48:10.061383402 -0400 +@@ -118,7 +118,7 @@ MODULE_PARM_DESC(quirks, "supplemental l + + static struct us_unusual_dev us_unusual_dev_list[] = { + # include "unusual_devs.h" +- { } /* Terminating entry */ ++ { NULL, NULL, 0, 0, NULL } /* Terminating entry */ + }; + + #undef UNUSUAL_DEV +diff -urNp linux-2.6.30.4/drivers/usb/storage/usual-tables.c linux-2.6.30.4/drivers/usb/storage/usual-tables.c +--- linux-2.6.30.4/drivers/usb/storage/usual-tables.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/usb/storage/usual-tables.c 2009-07-30 09:48:10.061383402 -0400 +@@ -48,7 +48,7 @@ + + struct usb_device_id usb_storage_usb_ids[] = { + # include "unusual_devs.h" +- { } /* Terminating entry */ ++ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 } /* Terminating entry */ }; + EXPORT_SYMBOL_GPL(usb_storage_usb_ids); - -diff -urNp linux-2.6.29.6/drivers/uwb/uwb-debug.c linux-2.6.29.6/drivers/uwb/uwb-debug.c ---- linux-2.6.29.6/drivers/uwb/uwb-debug.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/uwb/uwb-debug.c 2009-07-23 18:40:28.137381953 -0400 +diff -urNp linux-2.6.30.4/drivers/uwb/uwb-debug.c linux-2.6.30.4/drivers/uwb/uwb-debug.c +--- linux-2.6.30.4/drivers/uwb/uwb-debug.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/uwb/uwb-debug.c 2009-07-30 09:48:10.061383402 -0400 @@ -205,7 +205,7 @@ static ssize_t command_write(struct file return ret < 0 ? ret : len; } @@ -20546,9 +20183,9 @@ diff -urNp linux-2.6.29.6/drivers/uwb/uwb-debug.c linux-2.6.29.6/drivers/uwb/uwb .open = drp_avail_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/drivers/uwb/wlp/messages.c linux-2.6.29.6/drivers/uwb/wlp/messages.c ---- linux-2.6.29.6/drivers/uwb/wlp/messages.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/uwb/wlp/messages.c 2009-07-23 17:34:32.139921746 -0400 +diff -urNp linux-2.6.30.4/drivers/uwb/wlp/messages.c linux-2.6.30.4/drivers/uwb/wlp/messages.c +--- linux-2.6.30.4/drivers/uwb/wlp/messages.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/uwb/wlp/messages.c 2009-07-30 09:48:10.062348453 -0400 @@ -903,7 +903,7 @@ int wlp_parse_f0(struct wlp *wlp, struct size_t len = skb->len; size_t used; @@ -20558,9 +20195,9 @@ diff -urNp linux-2.6.29.6/drivers/uwb/wlp/messages.c linux-2.6.29.6/drivers/uwb/ enum wlp_assc_error assc_err; char enonce_buf[WLP_WSS_NONCE_STRSIZE]; char rnonce_buf[WLP_WSS_NONCE_STRSIZE]; -diff -urNp linux-2.6.29.6/drivers/video/fb_defio.c linux-2.6.29.6/drivers/video/fb_defio.c ---- linux-2.6.29.6/drivers/video/fb_defio.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/fb_defio.c 2009-07-23 18:40:28.143844676 -0400 +diff -urNp linux-2.6.30.4/drivers/video/fb_defio.c linux-2.6.30.4/drivers/video/fb_defio.c +--- linux-2.6.30.4/drivers/video/fb_defio.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/fb_defio.c 2009-07-30 09:48:10.062348453 -0400 @@ -125,7 +125,7 @@ page_already_added: return 0; } @@ -20570,10 +20207,10 @@ diff -urNp linux-2.6.29.6/drivers/video/fb_defio.c linux-2.6.29.6/drivers/video/ .fault = fb_deferred_io_fault, .page_mkwrite = fb_deferred_io_mkwrite, }; -diff -urNp linux-2.6.29.6/drivers/video/fbmem.c linux-2.6.29.6/drivers/video/fbmem.c ---- linux-2.6.29.6/drivers/video/fbmem.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/fbmem.c 2009-07-23 17:34:32.140710667 -0400 -@@ -393,7 +393,7 @@ static void fb_do_show_logo(struct fb_in +diff -urNp linux-2.6.30.4/drivers/video/fbmem.c linux-2.6.30.4/drivers/video/fbmem.c +--- linux-2.6.30.4/drivers/video/fbmem.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/fbmem.c 2009-07-30 09:48:10.062348453 -0400 +@@ -404,7 +404,7 @@ static void fb_do_show_logo(struct fb_in image->dx += image->width + 8; } } else if (rotate == FB_ROTATE_UD) { @@ -20582,7 +20219,7 @@ diff -urNp linux-2.6.29.6/drivers/video/fbmem.c linux-2.6.29.6/drivers/video/fbm info->fbops->fb_imageblit(info, image); image->dx -= image->width + 8; } -@@ -405,7 +405,7 @@ static void fb_do_show_logo(struct fb_in +@@ -416,7 +416,7 @@ static void fb_do_show_logo(struct fb_in image->dy += image->height + 8; } } else if (rotate == FB_ROTATE_CCW) { @@ -20591,7 +20228,7 @@ diff -urNp linux-2.6.29.6/drivers/video/fbmem.c linux-2.6.29.6/drivers/video/fbm info->fbops->fb_imageblit(info, image); image->dy -= image->height + 8; } -@@ -1098,7 +1098,7 @@ static long do_fb_ioctl(struct fb_info * +@@ -1109,7 +1109,7 @@ static long do_fb_ioctl(struct fb_info * return -EFAULT; if (con2fb.console < 1 || con2fb.console > MAX_NR_CONSOLES) return -EINVAL; @@ -20600,9 +20237,9 @@ diff -urNp linux-2.6.29.6/drivers/video/fbmem.c linux-2.6.29.6/drivers/video/fbm return -EINVAL; if (!registered_fb[con2fb.framebuffer]) request_module("fb%d", con2fb.framebuffer); -diff -urNp linux-2.6.29.6/drivers/video/fbmon.c linux-2.6.29.6/drivers/video/fbmon.c ---- linux-2.6.29.6/drivers/video/fbmon.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/fbmon.c 2009-07-23 17:34:32.140710667 -0400 +diff -urNp linux-2.6.30.4/drivers/video/fbmon.c linux-2.6.30.4/drivers/video/fbmon.c +--- linux-2.6.30.4/drivers/video/fbmon.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/fbmon.c 2009-07-30 09:48:10.063350135 -0400 @@ -45,7 +45,7 @@ #ifdef DEBUG #define DPRINTK(fmt, args...) printk(fmt,## args) @@ -20612,9 +20249,9 @@ diff -urNp linux-2.6.29.6/drivers/video/fbmon.c linux-2.6.29.6/drivers/video/fbm #endif #define FBMON_FIX_HEADER 1 -diff -urNp linux-2.6.29.6/drivers/video/i810/i810_accel.c linux-2.6.29.6/drivers/video/i810/i810_accel.c ---- linux-2.6.29.6/drivers/video/i810/i810_accel.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/i810/i810_accel.c 2009-07-23 17:34:32.140710667 -0400 +diff -urNp linux-2.6.30.4/drivers/video/i810/i810_accel.c linux-2.6.30.4/drivers/video/i810/i810_accel.c +--- linux-2.6.30.4/drivers/video/i810/i810_accel.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/i810/i810_accel.c 2009-07-30 09:48:10.063350135 -0400 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct } } @@ -20623,9 +20260,9 @@ diff -urNp linux-2.6.29.6/drivers/video/i810/i810_accel.c linux-2.6.29.6/drivers i810_report_error(mmio); par->dev_flags |= LOCKUP; info->pixmap.scan_align = 1; -diff -urNp linux-2.6.29.6/drivers/video/i810/i810_main.c linux-2.6.29.6/drivers/video/i810/i810_main.c ---- linux-2.6.29.6/drivers/video/i810/i810_main.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/i810/i810_main.c 2009-07-23 17:34:32.141886076 -0400 +diff -urNp linux-2.6.30.4/drivers/video/i810/i810_main.c linux-2.6.30.4/drivers/video/i810/i810_main.c +--- linux-2.6.30.4/drivers/video/i810/i810_main.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/i810/i810_main.c 2009-07-30 09:48:10.064300485 -0400 @@ -120,7 +120,7 @@ static struct pci_device_id i810fb_pci_t PCI_ANY_ID, PCI_ANY_ID, 0, 0, 4 }, { PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82815_CGC, @@ -20635,9 +20272,9 @@ diff -urNp linux-2.6.29.6/drivers/video/i810/i810_main.c linux-2.6.29.6/drivers/ }; static struct pci_driver i810fb_driver = { -diff -urNp linux-2.6.29.6/drivers/video/modedb.c linux-2.6.29.6/drivers/video/modedb.c ---- linux-2.6.29.6/drivers/video/modedb.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/modedb.c 2009-07-23 17:34:32.141886076 -0400 +diff -urNp linux-2.6.30.4/drivers/video/modedb.c linux-2.6.30.4/drivers/video/modedb.c +--- linux-2.6.30.4/drivers/video/modedb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/modedb.c 2009-07-30 09:48:10.064300485 -0400 @@ -38,232 +38,232 @@ static const struct fb_videomode modedb[ { /* 640x400 @ 70 Hz, 31.5 kHz hsync */ @@ -20928,10 +20565,10 @@ diff -urNp linux-2.6.29.6/drivers/video/modedb.c linux-2.6.29.6/drivers/video/mo }, }; -diff -urNp linux-2.6.29.6/drivers/video/omap/dispc.c linux-2.6.29.6/drivers/video/omap/dispc.c ---- linux-2.6.29.6/drivers/video/omap/dispc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/omap/dispc.c 2009-07-23 18:40:28.146299850 -0400 -@@ -1011,7 +1011,7 @@ static void mmap_user_close(struct vm_ar +diff -urNp linux-2.6.30.4/drivers/video/omap/dispc.c linux-2.6.30.4/drivers/video/omap/dispc.c +--- linux-2.6.30.4/drivers/video/omap/dispc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/omap/dispc.c 2009-07-30 09:48:10.065250322 -0400 +@@ -1013,7 +1013,7 @@ static void mmap_user_close(struct vm_ar atomic_dec(&dispc.map_count[plane]); } @@ -20940,9 +20577,9 @@ diff -urNp linux-2.6.29.6/drivers/video/omap/dispc.c linux-2.6.29.6/drivers/vide .open = mmap_user_open, .close = mmap_user_close, }; -diff -urNp linux-2.6.29.6/drivers/video/uvesafb.c linux-2.6.29.6/drivers/video/uvesafb.c ---- linux-2.6.29.6/drivers/video/uvesafb.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/uvesafb.c 2009-07-23 17:34:32.142789474 -0400 +diff -urNp linux-2.6.30.4/drivers/video/uvesafb.c linux-2.6.30.4/drivers/video/uvesafb.c +--- linux-2.6.30.4/drivers/video/uvesafb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/uvesafb.c 2009-07-30 09:48:10.065250322 -0400 @@ -18,6 +18,7 @@ #include <linux/fb.h> #include <linux/io.h> @@ -20951,7 +20588,7 @@ diff -urNp linux-2.6.29.6/drivers/video/uvesafb.c linux-2.6.29.6/drivers/video/u #include <video/edid.h> #include <video/uvesafb.h> #ifdef CONFIG_X86 -@@ -117,7 +118,7 @@ static int uvesafb_helper_start(void) +@@ -118,7 +119,7 @@ static int uvesafb_helper_start(void) NULL, }; @@ -20960,7 +20597,7 @@ diff -urNp linux-2.6.29.6/drivers/video/uvesafb.c linux-2.6.29.6/drivers/video/u } /* -@@ -574,10 +575,34 @@ static int __devinit uvesafb_vbe_getpmi( +@@ -566,10 +567,34 @@ static int __devinit uvesafb_vbe_getpmi( if ((task->t.regs.eax & 0xffff) != 0x4f || task->t.regs.es < 0xc000) { par->pmi_setpal = par->ypan = 0; } else { @@ -20995,7 +20632,7 @@ diff -urNp linux-2.6.29.6/drivers/video/uvesafb.c linux-2.6.29.6/drivers/video/u printk(KERN_INFO "uvesafb: protected mode interface info at " "%04x:%04x\n", (u16)task->t.regs.es, (u16)task->t.regs.edi); -@@ -1832,6 +1857,11 @@ out: +@@ -1825,6 +1850,11 @@ out: if (par->vbe_modes) kfree(par->vbe_modes); @@ -21007,7 +20644,7 @@ diff -urNp linux-2.6.29.6/drivers/video/uvesafb.c linux-2.6.29.6/drivers/video/u framebuffer_release(info); return err; } -@@ -1858,6 +1888,12 @@ static int uvesafb_remove(struct platfor +@@ -1851,6 +1881,12 @@ static int uvesafb_remove(struct platfor kfree(par->vbe_state_orig); if (par->vbe_state_saved) kfree(par->vbe_state_saved); @@ -21020,9 +20657,9 @@ diff -urNp linux-2.6.29.6/drivers/video/uvesafb.c linux-2.6.29.6/drivers/video/u } framebuffer_release(info); -diff -urNp linux-2.6.29.6/drivers/video/vesafb.c linux-2.6.29.6/drivers/video/vesafb.c ---- linux-2.6.29.6/drivers/video/vesafb.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/video/vesafb.c 2009-07-23 17:34:32.142789474 -0400 +diff -urNp linux-2.6.30.4/drivers/video/vesafb.c linux-2.6.30.4/drivers/video/vesafb.c +--- linux-2.6.30.4/drivers/video/vesafb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/drivers/video/vesafb.c 2009-07-30 09:48:10.066262821 -0400 @@ -9,6 +9,7 @@ */ @@ -21130,65 +20767,9 @@ diff -urNp linux-2.6.29.6/drivers/video/vesafb.c linux-2.6.29.6/drivers/video/ve if (info->screen_base) iounmap(info->screen_base); framebuffer_release(info); -diff -urNp linux-2.6.29.6/drivers/watchdog/hpwdt.c linux-2.6.29.6/drivers/watchdog/hpwdt.c ---- linux-2.6.29.6/drivers/watchdog/hpwdt.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/watchdog/hpwdt.c 2009-07-23 18:40:28.157294684 -0400 -@@ -605,7 +605,7 @@ static long hpwdt_ioctl(struct file *fil - /* - * Kernel interfaces - */ --static struct file_operations hpwdt_fops = { -+static const struct file_operations hpwdt_fops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .write = hpwdt_write, -diff -urNp linux-2.6.29.6/drivers/watchdog/rc32434_wdt.c linux-2.6.29.6/drivers/watchdog/rc32434_wdt.c ---- linux-2.6.29.6/drivers/watchdog/rc32434_wdt.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/drivers/watchdog/rc32434_wdt.c 2009-07-23 18:40:28.159486351 -0400 -@@ -227,7 +227,7 @@ static long rc32434_wdt_ioctl(struct fil - return 0; - } - --static struct file_operations rc32434_wdt_fops = { -+static const struct file_operations rc32434_wdt_fops = { - .owner = THIS_MODULE, - .llseek = no_llseek, - .write = rc32434_wdt_write, -diff -urNp linux-2.6.29.6/fs/9p/v9fs_vfs.h linux-2.6.29.6/fs/9p/v9fs_vfs.h ---- linux-2.6.29.6/fs/9p/v9fs_vfs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/9p/v9fs_vfs.h 2009-07-23 18:40:28.173305021 -0400 -@@ -41,8 +41,8 @@ extern struct file_system_type v9fs_fs_t - extern const struct address_space_operations v9fs_addr_operations; - extern const struct file_operations v9fs_file_operations; - extern const struct file_operations v9fs_dir_operations; --extern struct dentry_operations v9fs_dentry_operations; --extern struct dentry_operations v9fs_cached_dentry_operations; -+extern const struct dentry_operations v9fs_dentry_operations; -+extern const struct dentry_operations v9fs_cached_dentry_operations; - - struct inode *v9fs_get_inode(struct super_block *sb, int mode); - ino_t v9fs_qid2ino(struct p9_qid *qid); -diff -urNp linux-2.6.29.6/fs/9p/vfs_dentry.c linux-2.6.29.6/fs/9p/vfs_dentry.c ---- linux-2.6.29.6/fs/9p/vfs_dentry.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/9p/vfs_dentry.c 2009-07-23 18:40:28.185251831 -0400 -@@ -104,12 +104,12 @@ void v9fs_dentry_release(struct dentry * - } - } - --struct dentry_operations v9fs_cached_dentry_operations = { -+const struct dentry_operations v9fs_cached_dentry_operations = { - .d_delete = v9fs_cached_dentry_delete, - .d_release = v9fs_dentry_release, - }; - --struct dentry_operations v9fs_dentry_operations = { -+const struct dentry_operations v9fs_dentry_operations = { - .d_delete = v9fs_dentry_delete, - .d_release = v9fs_dentry_release, - }; -diff -urNp linux-2.6.29.6/fs/9p/vfs_inode.c linux-2.6.29.6/fs/9p/vfs_inode.c ---- linux-2.6.29.6/fs/9p/vfs_inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/9p/vfs_inode.c 2009-07-23 17:34:32.142789474 -0400 +diff -urNp linux-2.6.30.4/fs/9p/vfs_inode.c linux-2.6.30.4/fs/9p/vfs_inode.c +--- linux-2.6.30.4/fs/9p/vfs_inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/9p/vfs_inode.c 2009-07-30 09:48:10.066262821 -0400 @@ -1021,7 +1021,7 @@ static void *v9fs_vfs_follow_link(struct static void v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -21198,77 +20779,9 @@ diff -urNp linux-2.6.29.6/fs/9p/vfs_inode.c linux-2.6.29.6/fs/9p/vfs_inode.c P9_DPRINTK(P9_DEBUG_VFS, " %s %s\n", dentry->d_name.name, IS_ERR(s) ? "<error>" : s); -diff -urNp linux-2.6.29.6/fs/adfs/adfs.h linux-2.6.29.6/fs/adfs/adfs.h ---- linux-2.6.29.6/fs/adfs/adfs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/adfs/adfs.h 2009-07-23 18:40:28.197959261 -0400 -@@ -86,7 +86,7 @@ void __adfs_error(struct super_block *sb - /* dir_*.c */ - extern const struct inode_operations adfs_dir_inode_operations; - extern const struct file_operations adfs_dir_operations; --extern struct dentry_operations adfs_dentry_operations; -+extern const struct dentry_operations adfs_dentry_operations; - extern struct adfs_dir_ops adfs_f_dir_ops; - extern struct adfs_dir_ops adfs_fplus_dir_ops; - -diff -urNp linux-2.6.29.6/fs/adfs/dir.c linux-2.6.29.6/fs/adfs/dir.c ---- linux-2.6.29.6/fs/adfs/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/adfs/dir.c 2009-07-23 18:40:28.198372454 -0400 -@@ -263,7 +263,7 @@ adfs_compare(struct dentry *parent, stru - return 0; - } - --struct dentry_operations adfs_dentry_operations = { -+const struct dentry_operations adfs_dentry_operations = { - .d_hash = adfs_hash, - .d_compare = adfs_compare, - }; -diff -urNp linux-2.6.29.6/fs/affs/affs.h linux-2.6.29.6/fs/affs/affs.h ---- linux-2.6.29.6/fs/affs/affs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/affs/affs.h 2009-07-23 18:40:28.203573277 -0400 -@@ -199,8 +199,8 @@ extern const struct address_space_operat - extern const struct address_space_operations affs_aops; - extern const struct address_space_operations affs_aops_ofs; - --extern struct dentry_operations affs_dentry_operations; --extern struct dentry_operations affs_dentry_operations_intl; -+extern const struct dentry_operations affs_dentry_operations; -+extern const struct dentry_operations affs_dentry_operations_intl; - - static inline void - affs_set_blocksize(struct super_block *sb, int size) -diff -urNp linux-2.6.29.6/fs/affs/namei.c linux-2.6.29.6/fs/affs/namei.c ---- linux-2.6.29.6/fs/affs/namei.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/affs/namei.c 2009-07-23 18:40:28.222351680 -0400 -@@ -19,12 +19,12 @@ static int affs_intl_toupper(int ch); - static int affs_intl_hash_dentry(struct dentry *, struct qstr *); - static int affs_intl_compare_dentry(struct dentry *, struct qstr *, struct qstr *); - --struct dentry_operations affs_dentry_operations = { -+const struct dentry_operations affs_dentry_operations = { - .d_hash = affs_hash_dentry, - .d_compare = affs_compare_dentry, - }; - --static struct dentry_operations affs_intl_dentry_operations = { -+static const struct dentry_operations affs_intl_dentry_operations = { - .d_hash = affs_intl_hash_dentry, - .d_compare = affs_intl_compare_dentry, - }; -diff -urNp linux-2.6.29.6/fs/afs/dir.c linux-2.6.29.6/fs/afs/dir.c ---- linux-2.6.29.6/fs/afs/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/afs/dir.c 2009-07-23 18:40:28.235494421 -0400 -@@ -62,7 +62,7 @@ const struct inode_operations afs_dir_in - .setattr = afs_setattr, - }; - --static struct dentry_operations afs_fs_dentry_operations = { -+static const struct dentry_operations afs_fs_dentry_operations = { - .d_revalidate = afs_d_revalidate, - .d_delete = afs_d_delete, - .d_release = afs_d_release, -diff -urNp linux-2.6.29.6/fs/afs/proc.c linux-2.6.29.6/fs/afs/proc.c ---- linux-2.6.29.6/fs/afs/proc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/afs/proc.c 2009-07-23 18:40:28.235494421 -0400 +diff -urNp linux-2.6.30.4/fs/afs/proc.c linux-2.6.30.4/fs/afs/proc.c +--- linux-2.6.30.4/fs/afs/proc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/afs/proc.c 2009-07-30 09:48:10.066262821 -0400 @@ -28,7 +28,7 @@ static int afs_proc_cells_show(struct se static ssize_t afs_proc_cells_write(struct file *file, const char __user *buf, size_t size, loff_t *_pos); @@ -21305,9 +20818,9 @@ diff -urNp linux-2.6.29.6/fs/afs/proc.c linux-2.6.29.6/fs/afs/proc.c .start = afs_proc_cell_servers_start, .next = afs_proc_cell_servers_next, .stop = afs_proc_cell_servers_stop, -diff -urNp linux-2.6.29.6/fs/aio.c linux-2.6.29.6/fs/aio.c ---- linux-2.6.29.6/fs/aio.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/aio.c 2009-07-23 17:34:32.143911823 -0400 +diff -urNp linux-2.6.30.4/fs/aio.c linux-2.6.30.4/fs/aio.c +--- linux-2.6.30.4/fs/aio.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/aio.c 2009-07-30 09:48:10.067233652 -0400 @@ -114,7 +114,7 @@ static int aio_setup_ring(struct kioctx size += sizeof(struct io_event) * nr_events; nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT; @@ -21317,74 +20830,22 @@ diff -urNp linux-2.6.29.6/fs/aio.c linux-2.6.29.6/fs/aio.c return -EINVAL; nr_events = (PAGE_SIZE * nr_pages - sizeof(struct aio_ring)) / sizeof(struct io_event); -diff -urNp linux-2.6.29.6/fs/anon_inodes.c linux-2.6.29.6/fs/anon_inodes.c ---- linux-2.6.29.6/fs/anon_inodes.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/anon_inodes.c 2009-07-23 18:40:28.246761754 -0400 -@@ -48,7 +48,7 @@ static struct file_system_type anon_inod - .get_sb = anon_inodefs_get_sb, - .kill_sb = kill_anon_super, - }; --static struct dentry_operations anon_inodefs_dentry_operations = { -+static const struct dentry_operations anon_inodefs_dentry_operations = { - .d_delete = anon_inodefs_delete_dentry, - }; - -diff -urNp linux-2.6.29.6/fs/autofs/root.c linux-2.6.29.6/fs/autofs/root.c ---- linux-2.6.29.6/fs/autofs/root.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/autofs/root.c 2009-07-23 18:40:27.469277997 -0400 -@@ -192,7 +192,7 @@ static int autofs_revalidate(struct dent - return 1; - } - --static struct dentry_operations autofs_dentry_operations = { -+static const struct dentry_operations autofs_dentry_operations = { - .d_revalidate = autofs_revalidate, - }; - +diff -urNp linux-2.6.30.4/fs/autofs/root.c linux-2.6.30.4/fs/autofs/root.c +--- linux-2.6.30.4/fs/autofs/root.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/autofs/root.c 2009-07-30 09:48:10.067811135 -0400 @@ -299,7 +299,8 @@ static int autofs_root_symlink(struct in set_bit(n,sbi->symlink_bitmap); sl = &sbi->symlink[n]; sl->len = strlen(symname); - sl->data = kmalloc(slsize = sl->len+1, GFP_KERNEL); -+ slsize = sl->len + 1; ++ slsize = sl->len+1; + sl->data = kmalloc(slsize, GFP_KERNEL); if (!sl->data) { clear_bit(n,sbi->symlink_bitmap); unlock_kernel(); -diff -urNp linux-2.6.29.6/fs/autofs4/inode.c linux-2.6.29.6/fs/autofs4/inode.c ---- linux-2.6.29.6/fs/autofs4/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/autofs4/inode.c 2009-07-23 18:40:28.247289762 -0400 -@@ -310,7 +310,7 @@ static struct autofs_info *autofs4_mkroo - return ino; - } - --static struct dentry_operations autofs4_sb_dentry_operations = { -+static const struct dentry_operations autofs4_sb_dentry_operations = { - .d_release = autofs4_dentry_release, - }; - -diff -urNp linux-2.6.29.6/fs/autofs4/root.c linux-2.6.29.6/fs/autofs4/root.c ---- linux-2.6.29.6/fs/autofs4/root.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/autofs4/root.c 2009-07-23 18:40:28.260399846 -0400 -@@ -349,13 +349,13 @@ void autofs4_dentry_release(struct dentr - } - - /* For dentries of directories in the root dir */ --static struct dentry_operations autofs4_root_dentry_operations = { -+static const struct dentry_operations autofs4_root_dentry_operations = { - .d_revalidate = autofs4_revalidate, - .d_release = autofs4_dentry_release, - }; - - /* For other dentries */ --static struct dentry_operations autofs4_dentry_operations = { -+static const struct dentry_operations autofs4_dentry_operations = { - .d_revalidate = autofs4_revalidate, - .d_release = autofs4_dentry_release, - }; -diff -urNp linux-2.6.29.6/fs/autofs4/symlink.c linux-2.6.29.6/fs/autofs4/symlink.c ---- linux-2.6.29.6/fs/autofs4/symlink.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/autofs4/symlink.c 2009-07-23 17:34:32.143911823 -0400 +diff -urNp linux-2.6.30.4/fs/autofs4/symlink.c linux-2.6.30.4/fs/autofs4/symlink.c +--- linux-2.6.30.4/fs/autofs4/symlink.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/autofs4/symlink.c 2009-07-30 09:48:10.067811135 -0400 @@ -15,7 +15,7 @@ static void *autofs4_follow_link(struct dentry *dentry, struct nameidata *nd) { @@ -21394,9 +20855,9 @@ diff -urNp linux-2.6.29.6/fs/autofs4/symlink.c linux-2.6.29.6/fs/autofs4/symlink return NULL; } -diff -urNp linux-2.6.29.6/fs/befs/linuxvfs.c linux-2.6.29.6/fs/befs/linuxvfs.c ---- linux-2.6.29.6/fs/befs/linuxvfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/befs/linuxvfs.c 2009-07-23 17:34:32.144798896 -0400 +diff -urNp linux-2.6.30.4/fs/befs/linuxvfs.c linux-2.6.30.4/fs/befs/linuxvfs.c +--- linux-2.6.30.4/fs/befs/linuxvfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/befs/linuxvfs.c 2009-07-30 09:48:10.067811135 -0400 @@ -493,7 +493,7 @@ static void befs_put_link(struct dentry { befs_inode_info *befs_ino = BEFS_I(dentry->d_inode); @@ -21406,9 +20867,9 @@ diff -urNp linux-2.6.29.6/fs/befs/linuxvfs.c linux-2.6.29.6/fs/befs/linuxvfs.c if (!IS_ERR(link)) kfree(link); } -diff -urNp linux-2.6.29.6/fs/binfmt_aout.c linux-2.6.29.6/fs/binfmt_aout.c ---- linux-2.6.29.6/fs/binfmt_aout.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/binfmt_aout.c 2009-07-23 17:34:32.144798896 -0400 +diff -urNp linux-2.6.30.4/fs/binfmt_aout.c linux-2.6.30.4/fs/binfmt_aout.c +--- linux-2.6.30.4/fs/binfmt_aout.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/binfmt_aout.c 2009-07-30 11:10:49.111321779 -0400 @@ -16,6 +16,7 @@ #include <linux/string.h> #include <linux/fs.h> @@ -21476,10 +20937,10 @@ diff -urNp linux-2.6.29.6/fs/binfmt_aout.c linux-2.6.29.6/fs/binfmt_aout.c MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE, fd_offset + ex.a_text); up_write(¤t->mm->mmap_sem); -diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c ---- linux-2.6.29.6/fs/binfmt_elf.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/binfmt_elf.c 2009-07-23 17:34:32.146933187 -0400 -@@ -42,6 +42,10 @@ +diff -urNp linux-2.6.30.4/fs/binfmt_elf.c linux-2.6.30.4/fs/binfmt_elf.c +--- linux-2.6.30.4/fs/binfmt_elf.c 2009-07-30 20:32:40.526845645 -0400 ++++ linux-2.6.30.4/fs/binfmt_elf.c 2009-07-30 20:32:47.974595765 -0400 +@@ -35,6 +35,10 @@ #include <asm/param.h> #include <asm/page.h> @@ -21490,7 +20951,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs); static int load_elf_library(struct file *); static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *, -@@ -57,6 +61,10 @@ static int elf_core_dump(long signr, str +@@ -50,6 +54,10 @@ static int elf_core_dump(long signr, str #define elf_core_dump NULL #endif @@ -21501,7 +20962,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c #if ELF_EXEC_PAGESIZE > PAGE_SIZE #define ELF_MIN_ALIGN ELF_EXEC_PAGESIZE #else -@@ -76,6 +84,11 @@ static struct linux_binfmt elf_format = +@@ -69,6 +77,11 @@ static struct linux_binfmt elf_format = .load_binary = load_elf_binary, .load_shlib = load_elf_library, .core_dump = elf_core_dump, @@ -21513,7 +20974,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c .min_coredump = ELF_EXEC_PAGESIZE, .hasvdso = 1 }; -@@ -84,6 +97,8 @@ static struct linux_binfmt elf_format = +@@ -77,6 +90,8 @@ static struct linux_binfmt elf_format = static int set_brk(unsigned long start, unsigned long end) { @@ -21522,7 +20983,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c start = ELF_PAGEALIGN(start); end = ELF_PAGEALIGN(end); if (end > start) { -@@ -94,7 +109,7 @@ static int set_brk(unsigned long start, +@@ -87,7 +102,7 @@ static int set_brk(unsigned long start, if (BAD_ADDR(addr)) return addr; } @@ -21531,7 +20992,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c return 0; } -@@ -155,7 +170,7 @@ create_elf_tables(struct linux_binprm *b +@@ -148,7 +163,7 @@ create_elf_tables(struct linux_binprm *b elf_addr_t __user *u_rand_bytes; const char *k_platform = ELF_PLATFORM; const char *k_base_platform = ELF_BASE_PLATFORM; @@ -21540,7 +21001,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c int items; elf_addr_t *elf_info; int ei_index = 0; -@@ -202,6 +217,10 @@ create_elf_tables(struct linux_binprm *b +@@ -195,6 +210,10 @@ create_elf_tables(struct linux_binprm *b * Generate 16 random bytes for userspace PRNG seeding. */ get_random_bytes(k_rand_bytes, sizeof(k_rand_bytes)); @@ -21551,7 +21012,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c u_rand_bytes = (elf_addr_t __user *) STACK_ALLOC(p, sizeof(k_rand_bytes)); if (__copy_to_user(u_rand_bytes, k_rand_bytes, sizeof(k_rand_bytes))) -@@ -392,10 +411,10 @@ static unsigned long load_elf_interp(str +@@ -385,10 +404,10 @@ static unsigned long load_elf_interp(str { struct elf_phdr *elf_phdata; struct elf_phdr *eppnt; @@ -21564,7 +21025,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c unsigned long total_size; int retval, i, size; -@@ -441,6 +460,11 @@ static unsigned long load_elf_interp(str +@@ -434,6 +453,11 @@ static unsigned long load_elf_interp(str goto out_close; } @@ -21576,7 +21037,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c eppnt = elf_phdata; for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) { if (eppnt->p_type == PT_LOAD) { -@@ -484,8 +508,8 @@ static unsigned long load_elf_interp(str +@@ -477,8 +501,8 @@ static unsigned long load_elf_interp(str k = load_addr + eppnt->p_vaddr; if (BAD_ADDR(k) || eppnt->p_filesz > eppnt->p_memsz || @@ -21587,7 +21048,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c error = -ENOMEM; goto out_close; } -@@ -539,6 +563,177 @@ out: +@@ -532,6 +556,177 @@ out: return error; } @@ -21765,7 +21226,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c /* * These are the functions used to load ELF style executables and shared * libraries. There is no binary dependent code anywhere else. -@@ -555,6 +750,11 @@ static unsigned long randomize_stack_top +@@ -548,6 +743,11 @@ static unsigned long randomize_stack_top { unsigned int random_variable = 0; @@ -21777,7 +21238,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c if ((current->flags & PF_RANDOMIZE) && !(current->personality & ADDR_NO_RANDOMIZE)) { random_variable = get_random_int() & STACK_RND_MASK; -@@ -573,7 +773,7 @@ static int load_elf_binary(struct linux_ +@@ -566,7 +766,7 @@ static int load_elf_binary(struct linux_ unsigned long load_addr = 0, load_bias = 0; int load_addr_set = 0; char * elf_interpreter = NULL; @@ -21785,8 +21246,8 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c + unsigned long error = 0; struct elf_phdr *elf_ppnt, *elf_phdata; unsigned long elf_bss, elf_brk; - int elf_exec_fileno; -@@ -584,11 +784,11 @@ static int load_elf_binary(struct linux_ + int retval, i; +@@ -576,11 +776,11 @@ static int load_elf_binary(struct linux_ unsigned long start_code, end_code, start_data, end_data; unsigned long reloc_func_desc = 0; int executable_stack = EXSTACK_DEFAULT; @@ -21799,7 +21260,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c loc = kmalloc(sizeof(*loc), GFP_KERNEL); if (!loc) { -@@ -756,11 +956,80 @@ static int load_elf_binary(struct linux_ +@@ -742,11 +942,80 @@ static int load_elf_binary(struct linux_ /* OK, This is the point of no return */ current->flags &= ~PF_FORKNOEXEC; @@ -21881,7 +21342,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c if (elf_read_implies_exec(loc->elf_ex, executable_stack)) current->personality |= READ_IMPLIES_EXEC; -@@ -841,6 +1110,20 @@ static int load_elf_binary(struct linux_ +@@ -827,6 +1096,20 @@ static int load_elf_binary(struct linux_ #else load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr); #endif @@ -21902,7 +21363,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c } error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt, -@@ -873,9 +1156,9 @@ static int load_elf_binary(struct linux_ +@@ -859,9 +1142,9 @@ static int load_elf_binary(struct linux_ * allowed task size. Note that p_filesz must always be * <= p_memsz so it is only necessary to check p_memsz. */ @@ -21915,7 +21376,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c /* set_brk can never work. Avoid overflows. */ send_sig(SIGKILL, current, 0); retval = -EINVAL; -@@ -903,6 +1186,11 @@ static int load_elf_binary(struct linux_ +@@ -889,6 +1172,11 @@ static int load_elf_binary(struct linux_ start_data += load_bias; end_data += load_bias; @@ -21927,7 +21388,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c /* Calling set_brk effectively mmaps the pages that we need * for the bss and break sections. We must do this before * mapping in the interpreter, to make sure it doesn't wind -@@ -914,9 +1202,11 @@ static int load_elf_binary(struct linux_ +@@ -900,9 +1188,11 @@ static int load_elf_binary(struct linux_ goto out_free_dentry; } if (likely(elf_bss != elf_brk) && unlikely(padzero(elf_bss))) { @@ -21942,7 +21403,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c } if (elf_interpreter) { -@@ -1153,8 +1443,10 @@ static int dump_seek(struct file *file, +@@ -1135,8 +1425,10 @@ static int dump_seek(struct file *file, unsigned long n = off; if (n > PAGE_SIZE) n = PAGE_SIZE; @@ -21954,7 +21415,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c off -= n; } free_page((unsigned long)buf); -@@ -1166,7 +1458,7 @@ static int dump_seek(struct file *file, +@@ -1148,7 +1440,7 @@ static int dump_seek(struct file *file, * Decide what to dump of a segment, part, all or none. */ static unsigned long vma_dump_size(struct vm_area_struct *vma, @@ -21963,7 +21424,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c { #define FILTER(type) (mm_flags & (1UL << MMF_DUMP_##type)) -@@ -1200,7 +1492,7 @@ static unsigned long vma_dump_size(struc +@@ -1182,7 +1474,7 @@ static unsigned long vma_dump_size(struc if (vma->vm_file == NULL) return 0; @@ -21972,7 +21433,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c goto whole; /* -@@ -1296,8 +1588,11 @@ static int writenote(struct memelfnote * +@@ -1278,8 +1570,11 @@ static int writenote(struct memelfnote * #undef DUMP_WRITE #define DUMP_WRITE(addr, nr) \ @@ -21985,7 +21446,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c #define DUMP_SEEK(off) \ if (!dump_seek(file, (off))) \ goto end_coredump; -@@ -2002,7 +2297,7 @@ static int elf_core_dump(long signr, str +@@ -1984,7 +2279,7 @@ static int elf_core_dump(long signr, str phdr.p_offset = offset; phdr.p_vaddr = vma->vm_start; phdr.p_paddr = 0; @@ -21994,7 +21455,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c phdr.p_memsz = vma->vm_end - vma->vm_start; offset += phdr.p_filesz; phdr.p_flags = vma->vm_flags & VM_READ ? PF_R : 0; -@@ -2034,7 +2329,7 @@ static int elf_core_dump(long signr, str +@@ -2016,7 +2311,7 @@ static int elf_core_dump(long signr, str unsigned long addr; unsigned long end; @@ -22003,7 +21464,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c for (addr = vma->vm_start; addr < end; addr += PAGE_SIZE) { struct page *page; -@@ -2054,6 +2349,7 @@ static int elf_core_dump(long signr, str +@@ -2036,6 +2331,7 @@ static int elf_core_dump(long signr, str flush_cache_page(tmp_vma, addr, page_to_pfn(page)); kaddr = kmap(page); @@ -22011,7 +21472,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c if ((size += PAGE_SIZE) > limit || !dump_write(file, kaddr, PAGE_SIZE)) { -@@ -2084,6 +2380,99 @@ out: +@@ -2066,6 +2362,99 @@ out: #endif /* USE_ELF_CORE_DUMP */ @@ -22111,10 +21572,10 @@ diff -urNp linux-2.6.29.6/fs/binfmt_elf.c linux-2.6.29.6/fs/binfmt_elf.c static int __init init_elf_binfmt(void) { return register_binfmt(&elf_format); -diff -urNp linux-2.6.29.6/fs/binfmt_flat.c linux-2.6.29.6/fs/binfmt_flat.c ---- linux-2.6.29.6/fs/binfmt_flat.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/binfmt_flat.c 2009-07-23 17:34:32.148887586 -0400 -@@ -554,7 +554,9 @@ static int load_flat_file(struct linux_b +diff -urNp linux-2.6.30.4/fs/binfmt_flat.c linux-2.6.30.4/fs/binfmt_flat.c +--- linux-2.6.30.4/fs/binfmt_flat.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/binfmt_flat.c 2009-07-30 09:48:10.069189169 -0400 +@@ -565,7 +565,9 @@ static int load_flat_file(struct linux_b realdatastart = (unsigned long) -ENOMEM; printk("Unable to allocate RAM for process data, errno %d\n", (int)-realdatastart); @@ -22124,7 +21585,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_flat.c linux-2.6.29.6/fs/binfmt_flat.c ret = realdatastart; goto err; } -@@ -576,8 +578,10 @@ static int load_flat_file(struct linux_b +@@ -589,8 +591,10 @@ static int load_flat_file(struct linux_b } if (result >= (unsigned long)-4096) { printk("Unable to read data+bss, errno %d\n", (int)-result); @@ -22135,7 +21596,7 @@ diff -urNp linux-2.6.29.6/fs/binfmt_flat.c linux-2.6.29.6/fs/binfmt_flat.c ret = result; goto err; } -@@ -643,8 +647,10 @@ static int load_flat_file(struct linux_b +@@ -659,8 +663,10 @@ static int load_flat_file(struct linux_b } if (result >= (unsigned long)-4096) { printk("Unable to read code+data+bss, errno %d\n",(int)-result); @@ -22146,9 +21607,9 @@ diff -urNp linux-2.6.29.6/fs/binfmt_flat.c linux-2.6.29.6/fs/binfmt_flat.c ret = result; goto err; } -diff -urNp linux-2.6.29.6/fs/binfmt_misc.c linux-2.6.29.6/fs/binfmt_misc.c ---- linux-2.6.29.6/fs/binfmt_misc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/binfmt_misc.c 2009-07-23 17:34:32.148887586 -0400 +diff -urNp linux-2.6.30.4/fs/binfmt_misc.c linux-2.6.30.4/fs/binfmt_misc.c +--- linux-2.6.30.4/fs/binfmt_misc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/binfmt_misc.c 2009-07-30 09:48:10.070138647 -0400 @@ -693,7 +693,7 @@ static int bm_fill_super(struct super_bl static struct tree_descr bm_files[] = { [2] = {"status", &bm_status_operations, S_IWUSR|S_IRUGO}, @@ -22158,10 +21619,10 @@ diff -urNp linux-2.6.29.6/fs/binfmt_misc.c linux-2.6.29.6/fs/binfmt_misc.c }; int err = simple_fill_super(sb, 0x42494e4d, bm_files); if (!err) -diff -urNp linux-2.6.29.6/fs/bio.c linux-2.6.29.6/fs/bio.c ---- linux-2.6.29.6/fs/bio.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/bio.c 2009-07-23 17:34:32.148887586 -0400 -@@ -710,7 +710,7 @@ static int __bio_copy_iov(struct bio *bi +diff -urNp linux-2.6.30.4/fs/bio.c linux-2.6.30.4/fs/bio.c +--- linux-2.6.30.4/fs/bio.c 2009-07-30 20:32:40.527789063 -0400 ++++ linux-2.6.30.4/fs/bio.c 2009-07-30 20:32:47.975645587 -0400 +@@ -720,7 +720,7 @@ static int __bio_copy_iov(struct bio *bi while (bv_len && iov_idx < iov_count) { unsigned int bytes; @@ -22170,10 +21631,10 @@ diff -urNp linux-2.6.29.6/fs/bio.c linux-2.6.29.6/fs/bio.c bytes = min_t(unsigned int, iov[iov_idx].iov_len - iov_off, bv_len); -diff -urNp linux-2.6.29.6/fs/btrfs/ctree.h linux-2.6.29.6/fs/btrfs/ctree.h ---- linux-2.6.29.6/fs/btrfs/ctree.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/btrfs/ctree.h 2009-07-23 18:40:28.276499409 -0400 -@@ -2099,7 +2099,7 @@ int btrfs_sync_file(struct file *file, s +diff -urNp linux-2.6.30.4/fs/btrfs/ctree.h linux-2.6.30.4/fs/btrfs/ctree.h +--- linux-2.6.30.4/fs/btrfs/ctree.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/btrfs/ctree.h 2009-07-30 09:48:10.071936994 -0400 +@@ -2174,7 +2174,7 @@ int btrfs_sync_file(struct file *file, s int btrfs_drop_extent_cache(struct inode *inode, u64 start, u64 end, int skip_pinned); int btrfs_check_file(struct btrfs_root *root, struct inode *inode); @@ -22181,23 +21642,23 @@ diff -urNp linux-2.6.29.6/fs/btrfs/ctree.h linux-2.6.29.6/fs/btrfs/ctree.h +extern const struct file_operations btrfs_file_operations; int btrfs_drop_extents(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct inode *inode, - u64 start, u64 end, u64 inline_limit, u64 *hint_block); -diff -urNp linux-2.6.29.6/fs/btrfs/disk-io.c linux-2.6.29.6/fs/btrfs/disk-io.c ---- linux-2.6.29.6/fs/btrfs/disk-io.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/btrfs/disk-io.c 2009-07-23 18:40:28.282751578 -0400 -@@ -768,7 +768,7 @@ static int btree_writepage(struct page * + u64 start, u64 end, u64 locked_end, +diff -urNp linux-2.6.30.4/fs/btrfs/disk-io.c linux-2.6.30.4/fs/btrfs/disk-io.c +--- linux-2.6.30.4/fs/btrfs/disk-io.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/btrfs/disk-io.c 2009-07-30 12:07:28.366973168 -0400 +@@ -771,7 +771,7 @@ static void btree_invalidatepage(struct + } } - #endif -static struct address_space_operations btree_aops = { +static const struct address_space_operations btree_aops = { .readpage = btree_readpage, .writepage = btree_writepage, .writepages = btree_writepages, -diff -urNp linux-2.6.29.6/fs/btrfs/file.c linux-2.6.29.6/fs/btrfs/file.c ---- linux-2.6.29.6/fs/btrfs/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/btrfs/file.c 2009-07-23 18:40:28.305635485 -0400 -@@ -1268,7 +1268,7 @@ out: +diff -urNp linux-2.6.30.4/fs/btrfs/file.c linux-2.6.30.4/fs/btrfs/file.c +--- linux-2.6.30.4/fs/btrfs/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/btrfs/file.c 2009-07-30 09:48:10.073009918 -0400 +@@ -1231,7 +1231,7 @@ out: return ret > 0 ? EIO : ret; } @@ -22206,7 +21667,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/file.c linux-2.6.29.6/fs/btrfs/file.c .fault = filemap_fault, .page_mkwrite = btrfs_page_mkwrite, }; -@@ -1280,7 +1280,7 @@ static int btrfs_file_mmap(struct file * +@@ -1243,7 +1243,7 @@ static int btrfs_file_mmap(struct file * return 0; } @@ -22215,9 +21676,9 @@ diff -urNp linux-2.6.29.6/fs/btrfs/file.c linux-2.6.29.6/fs/btrfs/file.c .llseek = generic_file_llseek, .read = do_sync_read, .aio_read = generic_file_aio_read, -diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c ---- linux-2.6.29.6/fs/btrfs/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/btrfs/inode.c 2009-07-23 18:40:28.316264775 -0400 +diff -urNp linux-2.6.30.4/fs/btrfs/inode.c linux-2.6.30.4/fs/btrfs/inode.c +--- linux-2.6.30.4/fs/btrfs/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/btrfs/inode.c 2009-07-30 09:48:10.073009918 -0400 @@ -57,14 +57,14 @@ struct btrfs_iget_args { struct btrfs_root *root; }; @@ -22241,7 +21702,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c static struct extent_io_ops btrfs_extent_io_ops; static struct kmem_cache *btrfs_inode_cachep; -@@ -4955,7 +4955,7 @@ static int btrfs_permission(struct inode +@@ -5187,7 +5187,7 @@ static int btrfs_permission(struct inode return generic_permission(inode, mask, btrfs_check_acl); } @@ -22250,7 +21711,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c .getattr = btrfs_getattr, .lookup = btrfs_lookup, .create = btrfs_create, -@@ -4973,11 +4973,11 @@ static struct inode_operations btrfs_dir +@@ -5205,11 +5205,11 @@ static struct inode_operations btrfs_dir .removexattr = btrfs_removexattr, .permission = btrfs_permission, }; @@ -22264,7 +21725,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c .llseek = generic_file_llseek, .read = generic_read_dir, .readdir = btrfs_real_readdir, -@@ -5013,7 +5013,7 @@ static struct extent_io_ops btrfs_extent +@@ -5245,7 +5245,7 @@ static struct extent_io_ops btrfs_extent * * For now we're avoiding this by dropping bmap. */ @@ -22273,7 +21734,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c .readpage = btrfs_readpage, .writepage = btrfs_writepage, .writepages = btrfs_writepages, -@@ -5025,14 +5025,14 @@ static struct address_space_operations b +@@ -5257,14 +5257,14 @@ static struct address_space_operations b .set_page_dirty = btrfs_set_page_dirty, }; @@ -22290,7 +21751,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c .truncate = btrfs_truncate, .getattr = btrfs_getattr, .setattr = btrfs_setattr, -@@ -5044,7 +5044,7 @@ static struct inode_operations btrfs_fil +@@ -5276,7 +5276,7 @@ static struct inode_operations btrfs_fil .fallocate = btrfs_fallocate, .fiemap = btrfs_fiemap, }; @@ -22299,7 +21760,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c .getattr = btrfs_getattr, .setattr = btrfs_setattr, .permission = btrfs_permission, -@@ -5053,7 +5053,7 @@ static struct inode_operations btrfs_spe +@@ -5285,7 +5285,7 @@ static struct inode_operations btrfs_spe .listxattr = btrfs_listxattr, .removexattr = btrfs_removexattr, }; @@ -22308,10 +21769,10 @@ diff -urNp linux-2.6.29.6/fs/btrfs/inode.c linux-2.6.29.6/fs/btrfs/inode.c .readlink = generic_readlink, .follow_link = page_follow_link_light, .put_link = page_put_link, -diff -urNp linux-2.6.29.6/fs/btrfs/super.c linux-2.6.29.6/fs/btrfs/super.c ---- linux-2.6.29.6/fs/btrfs/super.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/btrfs/super.c 2009-07-23 18:40:28.317383091 -0400 -@@ -52,7 +52,7 @@ +diff -urNp linux-2.6.30.4/fs/btrfs/super.c linux-2.6.30.4/fs/btrfs/super.c +--- linux-2.6.30.4/fs/btrfs/super.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/btrfs/super.c 2009-07-30 09:48:10.074085184 -0400 +@@ -53,7 +53,7 @@ #include "compression.h" @@ -22320,7 +21781,7 @@ diff -urNp linux-2.6.29.6/fs/btrfs/super.c linux-2.6.29.6/fs/btrfs/super.c static void btrfs_put_super(struct super_block *sb) { -@@ -625,7 +625,7 @@ static int btrfs_unfreeze(struct super_b +@@ -675,7 +675,7 @@ static int btrfs_unfreeze(struct super_b return 0; } @@ -22329,9 +21790,9 @@ diff -urNp linux-2.6.29.6/fs/btrfs/super.c linux-2.6.29.6/fs/btrfs/super.c .delete_inode = btrfs_delete_inode, .put_super = btrfs_put_super, .write_super = btrfs_write_super, -diff -urNp linux-2.6.29.6/fs/buffer.c linux-2.6.29.6/fs/buffer.c ---- linux-2.6.29.6/fs/buffer.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/buffer.c 2009-07-23 17:34:32.149864089 -0400 +diff -urNp linux-2.6.30.4/fs/buffer.c linux-2.6.30.4/fs/buffer.c +--- linux-2.6.30.4/fs/buffer.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/buffer.c 2009-07-30 11:10:49.132480423 -0400 @@ -25,6 +25,7 @@ #include <linux/percpu.h> #include <linux/slab.h> @@ -22340,7 +21801,7 @@ diff -urNp linux-2.6.29.6/fs/buffer.c linux-2.6.29.6/fs/buffer.c #include <linux/blkdev.h> #include <linux/file.h> #include <linux/quotaops.h> -@@ -2312,6 +2313,7 @@ int generic_cont_expand_simple(struct in +@@ -2230,6 +2231,7 @@ int generic_cont_expand_simple(struct in err = -EFBIG; limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -22348,10 +21809,10 @@ diff -urNp linux-2.6.29.6/fs/buffer.c linux-2.6.29.6/fs/buffer.c if (limit != RLIM_INFINITY && size > (loff_t)limit) { send_sig(SIGXFSZ, current, 0); goto out; -diff -urNp linux-2.6.29.6/fs/cifs/cifs_dfs_ref.c linux-2.6.29.6/fs/cifs/cifs_dfs_ref.c ---- linux-2.6.29.6/fs/cifs/cifs_dfs_ref.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/cifs/cifs_dfs_ref.c 2009-07-23 18:40:28.330897960 -0400 -@@ -387,7 +387,7 @@ out_err: +diff -urNp linux-2.6.30.4/fs/cifs/cifs_dfs_ref.c linux-2.6.30.4/fs/cifs/cifs_dfs_ref.c +--- linux-2.6.30.4/fs/cifs/cifs_dfs_ref.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/cifs/cifs_dfs_ref.c 2009-07-30 09:48:10.074085184 -0400 +@@ -379,7 +379,7 @@ out_err: goto out; } @@ -22360,9 +21821,9 @@ diff -urNp linux-2.6.29.6/fs/cifs/cifs_dfs_ref.c linux-2.6.29.6/fs/cifs/cifs_dfs .follow_link = cifs_dfs_follow_mountpoint, }; -diff -urNp linux-2.6.29.6/fs/cifs/cifsfs.h linux-2.6.29.6/fs/cifs/cifsfs.h ---- linux-2.6.29.6/fs/cifs/cifsfs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/cifs/cifsfs.h 2009-07-23 18:40:28.331788628 -0400 +diff -urNp linux-2.6.30.4/fs/cifs/cifsfs.h linux-2.6.30.4/fs/cifs/cifsfs.h +--- linux-2.6.30.4/fs/cifs/cifsfs.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/cifs/cifsfs.h 2009-07-30 09:48:10.075044089 -0400 @@ -54,7 +54,7 @@ extern int cifs_setattr(struct dentry *, extern const struct inode_operations cifs_file_inode_ops; @@ -22372,20 +21833,9 @@ diff -urNp linux-2.6.29.6/fs/cifs/cifsfs.h linux-2.6.29.6/fs/cifs/cifsfs.h /* Functions related to files and directories */ -@@ -78,8 +78,8 @@ extern int cifs_dir_open(struct inode *i - extern int cifs_readdir(struct file *file, void *direntry, filldir_t filldir); - - /* Functions related to dir entries */ --extern struct dentry_operations cifs_dentry_ops; --extern struct dentry_operations cifs_ci_dentry_ops; -+extern const struct dentry_operations cifs_dentry_ops; -+extern const struct dentry_operations cifs_ci_dentry_ops; - - /* Functions related to symlinks */ - extern void *cifs_follow_link(struct dentry *direntry, struct nameidata *nd); -diff -urNp linux-2.6.29.6/fs/cifs/cifs_uniupr.h linux-2.6.29.6/fs/cifs/cifs_uniupr.h ---- linux-2.6.29.6/fs/cifs/cifs_uniupr.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/cifs/cifs_uniupr.h 2009-07-23 17:34:32.150758980 -0400 +diff -urNp linux-2.6.30.4/fs/cifs/cifs_uniupr.h linux-2.6.30.4/fs/cifs/cifs_uniupr.h +--- linux-2.6.30.4/fs/cifs/cifs_uniupr.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/cifs/cifs_uniupr.h 2009-07-30 09:48:10.074085184 -0400 @@ -132,7 +132,7 @@ const struct UniCaseRange CifsUniUpperRa {0x0490, 0x04cc, UniCaseRangeU0490}, {0x1e00, 0x1ffc, UniCaseRangeU1e00}, @@ -22395,31 +21845,10 @@ diff -urNp linux-2.6.29.6/fs/cifs/cifs_uniupr.h linux-2.6.29.6/fs/cifs/cifs_uniu }; #endif -diff -urNp linux-2.6.29.6/fs/cifs/dir.c linux-2.6.29.6/fs/cifs/dir.c ---- linux-2.6.29.6/fs/cifs/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/cifs/dir.c 2009-07-23 18:40:28.331788628 -0400 -@@ -699,7 +699,7 @@ cifs_d_revalidate(struct dentry *direntr - return rc; - } */ - --struct dentry_operations cifs_dentry_ops = { -+const struct dentry_operations cifs_dentry_ops = { - .d_revalidate = cifs_d_revalidate, - /* d_delete: cifs_d_delete, */ /* not needed except for debugging */ - }; -@@ -737,7 +737,7 @@ static int cifs_ci_compare(struct dentry - return 1; - } - --struct dentry_operations cifs_ci_dentry_ops = { -+const struct dentry_operations cifs_ci_dentry_ops = { - .d_revalidate = cifs_d_revalidate, - .d_hash = cifs_ci_hash, - .d_compare = cifs_ci_compare, -diff -urNp linux-2.6.29.6/fs/cifs/link.c linux-2.6.29.6/fs/cifs/link.c ---- linux-2.6.29.6/fs/cifs/link.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/cifs/link.c 2009-07-23 17:34:32.150758980 -0400 -@@ -318,7 +318,7 @@ cifs_readlink(struct dentry *direntry, c +diff -urNp linux-2.6.30.4/fs/cifs/link.c linux-2.6.30.4/fs/cifs/link.c +--- linux-2.6.30.4/fs/cifs/link.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/cifs/link.c 2009-07-30 09:48:10.075668043 -0400 +@@ -214,7 +214,7 @@ cifs_symlink(struct inode *inode, struct void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie) { @@ -22428,10 +21857,10 @@ diff -urNp linux-2.6.29.6/fs/cifs/link.c linux-2.6.29.6/fs/cifs/link.c if (!IS_ERR(p)) kfree(p); } -diff -urNp linux-2.6.29.6/fs/compat.c linux-2.6.29.6/fs/compat.c ---- linux-2.6.29.6/fs/compat.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/compat.c 2009-07-23 17:34:32.150758980 -0400 -@@ -1338,14 +1338,12 @@ static int compat_copy_strings(int argc, +diff -urNp linux-2.6.30.4/fs/compat.c linux-2.6.30.4/fs/compat.c +--- linux-2.6.30.4/fs/compat.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/compat.c 2009-07-30 11:10:49.133453691 -0400 +@@ -1420,14 +1420,12 @@ static int compat_copy_strings(int argc, if (!kmapped_page || kpos != (pos & PAGE_MASK)) { struct page *page; @@ -22446,7 +21875,7 @@ diff -urNp linux-2.6.29.6/fs/compat.c linux-2.6.29.6/fs/compat.c ret = get_user_pages(current, bprm->mm, pos, 1, 1, 1, &page, NULL); if (ret <= 0) { -@@ -1391,6 +1389,11 @@ int compat_do_execve(char * filename, +@@ -1473,6 +1471,11 @@ int compat_do_execve(char * filename, compat_uptr_t __user *envp, struct pt_regs * regs) { @@ -22458,7 +21887,7 @@ diff -urNp linux-2.6.29.6/fs/compat.c linux-2.6.29.6/fs/compat.c struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1431,6 +1434,14 @@ int compat_do_execve(char * filename, +@@ -1514,6 +1517,14 @@ int compat_do_execve(char * filename, bprm->filename = filename; bprm->interp = filename; @@ -22473,7 +21902,7 @@ diff -urNp linux-2.6.29.6/fs/compat.c linux-2.6.29.6/fs/compat.c retval = bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1460,9 +1471,40 @@ int compat_do_execve(char * filename, +@@ -1543,9 +1554,40 @@ int compat_do_execve(char * filename, if (retval < 0) goto out; @@ -22515,7 +21944,7 @@ diff -urNp linux-2.6.29.6/fs/compat.c linux-2.6.29.6/fs/compat.c /* execve succeeded */ current->fs->in_exec = 0; -@@ -1473,6 +1515,14 @@ int compat_do_execve(char * filename, +@@ -1557,6 +1599,14 @@ int compat_do_execve(char * filename, put_files_struct(displaced); return retval; @@ -22530,10 +21959,10 @@ diff -urNp linux-2.6.29.6/fs/compat.c linux-2.6.29.6/fs/compat.c out: if (bprm->mm) mmput(bprm->mm); -diff -urNp linux-2.6.29.6/fs/compat_ioctl.c linux-2.6.29.6/fs/compat_ioctl.c ---- linux-2.6.29.6/fs/compat_ioctl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/compat_ioctl.c 2009-07-23 17:34:32.151817730 -0400 -@@ -1832,15 +1832,15 @@ struct ioctl_trans { +diff -urNp linux-2.6.30.4/fs/compat_ioctl.c linux-2.6.30.4/fs/compat_ioctl.c +--- linux-2.6.30.4/fs/compat_ioctl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/compat_ioctl.c 2009-07-30 09:48:10.080197700 -0400 +@@ -1837,15 +1837,15 @@ struct ioctl_trans { }; #define HANDLE_IOCTL(cmd,handler) \ @@ -22552,22 +21981,10 @@ diff -urNp linux-2.6.29.6/fs/compat_ioctl.c linux-2.6.29.6/fs/compat_ioctl.c /* ioctl should not be warned about even if it's not implemented. Valid reasons to use this: -diff -urNp linux-2.6.29.6/fs/configfs/dir.c linux-2.6.29.6/fs/configfs/dir.c ---- linux-2.6.29.6/fs/configfs/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/configfs/dir.c 2009-07-23 18:40:28.343404417 -0400 -@@ -72,7 +72,7 @@ static int configfs_d_delete(struct dent - return 1; - } - --static struct dentry_operations configfs_dentry_ops = { -+static const struct dentry_operations configfs_dentry_ops = { - .d_iput = configfs_d_iput, - /* simple_delete_dentry() isn't exported */ - .d_delete = configfs_d_delete, -diff -urNp linux-2.6.29.6/fs/debugfs/inode.c linux-2.6.29.6/fs/debugfs/inode.c ---- linux-2.6.29.6/fs/debugfs/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/debugfs/inode.c 2009-07-23 17:34:32.151817730 -0400 -@@ -117,7 +117,7 @@ static inline int debugfs_positive(struc +diff -urNp linux-2.6.30.4/fs/debugfs/inode.c linux-2.6.30.4/fs/debugfs/inode.c +--- linux-2.6.30.4/fs/debugfs/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/debugfs/inode.c 2009-07-30 09:48:10.080909461 -0400 +@@ -118,7 +118,7 @@ static inline int debugfs_positive(struc static int debug_fill_super(struct super_block *sb, void *data, int silent) { @@ -22576,9 +21993,9 @@ diff -urNp linux-2.6.29.6/fs/debugfs/inode.c linux-2.6.29.6/fs/debugfs/inode.c return simple_fill_super(sb, DEBUGFS_MAGIC, debug_files); } -diff -urNp linux-2.6.29.6/fs/dlm/debug_fs.c linux-2.6.29.6/fs/dlm/debug_fs.c ---- linux-2.6.29.6/fs/dlm/debug_fs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/dlm/debug_fs.c 2009-07-23 18:40:28.344280728 -0400 +diff -urNp linux-2.6.30.4/fs/dlm/debug_fs.c linux-2.6.30.4/fs/dlm/debug_fs.c +--- linux-2.6.30.4/fs/dlm/debug_fs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/dlm/debug_fs.c 2009-07-30 09:48:10.080909461 -0400 @@ -386,9 +386,9 @@ static int table_seq_show(struct seq_fil return rv; } @@ -22617,36 +22034,22 @@ diff -urNp linux-2.6.29.6/fs/dlm/debug_fs.c linux-2.6.29.6/fs/dlm/debug_fs.c .start = table_seq_start, .next = table_seq_next, .stop = table_seq_stop, -diff -urNp linux-2.6.29.6/fs/ecryptfs/dentry.c linux-2.6.29.6/fs/ecryptfs/dentry.c ---- linux-2.6.29.6/fs/ecryptfs/dentry.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ecryptfs/dentry.c 2009-07-23 18:40:28.358643960 -0400 -@@ -89,7 +89,7 @@ static void ecryptfs_d_release(struct de - return; - } - --struct dentry_operations ecryptfs_dops = { -+const struct dentry_operations ecryptfs_dops = { - .d_revalidate = ecryptfs_d_revalidate, - .d_release = ecryptfs_d_release, - }; -diff -urNp linux-2.6.29.6/fs/ecryptfs/ecryptfs_kernel.h linux-2.6.29.6/fs/ecryptfs/ecryptfs_kernel.h ---- linux-2.6.29.6/fs/ecryptfs/ecryptfs_kernel.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ecryptfs/ecryptfs_kernel.h 2009-07-23 18:40:28.368274094 -0400 -@@ -580,8 +580,8 @@ extern const struct inode_operations ecr - extern const struct inode_operations ecryptfs_dir_iops; +diff -urNp linux-2.6.30.4/fs/ecryptfs/ecryptfs_kernel.h linux-2.6.30.4/fs/ecryptfs/ecryptfs_kernel.h +--- linux-2.6.30.4/fs/ecryptfs/ecryptfs_kernel.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ecryptfs/ecryptfs_kernel.h 2009-07-30 12:43:20.416601232 -0400 +@@ -582,7 +582,7 @@ extern const struct inode_operations ecr extern const struct inode_operations ecryptfs_symlink_iops; extern const struct super_operations ecryptfs_sops; --extern struct dentry_operations ecryptfs_dops; + extern const struct dentry_operations ecryptfs_dops; -extern struct address_space_operations ecryptfs_aops; -+extern const struct dentry_operations ecryptfs_dops; +extern const struct address_space_operations ecryptfs_aops; extern int ecryptfs_verbosity; extern unsigned int ecryptfs_message_buf_len; extern signed long ecryptfs_message_wait_timeout; -diff -urNp linux-2.6.29.6/fs/ecryptfs/mmap.c linux-2.6.29.6/fs/ecryptfs/mmap.c ---- linux-2.6.29.6/fs/ecryptfs/mmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ecryptfs/mmap.c 2009-07-23 18:40:28.369285541 -0400 -@@ -534,7 +534,7 @@ static sector_t ecryptfs_bmap(struct add +diff -urNp linux-2.6.30.4/fs/ecryptfs/mmap.c linux-2.6.30.4/fs/ecryptfs/mmap.c +--- linux-2.6.30.4/fs/ecryptfs/mmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ecryptfs/mmap.c 2009-07-30 09:48:10.080909461 -0400 +@@ -545,7 +545,7 @@ static sector_t ecryptfs_bmap(struct add return rc; } @@ -22655,13 +22058,13 @@ diff -urNp linux-2.6.29.6/fs/ecryptfs/mmap.c linux-2.6.29.6/fs/ecryptfs/mmap.c .writepage = ecryptfs_writepage, .readpage = ecryptfs_readpage, .write_begin = ecryptfs_write_begin, -diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c ---- linux-2.6.29.6/fs/exec.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/exec.c 2009-07-23 17:34:32.152780047 -0400 -@@ -52,12 +52,24 @@ - #include <linux/tracehook.h> +diff -urNp linux-2.6.30.4/fs/exec.c linux-2.6.30.4/fs/exec.c +--- linux-2.6.30.4/fs/exec.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/exec.c 2009-08-01 14:58:11.881121157 -0400 +@@ -54,12 +54,24 @@ #include <linux/kmod.h> #include <linux/fsnotify.h> + #include <linux/fs_struct.h> +#include <linux/random.h> +#include <linux/seq_file.h> + @@ -22683,7 +22086,16 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c int core_uses_pid; char core_pattern[CORENAME_MAX_SIZE] = "core"; int suid_dumpable = 0; -@@ -169,18 +181,10 @@ static struct page *get_arg_page(struct +@@ -112,7 +124,7 @@ SYSCALL_DEFINE1(uselib, const char __use + goto out; + + file = do_filp_open(AT_FDCWD, tmp, +- O_LARGEFILE | O_RDONLY | FMODE_EXEC, 0, ++ O_LARGEFILE | O_RDONLY | FMODE_EXEC | FMODE_GREXEC, 0, + MAY_READ | MAY_EXEC | MAY_OPEN); + putname(tmp); + error = PTR_ERR(file); +@@ -160,18 +172,10 @@ static struct page *get_arg_page(struct int write) { struct page *page; @@ -22705,7 +22117,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c return NULL; if (write) { -@@ -252,6 +256,11 @@ static int __bprm_mm_init(struct linux_b +@@ -243,6 +247,11 @@ static int __bprm_mm_init(struct linux_b vma->vm_end = STACK_TOP_MAX; vma->vm_start = vma->vm_end - PAGE_SIZE; vma->vm_flags = VM_STACK_FLAGS; @@ -22717,7 +22129,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); err = insert_vm_struct(mm, vma); if (err) -@@ -260,6 +269,12 @@ static int __bprm_mm_init(struct linux_b +@@ -251,6 +260,12 @@ static int __bprm_mm_init(struct linux_b mm->stack_vm = mm->total_vm = 1; up_write(&mm->mmap_sem); bprm->p = vma->vm_end - sizeof(void *); @@ -22730,7 +22142,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c return 0; err: up_write(&mm->mmap_sem); -@@ -520,6 +535,10 @@ static int shift_arg_pages(struct vm_are +@@ -511,6 +526,10 @@ static int shift_arg_pages(struct vm_are if (vma != find_vma(mm, new_start)) return -EFAULT; @@ -22741,7 +22153,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c /* * cover the whole range: [new_start, old_end) */ -@@ -608,6 +627,14 @@ int setup_arg_pages(struct linux_binprm +@@ -599,6 +618,14 @@ int setup_arg_pages(struct linux_binprm bprm->exec -= stack_shift; down_write(&mm->mmap_sem); @@ -22756,7 +22168,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c vm_flags = VM_STACK_FLAGS; /* -@@ -621,21 +648,24 @@ int setup_arg_pages(struct linux_binprm +@@ -612,21 +639,24 @@ int setup_arg_pages(struct linux_binprm vm_flags &= ~VM_EXEC; vm_flags |= mm->def_flags; @@ -22790,7 +22202,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c #ifdef CONFIG_STACK_GROWSUP stack_base = vma->vm_end + EXTRA_STACK_VM_PAGES * PAGE_SIZE; #else -@@ -647,7 +677,7 @@ int setup_arg_pages(struct linux_binprm +@@ -638,7 +668,7 @@ int setup_arg_pages(struct linux_binprm out_unlock: up_write(&mm->mmap_sem); @@ -22799,7 +22211,16 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c } EXPORT_SYMBOL(setup_arg_pages); -@@ -1066,7 +1096,7 @@ int check_unsafe_exec(struct linux_binpr +@@ -650,7 +680,7 @@ struct file *open_exec(const char *name) + int err; + + file = do_filp_open(AT_FDCWD, name, +- O_LARGEFILE | O_RDONLY | FMODE_EXEC, 0, ++ O_LARGEFILE | O_RDONLY | FMODE_EXEC | FMODE_GREXEC, 0, + MAY_EXEC | MAY_OPEN); + if (IS_ERR(file)) + goto out; +@@ -1046,7 +1076,7 @@ int check_unsafe_exec(struct linux_binpr } rcu_read_unlock(); @@ -22808,7 +22229,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c bprm->unsafe |= LSM_UNSAFE_SHARE; } else { res = -EAGAIN; -@@ -1270,6 +1300,11 @@ int do_execve(char * filename, +@@ -1253,6 +1283,11 @@ int do_execve(char * filename, char __user *__user *envp, struct pt_regs * regs) { @@ -22820,7 +22241,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c struct linux_binprm *bprm; struct file *file; struct files_struct *displaced; -@@ -1310,6 +1345,18 @@ int do_execve(char * filename, +@@ -1294,6 +1329,18 @@ int do_execve(char * filename, bprm->filename = filename; bprm->interp = filename; @@ -22839,7 +22260,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c retval = bprm_mm_init(bprm); if (retval) goto out_file; -@@ -1339,10 +1386,41 @@ int do_execve(char * filename, +@@ -1323,10 +1370,41 @@ int do_execve(char * filename, if (retval < 0) goto out; @@ -22882,7 +22303,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c /* execve succeeded */ current->fs->in_exec = 0; -@@ -1353,6 +1431,14 @@ int do_execve(char * filename, +@@ -1338,6 +1416,14 @@ int do_execve(char * filename, put_files_struct(displaced); return retval; @@ -22897,7 +22318,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c out: if (bprm->mm) mmput (bprm->mm); -@@ -1520,6 +1606,164 @@ out: +@@ -1506,6 +1592,164 @@ out: return ispipe; } @@ -23062,7 +22483,7 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c static int zap_process(struct task_struct *start) { struct task_struct *t; -@@ -1779,6 +2023,10 @@ void do_coredump(long signr, int exit_co +@@ -1765,6 +2009,10 @@ void do_coredump(long signr, int exit_co */ clear_thread_flag(TIF_SIGPENDING); @@ -23073,9 +22494,9 @@ diff -urNp linux-2.6.29.6/fs/exec.c linux-2.6.29.6/fs/exec.c /* * lock_kernel() because format_corename() is controlled by sysctl, which * uses lock_kernel() -diff -urNp linux-2.6.29.6/fs/ext2/balloc.c linux-2.6.29.6/fs/ext2/balloc.c ---- linux-2.6.29.6/fs/ext2/balloc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext2/balloc.c 2009-07-23 17:34:32.152780047 -0400 +diff -urNp linux-2.6.30.4/fs/ext2/balloc.c linux-2.6.30.4/fs/ext2/balloc.c +--- linux-2.6.30.4/fs/ext2/balloc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext2/balloc.c 2009-07-30 11:10:49.161377797 -0400 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -23085,9 +22506,9 @@ diff -urNp linux-2.6.29.6/fs/ext2/balloc.c linux-2.6.29.6/fs/ext2/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.29.6/fs/ext3/balloc.c linux-2.6.29.6/fs/ext3/balloc.c ---- linux-2.6.29.6/fs/ext3/balloc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext3/balloc.c 2009-07-23 17:34:32.153715921 -0400 +diff -urNp linux-2.6.30.4/fs/ext3/balloc.c linux-2.6.30.4/fs/ext3/balloc.c +--- linux-2.6.30.4/fs/ext3/balloc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext3/balloc.c 2009-07-30 11:10:49.178426808 -0400 @@ -1421,7 +1421,7 @@ static int ext3_has_free_blocks(struct e free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter); @@ -23097,10 +22518,10 @@ diff -urNp linux-2.6.29.6/fs/ext3/balloc.c linux-2.6.29.6/fs/ext3/balloc.c sbi->s_resuid != current_fsuid() && (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) { return 0; -diff -urNp linux-2.6.29.6/fs/ext3/namei.c linux-2.6.29.6/fs/ext3/namei.c ---- linux-2.6.29.6/fs/ext3/namei.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext3/namei.c 2009-07-23 17:34:32.153715921 -0400 -@@ -1159,7 +1159,7 @@ static struct ext3_dir_entry_2 *do_split +diff -urNp linux-2.6.30.4/fs/ext3/namei.c linux-2.6.30.4/fs/ext3/namei.c +--- linux-2.6.30.4/fs/ext3/namei.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext3/namei.c 2009-07-30 09:48:10.082882469 -0400 +@@ -1168,7 +1168,7 @@ static struct ext3_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; struct ext3_dir_entry_2 *de = NULL, *de2; @@ -23109,9 +22530,9 @@ diff -urNp linux-2.6.29.6/fs/ext3/namei.c linux-2.6.29.6/fs/ext3/namei.c bh2 = ext3_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.29.6/fs/ext3/xattr.c linux-2.6.29.6/fs/ext3/xattr.c ---- linux-2.6.29.6/fs/ext3/xattr.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext3/xattr.c 2009-07-23 17:34:32.154747281 -0400 +diff -urNp linux-2.6.30.4/fs/ext3/xattr.c linux-2.6.30.4/fs/ext3/xattr.c +--- linux-2.6.30.4/fs/ext3/xattr.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext3/xattr.c 2009-07-30 09:48:10.082882469 -0400 @@ -89,8 +89,8 @@ printk("\n"); \ } while (0) @@ -23123,10 +22544,10 @@ diff -urNp linux-2.6.29.6/fs/ext3/xattr.c linux-2.6.29.6/fs/ext3/xattr.c #endif static void ext3_xattr_cache_insert(struct buffer_head *); -diff -urNp linux-2.6.29.6/fs/ext4/balloc.c linux-2.6.29.6/fs/ext4/balloc.c ---- linux-2.6.29.6/fs/ext4/balloc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext4/balloc.c 2009-07-23 17:34:32.154747281 -0400 -@@ -577,7 +577,7 @@ int ext4_has_free_blocks(struct ext4_sb_ +diff -urNp linux-2.6.30.4/fs/ext4/balloc.c linux-2.6.30.4/fs/ext4/balloc.c +--- linux-2.6.30.4/fs/ext4/balloc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext4/balloc.c 2009-07-30 11:10:49.209900020 -0400 +@@ -573,7 +573,7 @@ int ext4_has_free_blocks(struct ext4_sb_ /* Hm, nope. Are (enough) root reserved blocks available? */ if (sbi->s_resuid == current_fsuid() || ((sbi->s_resgid != 0) && in_group_p(sbi->s_resgid)) || @@ -23135,9 +22556,9 @@ diff -urNp linux-2.6.29.6/fs/ext4/balloc.c linux-2.6.29.6/fs/ext4/balloc.c if (free_blocks >= (nblocks + dirty_blocks)) return 1; } -diff -urNp linux-2.6.29.6/fs/ext4/file.c linux-2.6.29.6/fs/ext4/file.c ---- linux-2.6.29.6/fs/ext4/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext4/file.c 2009-07-23 18:40:28.377699187 -0400 +diff -urNp linux-2.6.30.4/fs/ext4/file.c linux-2.6.30.4/fs/ext4/file.c +--- linux-2.6.30.4/fs/ext4/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext4/file.c 2009-07-30 09:48:10.082882469 -0400 @@ -128,7 +128,7 @@ force_commit: return ret; } @@ -23147,10 +22568,10 @@ diff -urNp linux-2.6.29.6/fs/ext4/file.c linux-2.6.29.6/fs/ext4/file.c .fault = filemap_fault, .page_mkwrite = ext4_page_mkwrite, }; -diff -urNp linux-2.6.29.6/fs/ext4/mballoc.c linux-2.6.29.6/fs/ext4/mballoc.c ---- linux-2.6.29.6/fs/ext4/mballoc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext4/mballoc.c 2009-07-23 18:40:28.389509253 -0400 -@@ -2215,7 +2215,7 @@ static void ext4_mb_seq_history_stop(str +diff -urNp linux-2.6.30.4/fs/ext4/mballoc.c linux-2.6.30.4/fs/ext4/mballoc.c +--- linux-2.6.30.4/fs/ext4/mballoc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext4/mballoc.c 2009-07-30 09:48:10.083824497 -0400 +@@ -2221,7 +2221,7 @@ static void ext4_mb_seq_history_stop(str { } @@ -23159,7 +22580,7 @@ diff -urNp linux-2.6.29.6/fs/ext4/mballoc.c linux-2.6.29.6/fs/ext4/mballoc.c .start = ext4_mb_seq_history_start, .next = ext4_mb_seq_history_next, .stop = ext4_mb_seq_history_stop, -@@ -2297,7 +2297,7 @@ static ssize_t ext4_mb_seq_history_write +@@ -2303,7 +2303,7 @@ static ssize_t ext4_mb_seq_history_write return count; } @@ -23168,7 +22589,7 @@ diff -urNp linux-2.6.29.6/fs/ext4/mballoc.c linux-2.6.29.6/fs/ext4/mballoc.c .owner = THIS_MODULE, .open = ext4_mb_seq_history_open, .read = seq_read, -@@ -2379,7 +2379,7 @@ static void ext4_mb_seq_groups_stop(stru +@@ -2385,7 +2385,7 @@ static void ext4_mb_seq_groups_stop(stru { } @@ -23177,7 +22598,7 @@ diff -urNp linux-2.6.29.6/fs/ext4/mballoc.c linux-2.6.29.6/fs/ext4/mballoc.c .start = ext4_mb_seq_groups_start, .next = ext4_mb_seq_groups_next, .stop = ext4_mb_seq_groups_stop, -@@ -2400,7 +2400,7 @@ static int ext4_mb_seq_groups_open(struc +@@ -2406,7 +2406,7 @@ static int ext4_mb_seq_groups_open(struc } @@ -23186,10 +22607,10 @@ diff -urNp linux-2.6.29.6/fs/ext4/mballoc.c linux-2.6.29.6/fs/ext4/mballoc.c .owner = THIS_MODULE, .open = ext4_mb_seq_groups_open, .read = seq_read, -diff -urNp linux-2.6.29.6/fs/ext4/namei.c linux-2.6.29.6/fs/ext4/namei.c ---- linux-2.6.29.6/fs/ext4/namei.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ext4/namei.c 2009-07-23 17:34:32.154747281 -0400 -@@ -1177,7 +1177,7 @@ static struct ext4_dir_entry_2 *do_split +diff -urNp linux-2.6.30.4/fs/ext4/namei.c linux-2.6.30.4/fs/ext4/namei.c +--- linux-2.6.30.4/fs/ext4/namei.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ext4/namei.c 2009-07-30 09:48:10.084769862 -0400 +@@ -1203,7 +1203,7 @@ static struct ext4_dir_entry_2 *do_split char *data1 = (*bh)->b_data, *data2; unsigned split, move, size; struct ext4_dir_entry_2 *de = NULL, *de2; @@ -23198,40 +22619,9 @@ diff -urNp linux-2.6.29.6/fs/ext4/namei.c linux-2.6.29.6/fs/ext4/namei.c bh2 = ext4_append (handle, dir, &newblock, &err); if (!(bh2)) { -diff -urNp linux-2.6.29.6/fs/fat/namei_msdos.c linux-2.6.29.6/fs/fat/namei_msdos.c ---- linux-2.6.29.6/fs/fat/namei_msdos.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fat/namei_msdos.c 2009-07-23 18:40:28.403484970 -0400 -@@ -188,7 +188,7 @@ old_compare: - goto out; - } - --static struct dentry_operations msdos_dentry_operations = { -+static const struct dentry_operations msdos_dentry_operations = { - .d_hash = msdos_hash, - .d_compare = msdos_cmp, - }; -diff -urNp linux-2.6.29.6/fs/fat/namei_vfat.c linux-2.6.29.6/fs/fat/namei_vfat.c ---- linux-2.6.29.6/fs/fat/namei_vfat.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fat/namei_vfat.c 2009-07-23 18:40:28.405445251 -0400 -@@ -166,13 +166,13 @@ static int vfat_cmp(struct dentry *dentr - return 1; - } - --static struct dentry_operations vfat_ci_dentry_ops = { -+static const struct dentry_operations vfat_ci_dentry_ops = { - .d_revalidate = vfat_revalidate_ci, - .d_hash = vfat_hashi, - .d_compare = vfat_cmpi, - }; - --static struct dentry_operations vfat_dentry_ops = { -+static const struct dentry_operations vfat_dentry_ops = { - .d_revalidate = vfat_revalidate, - .d_hash = vfat_hash, - .d_compare = vfat_cmp, -diff -urNp linux-2.6.29.6/fs/fcntl.c linux-2.6.29.6/fs/fcntl.c ---- linux-2.6.29.6/fs/fcntl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fcntl.c 2009-07-23 17:34:32.155702568 -0400 +diff -urNp linux-2.6.30.4/fs/fcntl.c linux-2.6.30.4/fs/fcntl.c +--- linux-2.6.30.4/fs/fcntl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/fcntl.c 2009-07-30 11:10:49.218051199 -0400 @@ -269,6 +269,7 @@ static long do_fcntl(int fd, unsigned in switch (cmd) { case F_DUPFD: @@ -23250,9 +22640,9 @@ diff -urNp linux-2.6.29.6/fs/fcntl.c linux-2.6.29.6/fs/fcntl.c rcu_read_unlock(); return ret; } -diff -urNp linux-2.6.29.6/fs/file.c linux-2.6.29.6/fs/file.c ---- linux-2.6.29.6/fs/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/file.c 2009-07-23 17:34:32.155702568 -0400 +diff -urNp linux-2.6.30.4/fs/file.c linux-2.6.30.4/fs/file.c +--- linux-2.6.30.4/fs/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/file.c 2009-07-30 11:10:49.226664348 -0400 @@ -13,6 +13,7 @@ #include <linux/slab.h> #include <linux/vmalloc.h> @@ -23270,10 +22660,10 @@ diff -urNp linux-2.6.29.6/fs/file.c linux-2.6.29.6/fs/file.c if (nr >= current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EMFILE; -diff -urNp linux-2.6.29.6/fs/fs_struct.c linux-2.6.29.6/fs/fs_struct.c ---- linux-2.6.29.6/fs/fs_struct.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fs_struct.c 2009-07-23 17:34:32.155702568 -0400 -@@ -88,7 +88,7 @@ void exit_fs(struct task_struct *tsk) +diff -urNp linux-2.6.30.4/fs/fs_struct.c linux-2.6.30.4/fs/fs_struct.c +--- linux-2.6.30.4/fs/fs_struct.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/fs_struct.c 2009-07-30 09:48:10.084769862 -0400 +@@ -89,7 +89,7 @@ void exit_fs(struct task_struct *tsk) task_lock(tsk); write_lock(&fs->lock); tsk->fs = NULL; @@ -23282,7 +22672,7 @@ diff -urNp linux-2.6.29.6/fs/fs_struct.c linux-2.6.29.6/fs/fs_struct.c write_unlock(&fs->lock); task_unlock(tsk); if (kill) -@@ -101,7 +101,7 @@ struct fs_struct *copy_fs_struct(struct +@@ -102,7 +102,7 @@ struct fs_struct *copy_fs_struct(struct struct fs_struct *fs = kmem_cache_alloc(fs_cachep, GFP_KERNEL); /* We don't need to lock fs - think why ;-) */ if (fs) { @@ -23291,7 +22681,7 @@ diff -urNp linux-2.6.29.6/fs/fs_struct.c linux-2.6.29.6/fs/fs_struct.c fs->in_exec = 0; rwlock_init(&fs->lock); fs->umask = old->umask; -@@ -126,7 +126,7 @@ int unshare_fs_struct(void) +@@ -127,7 +127,7 @@ int unshare_fs_struct(void) task_lock(current); write_lock(&fs->lock); @@ -23300,7 +22690,7 @@ diff -urNp linux-2.6.29.6/fs/fs_struct.c linux-2.6.29.6/fs/fs_struct.c current->fs = new_fs; write_unlock(&fs->lock); task_unlock(current); -@@ -140,7 +140,7 @@ EXPORT_SYMBOL_GPL(unshare_fs_struct); +@@ -147,7 +147,7 @@ EXPORT_SYMBOL(current_umask); /* to be mentioned only in INIT_TASK */ struct fs_struct init_fs = { @@ -23309,7 +22699,7 @@ diff -urNp linux-2.6.29.6/fs/fs_struct.c linux-2.6.29.6/fs/fs_struct.c .lock = __RW_LOCK_UNLOCKED(init_fs.lock), .umask = 0022, }; -@@ -155,12 +155,12 @@ void daemonize_fs_struct(void) +@@ -162,12 +162,12 @@ void daemonize_fs_struct(void) task_lock(current); write_lock(&init_fs.lock); @@ -23324,9 +22714,9 @@ diff -urNp linux-2.6.29.6/fs/fs_struct.c linux-2.6.29.6/fs/fs_struct.c write_unlock(&fs->lock); task_unlock(current); -diff -urNp linux-2.6.29.6/fs/fuse/control.c linux-2.6.29.6/fs/fuse/control.c ---- linux-2.6.29.6/fs/fuse/control.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fuse/control.c 2009-07-23 17:34:32.155702568 -0400 +diff -urNp linux-2.6.30.4/fs/fuse/control.c linux-2.6.30.4/fs/fuse/control.c +--- linux-2.6.30.4/fs/fuse/control.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/fuse/control.c 2009-07-30 09:48:10.084769862 -0400 @@ -161,7 +161,7 @@ void fuse_ctl_remove_conn(struct fuse_co static int fuse_ctl_fill_super(struct super_block *sb, void *data, int silent) @@ -23336,19 +22726,10 @@ diff -urNp linux-2.6.29.6/fs/fuse/control.c linux-2.6.29.6/fs/fuse/control.c struct fuse_conn *fc; int err; -diff -urNp linux-2.6.29.6/fs/fuse/dir.c linux-2.6.29.6/fs/fuse/dir.c ---- linux-2.6.29.6/fs/fuse/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fuse/dir.c 2009-07-23 18:40:27.470335769 -0400 -@@ -224,7 +224,7 @@ static int invalid_nodeid(u64 nodeid) - return !nodeid || nodeid == FUSE_ROOT_ID; - } - --struct dentry_operations fuse_dentry_operations = { -+const struct dentry_operations fuse_dentry_operations = { - .d_revalidate = fuse_dentry_revalidate, - }; - -@@ -1081,7 +1081,7 @@ static char *read_link(struct dentry *de +diff -urNp linux-2.6.30.4/fs/fuse/dir.c linux-2.6.30.4/fs/fuse/dir.c +--- linux-2.6.30.4/fs/fuse/dir.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/fuse/dir.c 2009-07-30 09:48:10.085789827 -0400 +@@ -1082,7 +1082,7 @@ static char *read_link(struct dentry *de return link; } @@ -23357,10 +22738,10 @@ diff -urNp linux-2.6.29.6/fs/fuse/dir.c linux-2.6.29.6/fs/fuse/dir.c { if (!IS_ERR(link)) free_page((unsigned long) link); -diff -urNp linux-2.6.29.6/fs/fuse/file.c linux-2.6.29.6/fs/fuse/file.c ---- linux-2.6.29.6/fs/fuse/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fuse/file.c 2009-07-23 18:40:28.411550599 -0400 -@@ -1247,7 +1247,7 @@ static int fuse_page_mkwrite(struct vm_a +diff -urNp linux-2.6.30.4/fs/fuse/file.c linux-2.6.30.4/fs/fuse/file.c +--- linux-2.6.30.4/fs/fuse/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/fuse/file.c 2009-07-30 09:48:10.085789827 -0400 +@@ -1265,7 +1265,7 @@ static int fuse_page_mkwrite(struct vm_a return 0; } @@ -23369,34 +22750,10 @@ diff -urNp linux-2.6.29.6/fs/fuse/file.c linux-2.6.29.6/fs/fuse/file.c .close = fuse_vma_close, .fault = filemap_fault, .page_mkwrite = fuse_page_mkwrite, -diff -urNp linux-2.6.29.6/fs/fuse/fuse_i.h linux-2.6.29.6/fs/fuse/fuse_i.h ---- linux-2.6.29.6/fs/fuse/fuse_i.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/fuse/fuse_i.h 2009-07-23 18:40:28.412448044 -0400 -@@ -493,7 +493,7 @@ static inline u64 get_node_id(struct ino - /** Device operations */ - extern const struct file_operations fuse_dev_operations; - --extern struct dentry_operations fuse_dentry_operations; -+extern const struct dentry_operations fuse_dentry_operations; - - /** - * Get a filled in inode -diff -urNp linux-2.6.29.6/fs/gfs2/ops_dentry.c linux-2.6.29.6/fs/gfs2/ops_dentry.c ---- linux-2.6.29.6/fs/gfs2/ops_dentry.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/gfs2/ops_dentry.c 2009-07-23 18:40:28.417529345 -0400 -@@ -108,7 +108,7 @@ static int gfs2_dhash(struct dentry *den - return 0; - } - --struct dentry_operations gfs2_dops = { -+const struct dentry_operations gfs2_dops = { - .d_revalidate = gfs2_drevalidate, - .d_hash = gfs2_dhash, - }; -diff -urNp linux-2.6.29.6/fs/gfs2/ops_file.c linux-2.6.29.6/fs/gfs2/ops_file.c ---- linux-2.6.29.6/fs/gfs2/ops_file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/gfs2/ops_file.c 2009-07-23 18:40:28.423342085 -0400 -@@ -417,7 +417,7 @@ out: +diff -urNp linux-2.6.30.4/fs/gfs2/ops_file.c linux-2.6.30.4/fs/gfs2/ops_file.c +--- linux-2.6.30.4/fs/gfs2/ops_file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/gfs2/ops_file.c 2009-07-30 09:48:10.086770196 -0400 +@@ -420,7 +420,7 @@ out: return ret; } @@ -23405,22 +22762,10 @@ diff -urNp linux-2.6.29.6/fs/gfs2/ops_file.c linux-2.6.29.6/fs/gfs2/ops_file.c .fault = filemap_fault, .page_mkwrite = gfs2_page_mkwrite, }; -diff -urNp linux-2.6.29.6/fs/gfs2/super.h linux-2.6.29.6/fs/gfs2/super.h ---- linux-2.6.29.6/fs/gfs2/super.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/gfs2/super.h 2009-07-23 18:40:28.431261400 -0400 -@@ -47,7 +47,7 @@ extern struct file_system_type gfs2_fs_t - extern struct file_system_type gfs2meta_fs_type; - extern const struct export_operations gfs2_export_ops; - extern const struct super_operations gfs2_super_ops; --extern struct dentry_operations gfs2_dops; -+extern const struct dentry_operations gfs2_dops; - - #endif /* __SUPER_DOT_H__ */ - -diff -urNp linux-2.6.29.6/fs/hfs/inode.c linux-2.6.29.6/fs/hfs/inode.c ---- linux-2.6.29.6/fs/hfs/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/hfs/inode.c 2009-07-23 17:34:32.156720374 -0400 -@@ -419,7 +419,7 @@ int hfs_write_inode(struct inode *inode, +diff -urNp linux-2.6.30.4/fs/hfs/inode.c linux-2.6.30.4/fs/hfs/inode.c +--- linux-2.6.30.4/fs/hfs/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/hfs/inode.c 2009-07-30 09:48:10.086770196 -0400 +@@ -423,7 +423,7 @@ int hfs_write_inode(struct inode *inode, if (S_ISDIR(main_inode->i_mode)) { if (fd.entrylength < sizeof(struct hfs_cat_dir)) @@ -23429,7 +22774,7 @@ diff -urNp linux-2.6.29.6/fs/hfs/inode.c linux-2.6.29.6/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_dir)); if (rec.type != HFS_CDR_DIR || -@@ -440,7 +440,7 @@ int hfs_write_inode(struct inode *inode, +@@ -444,7 +444,7 @@ int hfs_write_inode(struct inode *inode, sizeof(struct hfs_cat_file)); } else { if (fd.entrylength < sizeof(struct hfs_cat_file)) @@ -23438,30 +22783,9 @@ diff -urNp linux-2.6.29.6/fs/hfs/inode.c linux-2.6.29.6/fs/hfs/inode.c hfs_bnode_read(fd.bnode, &rec, fd.entryoffset, sizeof(struct hfs_cat_file)); if (rec.type != HFS_CDR_FIL || -diff -urNp linux-2.6.29.6/fs/hfsplus/hfsplus_fs.h linux-2.6.29.6/fs/hfsplus/hfsplus_fs.h ---- linux-2.6.29.6/fs/hfsplus/hfsplus_fs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/hfsplus/hfsplus_fs.h 2009-07-23 18:40:28.441324863 -0400 -@@ -327,7 +327,7 @@ void hfsplus_file_truncate(struct inode - /* inode.c */ - extern const struct address_space_operations hfsplus_aops; - extern const struct address_space_operations hfsplus_btree_aops; --extern struct dentry_operations hfsplus_dentry_operations; -+extern const struct dentry_operations hfsplus_dentry_operations; - - void hfsplus_inode_read_fork(struct inode *, struct hfsplus_fork_raw *); - void hfsplus_inode_write_fork(struct inode *, struct hfsplus_fork_raw *); -diff -urNp linux-2.6.29.6/fs/hfsplus/inode.c linux-2.6.29.6/fs/hfsplus/inode.c ---- linux-2.6.29.6/fs/hfsplus/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/hfsplus/inode.c 2009-07-23 18:40:27.470335769 -0400 -@@ -137,7 +137,7 @@ const struct address_space_operations hf - .writepages = hfsplus_writepages, - }; - --struct dentry_operations hfsplus_dentry_operations = { -+const struct dentry_operations hfsplus_dentry_operations = { - .d_hash = hfsplus_hash_dentry, - .d_compare = hfsplus_compare_dentry, - }; +diff -urNp linux-2.6.30.4/fs/hfsplus/inode.c linux-2.6.30.4/fs/hfsplus/inode.c +--- linux-2.6.30.4/fs/hfsplus/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/hfsplus/inode.c 2009-07-30 09:48:10.086770196 -0400 @@ -406,7 +406,7 @@ int hfsplus_cat_read_inode(struct inode struct hfsplus_cat_folder *folder = &entry.folder; @@ -23498,45 +22822,9 @@ diff -urNp linux-2.6.29.6/fs/hfsplus/inode.c linux-2.6.29.6/fs/hfsplus/inode.c hfs_bnode_read(fd.bnode, &entry, fd.entryoffset, sizeof(struct hfsplus_cat_file)); hfsplus_inode_write_fork(inode, &file->data_fork); -diff -urNp linux-2.6.29.6/fs/hostfs/hostfs_kern.c linux-2.6.29.6/fs/hostfs/hostfs_kern.c ---- linux-2.6.29.6/fs/hostfs/hostfs_kern.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/hostfs/hostfs_kern.c 2009-07-23 18:40:28.461464563 -0400 -@@ -36,7 +36,7 @@ int hostfs_d_delete(struct dentry *dentr - return 1; - } - --struct dentry_operations hostfs_dentry_ops = { -+const struct dentry_operations hostfs_dentry_ops = { - .d_delete = hostfs_d_delete, - }; - -diff -urNp linux-2.6.29.6/fs/hpfs/dentry.c linux-2.6.29.6/fs/hpfs/dentry.c ---- linux-2.6.29.6/fs/hpfs/dentry.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/hpfs/dentry.c 2009-07-23 18:40:28.465659763 -0400 -@@ -49,7 +49,7 @@ static int hpfs_compare_dentry(struct de - return 0; - } - --static struct dentry_operations hpfs_dentry_operations = { -+static const struct dentry_operations hpfs_dentry_operations = { - .d_hash = hpfs_hash_dentry, - .d_compare = hpfs_compare_dentry, - }; -diff -urNp linux-2.6.29.6/fs/isofs/inode.c linux-2.6.29.6/fs/isofs/inode.c ---- linux-2.6.29.6/fs/isofs/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/isofs/inode.c 2009-07-23 18:40:28.473700311 -0400 -@@ -114,7 +114,7 @@ static const struct super_operations iso - }; - - --static struct dentry_operations isofs_dentry_ops[] = { -+static const struct dentry_operations isofs_dentry_ops[] = { - { - .d_hash = isofs_hash, - .d_compare = isofs_dentry_cmp, -diff -urNp linux-2.6.29.6/fs/jbd2/journal.c linux-2.6.29.6/fs/jbd2/journal.c ---- linux-2.6.29.6/fs/jbd2/journal.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/jbd2/journal.c 2009-07-23 18:40:28.491739581 -0400 +diff -urNp linux-2.6.30.4/fs/jbd2/journal.c linux-2.6.30.4/fs/jbd2/journal.c +--- linux-2.6.30.4/fs/jbd2/journal.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/jbd2/journal.c 2009-07-30 09:48:10.087743830 -0400 @@ -762,7 +762,7 @@ static void jbd2_seq_history_stop(struct { } @@ -23573,9 +22861,9 @@ diff -urNp linux-2.6.29.6/fs/jbd2/journal.c linux-2.6.29.6/fs/jbd2/journal.c .owner = THIS_MODULE, .open = jbd2_seq_info_open, .read = seq_read, -diff -urNp linux-2.6.29.6/fs/jffs2/debug.h linux-2.6.29.6/fs/jffs2/debug.h ---- linux-2.6.29.6/fs/jffs2/debug.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/jffs2/debug.h 2009-07-23 17:34:32.156720374 -0400 +diff -urNp linux-2.6.30.4/fs/jffs2/debug.h linux-2.6.30.4/fs/jffs2/debug.h +--- linux-2.6.30.4/fs/jffs2/debug.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/jffs2/debug.h 2009-07-30 09:48:10.087743830 -0400 @@ -52,13 +52,13 @@ #if CONFIG_JFFS2_FS_DEBUG > 0 #define D1(x) x @@ -23677,9 +22965,9 @@ diff -urNp linux-2.6.29.6/fs/jffs2/debug.h linux-2.6.29.6/fs/jffs2/debug.h #endif /* "Sanity" checks */ -diff -urNp linux-2.6.29.6/fs/jffs2/erase.c linux-2.6.29.6/fs/jffs2/erase.c ---- linux-2.6.29.6/fs/jffs2/erase.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/jffs2/erase.c 2009-07-23 17:34:32.157742760 -0400 +diff -urNp linux-2.6.30.4/fs/jffs2/erase.c linux-2.6.30.4/fs/jffs2/erase.c +--- linux-2.6.30.4/fs/jffs2/erase.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/jffs2/erase.c 2009-07-30 09:48:10.087743830 -0400 @@ -432,7 +432,8 @@ static void jffs2_mark_erased_block(stru struct jffs2_unknown_node marker = { .magic = cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -23690,9 +22978,9 @@ diff -urNp linux-2.6.29.6/fs/jffs2/erase.c linux-2.6.29.6/fs/jffs2/erase.c }; jffs2_prealloc_raw_node_refs(c, jeb, 1); -diff -urNp linux-2.6.29.6/fs/jffs2/summary.h linux-2.6.29.6/fs/jffs2/summary.h ---- linux-2.6.29.6/fs/jffs2/summary.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/jffs2/summary.h 2009-07-23 17:34:32.157742760 -0400 +diff -urNp linux-2.6.30.4/fs/jffs2/summary.h linux-2.6.30.4/fs/jffs2/summary.h +--- linux-2.6.30.4/fs/jffs2/summary.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/jffs2/summary.h 2009-07-30 09:48:10.088709552 -0400 @@ -194,18 +194,18 @@ int jffs2_sum_scan_sumnode(struct jffs2_ #define jffs2_sum_active() (0) @@ -23721,9 +23009,9 @@ diff -urNp linux-2.6.29.6/fs/jffs2/summary.h linux-2.6.29.6/fs/jffs2/summary.h #define jffs2_sum_scan_sumnode(a,b,c,d,e) (0) #endif /* CONFIG_JFFS2_SUMMARY */ -diff -urNp linux-2.6.29.6/fs/jffs2/wbuf.c linux-2.6.29.6/fs/jffs2/wbuf.c ---- linux-2.6.29.6/fs/jffs2/wbuf.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/jffs2/wbuf.c 2009-07-23 17:34:32.157742760 -0400 +diff -urNp linux-2.6.30.4/fs/jffs2/wbuf.c linux-2.6.30.4/fs/jffs2/wbuf.c +--- linux-2.6.30.4/fs/jffs2/wbuf.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/jffs2/wbuf.c 2009-07-30 09:48:10.088709552 -0400 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o { .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK), @@ -23734,9 +23022,9 @@ diff -urNp linux-2.6.29.6/fs/jffs2/wbuf.c linux-2.6.29.6/fs/jffs2/wbuf.c }; /* -diff -urNp linux-2.6.29.6/fs/locks.c linux-2.6.29.6/fs/locks.c ---- linux-2.6.29.6/fs/locks.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/locks.c 2009-07-23 17:34:32.158731356 -0400 +diff -urNp linux-2.6.30.4/fs/locks.c linux-2.6.30.4/fs/locks.c +--- linux-2.6.30.4/fs/locks.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/locks.c 2009-07-30 09:48:10.089659107 -0400 @@ -2006,16 +2006,16 @@ void locks_remove_flock(struct file *fil return; @@ -23758,10 +23046,10 @@ diff -urNp linux-2.6.29.6/fs/locks.c linux-2.6.29.6/fs/locks.c } lock_kernel(); -diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c ---- linux-2.6.29.6/fs/namei.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/namei.c 2009-07-23 17:34:32.158731356 -0400 -@@ -622,7 +622,7 @@ static __always_inline int __do_follow_l +diff -urNp linux-2.6.30.4/fs/namei.c linux-2.6.30.4/fs/namei.c +--- linux-2.6.30.4/fs/namei.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/namei.c 2009-07-30 11:33:24.872476011 -0400 +@@ -624,7 +624,7 @@ static __always_inline int __do_follow_l cookie = dentry->d_inode->i_op->follow_link(dentry, nd); error = PTR_ERR(cookie); if (!IS_ERR(cookie)) { @@ -23770,7 +23058,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = 0; if (s) error = __vfs_follow_link(nd, s); -@@ -653,6 +653,13 @@ static inline int do_follow_link(struct +@@ -655,6 +655,13 @@ static inline int do_follow_link(struct err = security_inode_follow_link(path->dentry, nd); if (err) goto loop; @@ -23784,7 +23072,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c current->link_count++; current->total_link_count++; nd->depth++; -@@ -996,11 +1003,18 @@ return_reval: +@@ -1000,11 +1007,18 @@ return_reval: break; } return_base: @@ -23803,7 +23091,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c path_put(&nd->path); return_err: return err; -@@ -1571,12 +1585,19 @@ static int __open_namei_create(struct na +@@ -1580,12 +1594,19 @@ static int __open_namei_create(struct na int error; struct dentry *dir = nd->path.dentry; @@ -23813,7 +23101,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c + } + if (!IS_POSIXACL(dir->d_inode)) - mode &= ~current->fs->umask; + mode &= ~current_umask(); error = security_path_mknod(&nd->path, path->dentry, mode, 0); if (error) goto out_unlock; @@ -23823,7 +23111,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c out_unlock: mutex_unlock(&dir->d_inode->i_mutex); dput(nd->path.dentry); -@@ -1658,6 +1679,17 @@ struct file *do_filp_open(int dfd, const +@@ -1668,6 +1689,17 @@ struct file *do_filp_open(int dfd, const &nd, flag); if (error) return ERR_PTR(error); @@ -23841,7 +23129,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c goto ok; } -@@ -1730,6 +1762,20 @@ do_last: +@@ -1740,6 +1772,20 @@ do_last: /* * It already exists. */ @@ -23862,7 +23150,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c mutex_unlock(&dir->d_inode->i_mutex); audit_inode(pathname, path.dentry); -@@ -1815,6 +1861,13 @@ do_link: +@@ -1825,6 +1871,13 @@ do_link: error = security_inode_follow_link(path.dentry, &nd); if (error) goto exit_dput; @@ -23876,7 +23164,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = __do_follow_link(&path, &nd); if (error) { /* Does someone understand code flow here? Or it is only -@@ -1987,6 +2040,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -1997,6 +2050,17 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const error = may_mknod(mode); if (error) goto out_dput; @@ -23894,7 +23182,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2007,6 +2071,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const +@@ -2017,6 +2081,9 @@ SYSCALL_DEFINE4(mknodat, int, dfd, const } out_drop_write: mnt_drop_write(nd.path.mnt); @@ -23904,7 +23192,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2060,6 +2127,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2070,6 +2137,11 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const if (IS_ERR(dentry)) goto out_unlock; @@ -23914,9 +23202,9 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c + } + if (!IS_POSIXACL(nd.path.dentry->d_inode)) - mode &= ~current->fs->umask; + mode &= ~current_umask(); error = mnt_want_write(nd.path.mnt); -@@ -2071,6 +2143,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const +@@ -2081,6 +2153,10 @@ SYSCALL_DEFINE3(mkdirat, int, dfd, const error = vfs_mkdir(nd.path.dentry->d_inode, dentry, mode); out_drop_write: mnt_drop_write(nd.path.mnt); @@ -23927,7 +23215,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c out_dput: dput(dentry); out_unlock: -@@ -2152,6 +2228,8 @@ static long do_rmdir(int dfd, const char +@@ -2162,6 +2238,8 @@ static long do_rmdir(int dfd, const char char * name; struct dentry *dentry; struct nameidata nd; @@ -23936,7 +23224,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2176,6 +2254,19 @@ static long do_rmdir(int dfd, const char +@@ -2186,6 +2264,19 @@ static long do_rmdir(int dfd, const char error = PTR_ERR(dentry); if (IS_ERR(dentry)) goto exit2; @@ -23956,7 +23244,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto exit3; -@@ -2183,6 +2274,8 @@ static long do_rmdir(int dfd, const char +@@ -2193,6 +2284,8 @@ static long do_rmdir(int dfd, const char if (error) goto exit4; error = vfs_rmdir(nd.path.dentry->d_inode, dentry); @@ -23965,7 +23253,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c exit4: mnt_drop_write(nd.path.mnt); exit3: -@@ -2244,6 +2337,8 @@ static long do_unlinkat(int dfd, const c +@@ -2254,6 +2347,8 @@ static long do_unlinkat(int dfd, const c struct dentry *dentry; struct nameidata nd; struct inode *inode = NULL; @@ -23974,7 +23262,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = user_path_parent(dfd, pathname, &nd, &name); if (error) -@@ -2263,8 +2358,19 @@ static long do_unlinkat(int dfd, const c +@@ -2273,8 +2368,19 @@ static long do_unlinkat(int dfd, const c if (nd.last.name[nd.last.len]) goto slashes; inode = dentry->d_inode; @@ -23995,7 +23283,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto exit2; -@@ -2272,6 +2378,8 @@ static long do_unlinkat(int dfd, const c +@@ -2282,6 +2388,8 @@ static long do_unlinkat(int dfd, const c if (error) goto exit3; error = vfs_unlink(nd.path.dentry->d_inode, dentry); @@ -24004,7 +23292,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c exit3: mnt_drop_write(nd.path.mnt); exit2: -@@ -2350,6 +2458,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -2360,6 +2468,11 @@ SYSCALL_DEFINE3(symlinkat, const char __ if (IS_ERR(dentry)) goto out_unlock; @@ -24016,7 +23304,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2357,6 +2470,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ +@@ -2367,6 +2480,8 @@ SYSCALL_DEFINE3(symlinkat, const char __ if (error) goto out_drop_write; error = vfs_symlink(nd.path.dentry->d_inode, dentry, from); @@ -24025,7 +23313,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -2450,6 +2565,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -2460,6 +2575,20 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con error = PTR_ERR(new_dentry); if (IS_ERR(new_dentry)) goto out_unlock; @@ -24046,7 +23334,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = mnt_want_write(nd.path.mnt); if (error) goto out_dput; -@@ -2457,6 +2586,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con +@@ -2467,6 +2596,8 @@ SYSCALL_DEFINE5(linkat, int, olddfd, con if (error) goto out_drop_write; error = vfs_link(old_path.dentry, nd.path.dentry->d_inode, new_dentry); @@ -24055,7 +23343,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c out_drop_write: mnt_drop_write(nd.path.mnt); out_dput: -@@ -2690,6 +2821,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -2700,6 +2831,12 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c if (new_dentry == trap) goto exit5; @@ -24068,7 +23356,7 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c error = mnt_want_write(oldnd.path.mnt); if (error) goto exit5; -@@ -2699,6 +2836,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c +@@ -2709,6 +2846,9 @@ SYSCALL_DEFINE4(renameat, int, olddfd, c goto exit6; error = vfs_rename(old_dir->d_inode, old_dentry, new_dir->d_inode, new_dentry); @@ -24078,10 +23366,10 @@ diff -urNp linux-2.6.29.6/fs/namei.c linux-2.6.29.6/fs/namei.c exit6: mnt_drop_write(oldnd.path.mnt); exit5: -diff -urNp linux-2.6.29.6/fs/namespace.c linux-2.6.29.6/fs/namespace.c ---- linux-2.6.29.6/fs/namespace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/namespace.c 2009-07-23 17:34:32.159721739 -0400 -@@ -1096,6 +1096,8 @@ static int do_umount(struct vfsmount *mn +diff -urNp linux-2.6.30.4/fs/namespace.c linux-2.6.30.4/fs/namespace.c +--- linux-2.6.30.4/fs/namespace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/namespace.c 2009-07-30 11:10:49.247492786 -0400 +@@ -1110,6 +1110,8 @@ static int do_umount(struct vfsmount *mn lock_kernel(); retval = do_remount_sb(sb, MS_RDONLY, NULL, 0); unlock_kernel(); @@ -24090,7 +23378,7 @@ diff -urNp linux-2.6.29.6/fs/namespace.c linux-2.6.29.6/fs/namespace.c } up_write(&sb->s_umount); return retval; -@@ -1119,6 +1121,9 @@ static int do_umount(struct vfsmount *mn +@@ -1133,6 +1135,9 @@ static int do_umount(struct vfsmount *mn security_sb_umount_busy(mnt); up_write(&namespace_sem); release_mounts(&umount_list); @@ -24100,7 +23388,7 @@ diff -urNp linux-2.6.29.6/fs/namespace.c linux-2.6.29.6/fs/namespace.c return retval; } -@@ -1948,6 +1953,11 @@ long do_mount(char *dev_name, char *dir_ +@@ -1967,6 +1972,11 @@ long do_mount(char *dev_name, char *dir_ if (retval) goto dput_out; @@ -24112,7 +23400,7 @@ diff -urNp linux-2.6.29.6/fs/namespace.c linux-2.6.29.6/fs/namespace.c if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, data_page); -@@ -1962,6 +1972,9 @@ long do_mount(char *dev_name, char *dir_ +@@ -1981,6 +1991,9 @@ long do_mount(char *dev_name, char *dir_ dev_name, data_page); dput_out: path_put(&path); @@ -24122,7 +23410,7 @@ diff -urNp linux-2.6.29.6/fs/namespace.c linux-2.6.29.6/fs/namespace.c return retval; } -@@ -2073,6 +2086,9 @@ SYSCALL_DEFINE5(mount, char __user *, de +@@ -2092,6 +2105,9 @@ SYSCALL_DEFINE5(mount, char __user *, de if (retval < 0) goto out3; @@ -24132,10 +23420,10 @@ diff -urNp linux-2.6.29.6/fs/namespace.c linux-2.6.29.6/fs/namespace.c lock_kernel(); retval = do_mount((char *)dev_page, dir_page, (char *)type_page, flags, (void *)data_page); -diff -urNp linux-2.6.29.6/fs/nfs/client.c linux-2.6.29.6/fs/nfs/client.c ---- linux-2.6.29.6/fs/nfs/client.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/nfs/client.c 2009-07-23 18:40:28.513673349 -0400 -@@ -1409,7 +1409,7 @@ static void *nfs_server_list_next(struct +diff -urNp linux-2.6.30.4/fs/nfs/client.c linux-2.6.30.4/fs/nfs/client.c +--- linux-2.6.30.4/fs/nfs/client.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nfs/client.c 2009-07-30 09:48:10.090670547 -0400 +@@ -1404,7 +1404,7 @@ static void *nfs_server_list_next(struct static void nfs_server_list_stop(struct seq_file *p, void *v); static int nfs_server_list_show(struct seq_file *m, void *v); @@ -24144,7 +23432,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/client.c linux-2.6.29.6/fs/nfs/client.c .start = nfs_server_list_start, .next = nfs_server_list_next, .stop = nfs_server_list_stop, -@@ -1430,7 +1430,7 @@ static void *nfs_volume_list_next(struct +@@ -1425,7 +1425,7 @@ static void *nfs_volume_list_next(struct static void nfs_volume_list_stop(struct seq_file *p, void *v); static int nfs_volume_list_show(struct seq_file *m, void *v); @@ -24153,31 +23441,10 @@ diff -urNp linux-2.6.29.6/fs/nfs/client.c linux-2.6.29.6/fs/nfs/client.c .start = nfs_volume_list_start, .next = nfs_volume_list_next, .stop = nfs_volume_list_stop, -diff -urNp linux-2.6.29.6/fs/nfs/dir.c linux-2.6.29.6/fs/nfs/dir.c ---- linux-2.6.29.6/fs/nfs/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/nfs/dir.c 2009-07-23 18:40:28.514291879 -0400 -@@ -899,7 +899,7 @@ static void nfs_dentry_iput(struct dentr - iput(inode); - } - --struct dentry_operations nfs_dentry_operations = { -+const struct dentry_operations nfs_dentry_operations = { - .d_revalidate = nfs_lookup_revalidate, - .d_delete = nfs_dentry_delete, - .d_iput = nfs_dentry_iput, -@@ -967,7 +967,7 @@ out: - #ifdef CONFIG_NFS_V4 - static int nfs_open_revalidate(struct dentry *, struct nameidata *); - --struct dentry_operations nfs4_dentry_operations = { -+const struct dentry_operations nfs4_dentry_operations = { - .d_revalidate = nfs_open_revalidate, - .d_delete = nfs_dentry_delete, - .d_iput = nfs_dentry_iput, -diff -urNp linux-2.6.29.6/fs/nfs/file.c linux-2.6.29.6/fs/nfs/file.c ---- linux-2.6.29.6/fs/nfs/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/nfs/file.c 2009-07-23 18:40:28.515401169 -0400 -@@ -56,7 +56,7 @@ static int nfs_lock(struct file *filp, i +diff -urNp linux-2.6.30.4/fs/nfs/file.c linux-2.6.30.4/fs/nfs/file.c +--- linux-2.6.30.4/fs/nfs/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nfs/file.c 2009-07-30 09:48:10.090670547 -0400 +@@ -57,7 +57,7 @@ static int nfs_lock(struct file *filp, i static int nfs_flock(struct file *filp, int cmd, struct file_lock *fl); static int nfs_setlease(struct file *file, long arg, struct file_lock **fl); @@ -24186,7 +23453,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/file.c linux-2.6.29.6/fs/nfs/file.c const struct file_operations nfs_file_operations = { .llseek = nfs_file_llseek, -@@ -487,7 +487,7 @@ out_unlock: +@@ -523,7 +523,7 @@ out_unlock: return VM_FAULT_SIGBUS; } @@ -24195,22 +23462,10 @@ diff -urNp linux-2.6.29.6/fs/nfs/file.c linux-2.6.29.6/fs/nfs/file.c .fault = filemap_fault, .page_mkwrite = nfs_vm_page_mkwrite, }; -diff -urNp linux-2.6.29.6/fs/nfs/nfs4_fs.h linux-2.6.29.6/fs/nfs/nfs4_fs.h ---- linux-2.6.29.6/fs/nfs/nfs4_fs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/nfs/nfs4_fs.h 2009-07-23 18:40:28.516258510 -0400 -@@ -179,7 +179,7 @@ struct nfs4_state_recovery_ops { - int (*recover_lock)(struct nfs4_state *, struct file_lock *); - }; - --extern struct dentry_operations nfs4_dentry_operations; -+extern const struct dentry_operations nfs4_dentry_operations; - extern const struct inode_operations nfs4_dir_inode_operations; - - /* inode.c */ -diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c ---- linux-2.6.29.6/fs/nfs/nfs4proc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/nfs/nfs4proc.c 2009-07-23 17:34:32.161096484 -0400 -@@ -763,7 +763,7 @@ static int _nfs4_do_open_reclaim(struct +diff -urNp linux-2.6.30.4/fs/nfs/nfs4proc.c linux-2.6.30.4/fs/nfs/nfs4proc.c +--- linux-2.6.30.4/fs/nfs/nfs4proc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nfs/nfs4proc.c 2009-07-30 09:48:10.091839047 -0400 +@@ -755,7 +755,7 @@ static int _nfs4_do_open_reclaim(struct static int nfs4_do_open_reclaim(struct nfs_open_context *ctx, struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -24219,7 +23474,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = _nfs4_do_open_reclaim(ctx, state); -@@ -805,7 +805,7 @@ static int _nfs4_open_delegation_recall( +@@ -797,7 +797,7 @@ static int _nfs4_open_delegation_recall( int nfs4_open_delegation_recall(struct nfs_open_context *ctx, struct nfs4_state *state, const nfs4_stateid *stateid) { @@ -24228,7 +23483,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c struct nfs_server *server = NFS_SERVER(state->inode); int err; do { -@@ -1099,7 +1099,7 @@ static int _nfs4_open_expired(struct nfs +@@ -1091,7 +1091,7 @@ static int _nfs4_open_expired(struct nfs static inline int nfs4_do_open_expired(struct nfs_open_context *ctx, struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -24237,7 +23492,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { -@@ -1197,7 +1197,7 @@ out_err: +@@ -1189,7 +1189,7 @@ out_err: static struct nfs4_state *nfs4_do_open(struct inode *dir, struct path *path, fmode_t fmode, int flags, struct iattr *sattr, struct rpc_cred *cred) { @@ -24246,7 +23501,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c struct nfs4_state *res; int status; -@@ -1288,7 +1288,7 @@ static int nfs4_do_setattr(struct inode +@@ -1280,7 +1280,7 @@ static int nfs4_do_setattr(struct inode struct nfs4_state *state) { struct nfs_server *server = NFS_SERVER(inode); @@ -24255,7 +23510,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -1607,7 +1607,7 @@ static int _nfs4_server_capabilities(str +@@ -1611,7 +1611,7 @@ static int _nfs4_server_capabilities(str int nfs4_server_capabilities(struct nfs_server *server, struct nfs_fh *fhandle) { @@ -24264,7 +23519,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -1640,7 +1640,7 @@ static int _nfs4_lookup_root(struct nfs_ +@@ -1644,7 +1644,7 @@ static int _nfs4_lookup_root(struct nfs_ static int nfs4_lookup_root(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *info) { @@ -24273,7 +23528,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -1729,7 +1729,7 @@ static int _nfs4_proc_getattr(struct nfs +@@ -1733,7 +1733,7 @@ static int _nfs4_proc_getattr(struct nfs static int nfs4_proc_getattr(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -24282,7 +23537,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -1817,7 +1817,7 @@ static int nfs4_proc_lookupfh(struct nfs +@@ -1821,7 +1821,7 @@ static int nfs4_proc_lookupfh(struct nfs struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -24291,7 +23546,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_lookupfh(server, dirfh, name, fhandle, fattr); -@@ -1846,7 +1846,7 @@ static int _nfs4_proc_lookup(struct inod +@@ -1850,7 +1850,7 @@ static int _nfs4_proc_lookup(struct inod static int nfs4_proc_lookup(struct inode *dir, struct qstr *name, struct nfs_fh *fhandle, struct nfs_fattr *fattr) { @@ -24300,7 +23555,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -1910,7 +1910,7 @@ static int _nfs4_proc_access(struct inod +@@ -1914,7 +1914,7 @@ static int _nfs4_proc_access(struct inod static int nfs4_proc_access(struct inode *inode, struct nfs_access_entry *entry) { @@ -24309,7 +23564,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -1965,7 +1965,7 @@ static int _nfs4_proc_readlink(struct in +@@ -1969,7 +1969,7 @@ static int _nfs4_proc_readlink(struct in static int nfs4_proc_readlink(struct inode *inode, struct page *page, unsigned int pgbase, unsigned int pglen) { @@ -24318,7 +23573,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2063,7 +2063,7 @@ static int _nfs4_proc_remove(struct inod +@@ -2067,7 +2067,7 @@ static int _nfs4_proc_remove(struct inod static int nfs4_proc_remove(struct inode *dir, struct qstr *name) { @@ -24327,7 +23582,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2135,7 +2135,7 @@ static int _nfs4_proc_rename(struct inod +@@ -2139,7 +2139,7 @@ static int _nfs4_proc_rename(struct inod static int nfs4_proc_rename(struct inode *old_dir, struct qstr *old_name, struct inode *new_dir, struct qstr *new_name) { @@ -24336,7 +23591,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(old_dir), -@@ -2182,7 +2182,7 @@ static int _nfs4_proc_link(struct inode +@@ -2186,7 +2186,7 @@ static int _nfs4_proc_link(struct inode static int nfs4_proc_link(struct inode *inode, struct inode *dir, struct qstr *name) { @@ -24345,7 +23600,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -2273,7 +2273,7 @@ out: +@@ -2277,7 +2277,7 @@ out: static int nfs4_proc_symlink(struct inode *dir, struct dentry *dentry, struct page *page, unsigned int len, struct iattr *sattr) { @@ -24354,7 +23609,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2304,7 +2304,7 @@ out: +@@ -2308,7 +2308,7 @@ out: static int nfs4_proc_mkdir(struct inode *dir, struct dentry *dentry, struct iattr *sattr) { @@ -24363,7 +23618,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2353,7 +2353,7 @@ static int _nfs4_proc_readdir(struct den +@@ -2357,7 +2357,7 @@ static int _nfs4_proc_readdir(struct den static int nfs4_proc_readdir(struct dentry *dentry, struct rpc_cred *cred, u64 cookie, struct page *page, unsigned int count, int plus) { @@ -24372,7 +23627,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dentry->d_inode), -@@ -2401,7 +2401,7 @@ out: +@@ -2405,7 +2405,7 @@ out: static int nfs4_proc_mknod(struct inode *dir, struct dentry *dentry, struct iattr *sattr, dev_t rdev) { @@ -24381,7 +23636,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(dir), -@@ -2430,7 +2430,7 @@ static int _nfs4_proc_statfs(struct nfs_ +@@ -2434,7 +2434,7 @@ static int _nfs4_proc_statfs(struct nfs_ static int nfs4_proc_statfs(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsstat *fsstat) { @@ -24390,7 +23645,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(server, -@@ -2458,7 +2458,7 @@ static int _nfs4_do_fsinfo(struct nfs_se +@@ -2462,7 +2462,7 @@ static int _nfs4_do_fsinfo(struct nfs_se static int nfs4_do_fsinfo(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_fsinfo *fsinfo) { @@ -24399,7 +23654,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { -@@ -2501,7 +2501,7 @@ static int _nfs4_proc_pathconf(struct nf +@@ -2505,7 +2505,7 @@ static int _nfs4_proc_pathconf(struct nf static int nfs4_proc_pathconf(struct nfs_server *server, struct nfs_fh *fhandle, struct nfs_pathconf *pathconf) { @@ -24408,7 +23663,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { -@@ -2788,7 +2788,7 @@ out_free: +@@ -2789,7 +2789,7 @@ out_free: static ssize_t nfs4_get_acl_uncached(struct inode *inode, void *buf, size_t buflen) { @@ -24417,7 +23672,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c ssize_t ret; do { ret = __nfs4_get_acl_uncached(inode, buf, buflen); -@@ -2845,7 +2845,7 @@ static int __nfs4_proc_set_acl(struct in +@@ -2846,7 +2846,7 @@ static int __nfs4_proc_set_acl(struct in static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen) { @@ -24426,7 +23681,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = nfs4_handle_exception(NFS_SERVER(inode), -@@ -3068,7 +3068,7 @@ out: +@@ -3069,7 +3069,7 @@ out: int nfs4_proc_delegreturn(struct inode *inode, struct rpc_cred *cred, const nfs4_stateid *stateid, int issync) { struct nfs_server *server = NFS_SERVER(inode); @@ -24435,7 +23690,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { err = _nfs4_proc_delegreturn(inode, cred, stateid, issync); -@@ -3141,7 +3141,7 @@ out: +@@ -3142,7 +3142,7 @@ out: static int nfs4_proc_getlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -24444,7 +23699,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { -@@ -3498,7 +3498,7 @@ static int _nfs4_do_setlk(struct nfs4_st +@@ -3499,7 +3499,7 @@ static int _nfs4_do_setlk(struct nfs4_st static int nfs4_lock_reclaim(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -24453,7 +23708,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { -@@ -3516,7 +3516,7 @@ static int nfs4_lock_reclaim(struct nfs4 +@@ -3517,7 +3517,7 @@ static int nfs4_lock_reclaim(struct nfs4 static int nfs4_lock_expired(struct nfs4_state *state, struct file_lock *request) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -24462,7 +23717,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, request); -@@ -3571,7 +3571,7 @@ out: +@@ -3572,7 +3572,7 @@ out: static int nfs4_proc_setlk(struct nfs4_state *state, int cmd, struct file_lock *request) { @@ -24471,7 +23726,7 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; do { -@@ -3621,7 +3621,7 @@ nfs4_proc_lock(struct file *filp, int cm +@@ -3622,7 +3622,7 @@ nfs4_proc_lock(struct file *filp, int cm int nfs4_lock_delegation_recall(struct nfs4_state *state, struct file_lock *fl) { struct nfs_server *server = NFS_SERVER(state->inode); @@ -24480,9 +23735,9 @@ diff -urNp linux-2.6.29.6/fs/nfs/nfs4proc.c linux-2.6.29.6/fs/nfs/nfs4proc.c int err; err = nfs4_set_lock_state(state, fl); -diff -urNp linux-2.6.29.6/fs/nfsd/export.c linux-2.6.29.6/fs/nfsd/export.c ---- linux-2.6.29.6/fs/nfsd/export.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/nfsd/export.c 2009-07-23 18:40:27.471265103 -0400 +diff -urNp linux-2.6.30.4/fs/nfsd/export.c linux-2.6.30.4/fs/nfsd/export.c +--- linux-2.6.30.4/fs/nfsd/export.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nfsd/export.c 2009-07-30 09:48:10.092682326 -0400 @@ -472,7 +472,7 @@ static int secinfo_parse(char **mesg, ch * probably discover the problem when someone fails to * authenticate. @@ -24501,9 +23756,162 @@ diff -urNp linux-2.6.29.6/fs/nfsd/export.c linux-2.6.29.6/fs/nfsd/export.c .start = e_start, .next = e_next, .stop = e_stop, -diff -urNp linux-2.6.29.6/fs/nls/nls_base.c linux-2.6.29.6/fs/nls/nls_base.c ---- linux-2.6.29.6/fs/nls/nls_base.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/nls/nls_base.c 2009-07-23 17:34:32.161096484 -0400 +diff -urNp linux-2.6.30.4/fs/nfsd/nfsctl.c linux-2.6.30.4/fs/nfsd/nfsctl.c +--- linux-2.6.30.4/fs/nfsd/nfsctl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nfsd/nfsctl.c 2009-07-30 12:06:52.128724203 -0400 +@@ -175,7 +175,7 @@ static const struct file_operations expo + + extern int nfsd_pool_stats_open(struct inode *inode, struct file *file); + +-static struct file_operations pool_stats_operations = { ++static const struct file_operations pool_stats_operations = { + .open = nfsd_pool_stats_open, + .read = seq_read, + .llseek = seq_lseek, +diff -urNp linux-2.6.30.4/fs/nilfs2/dir.c linux-2.6.30.4/fs/nilfs2/dir.c +--- linux-2.6.30.4/fs/nilfs2/dir.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/dir.c 2009-07-30 12:06:52.132720832 -0400 +@@ -698,7 +698,7 @@ not_empty: + return 0; + } + +-struct file_operations nilfs_dir_operations = { ++const struct file_operations nilfs_dir_operations = { + .llseek = generic_file_llseek, + .read = generic_read_dir, + .readdir = nilfs_readdir, +diff -urNp linux-2.6.30.4/fs/nilfs2/file.c linux-2.6.30.4/fs/nilfs2/file.c +--- linux-2.6.30.4/fs/nilfs2/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/file.c 2009-07-30 12:07:09.623977752 -0400 +@@ -117,7 +117,7 @@ static int nilfs_page_mkwrite(struct vm_ + return 0; + } + +-struct vm_operations_struct nilfs_file_vm_ops = { ++const struct vm_operations_struct nilfs_file_vm_ops = { + .fault = filemap_fault, + .page_mkwrite = nilfs_page_mkwrite, + }; +@@ -134,7 +134,7 @@ static int nilfs_file_mmap(struct file * + * We have mostly NULL's here: the current defaults are ok for + * the nilfs filesystem. + */ +-struct file_operations nilfs_file_operations = { ++const struct file_operations nilfs_file_operations = { + .llseek = generic_file_llseek, + .read = do_sync_read, + .write = do_sync_write, +@@ -151,7 +151,7 @@ struct file_operations nilfs_file_operat + .splice_read = generic_file_splice_read, + }; + +-struct inode_operations nilfs_file_inode_operations = { ++const struct inode_operations nilfs_file_inode_operations = { + .truncate = nilfs_truncate, + .setattr = nilfs_setattr, + .permission = nilfs_permission, +diff -urNp linux-2.6.30.4/fs/nilfs2/gcinode.c linux-2.6.30.4/fs/nilfs2/gcinode.c +--- linux-2.6.30.4/fs/nilfs2/gcinode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/gcinode.c 2009-07-30 12:07:28.369023156 -0400 +@@ -52,7 +52,7 @@ + #include "dat.h" + #include "ifile.h" + +-static struct address_space_operations def_gcinode_aops = {}; ++static const struct address_space_operations def_gcinode_aops = {}; + /* XXX need def_gcinode_iops/fops? */ + + /* +diff -urNp linux-2.6.30.4/fs/nilfs2/inode.c linux-2.6.30.4/fs/nilfs2/inode.c +--- linux-2.6.30.4/fs/nilfs2/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/inode.c 2009-07-30 12:07:28.374397645 -0400 +@@ -237,7 +237,7 @@ nilfs_direct_IO(int rw, struct kiocb *io + return size; + } + +-struct address_space_operations nilfs_aops = { ++const struct address_space_operations nilfs_aops = { + .writepage = nilfs_writepage, + .readpage = nilfs_readpage, + /* .sync_page = nilfs_sync_page, */ +diff -urNp linux-2.6.30.4/fs/nilfs2/mdt.c linux-2.6.30.4/fs/nilfs2/mdt.c +--- linux-2.6.30.4/fs/nilfs2/mdt.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/mdt.c 2009-07-30 12:07:28.379284534 -0400 +@@ -428,7 +428,7 @@ nilfs_mdt_write_page(struct page *page, + } + + +-static struct address_space_operations def_mdt_aops = { ++static const struct address_space_operations def_mdt_aops = { + .writepage = nilfs_mdt_write_page, + }; + +diff -urNp linux-2.6.30.4/fs/nilfs2/namei.c linux-2.6.30.4/fs/nilfs2/namei.c +--- linux-2.6.30.4/fs/nilfs2/namei.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/namei.c 2009-07-30 12:07:02.764163011 -0400 +@@ -448,7 +448,7 @@ out: + return err; + } + +-struct inode_operations nilfs_dir_inode_operations = { ++const struct inode_operations nilfs_dir_inode_operations = { + .create = nilfs_create, + .lookup = nilfs_lookup, + .link = nilfs_link, +@@ -462,12 +462,12 @@ struct inode_operations nilfs_dir_inode_ + .permission = nilfs_permission, + }; + +-struct inode_operations nilfs_special_inode_operations = { ++const struct inode_operations nilfs_special_inode_operations = { + .setattr = nilfs_setattr, + .permission = nilfs_permission, + }; + +-struct inode_operations nilfs_symlink_inode_operations = { ++const struct inode_operations nilfs_symlink_inode_operations = { + .readlink = generic_readlink, + .follow_link = page_follow_link_light, + .put_link = page_put_link, +diff -urNp linux-2.6.30.4/fs/nilfs2/nilfs.h linux-2.6.30.4/fs/nilfs2/nilfs.h +--- linux-2.6.30.4/fs/nilfs2/nilfs.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/nilfs.h 2009-07-30 12:47:17.035918280 -0400 +@@ -297,13 +297,13 @@ void nilfs_clear_gcdat_inode(struct the_ + /* + * Inodes and files operations + */ +-extern struct file_operations nilfs_dir_operations; +-extern struct inode_operations nilfs_file_inode_operations; +-extern struct file_operations nilfs_file_operations; +-extern struct address_space_operations nilfs_aops; +-extern struct inode_operations nilfs_dir_inode_operations; +-extern struct inode_operations nilfs_special_inode_operations; +-extern struct inode_operations nilfs_symlink_inode_operations; ++extern const struct file_operations nilfs_dir_operations; ++extern const struct inode_operations nilfs_file_inode_operations; ++extern const struct file_operations nilfs_file_operations; ++extern const struct address_space_operations nilfs_aops; ++extern const struct inode_operations nilfs_dir_inode_operations; ++extern const struct inode_operations nilfs_special_inode_operations; ++extern const struct inode_operations nilfs_symlink_inode_operations; + + /* + * filesystem type +diff -urNp linux-2.6.30.4/fs/nilfs2/super.c linux-2.6.30.4/fs/nilfs2/super.c +--- linux-2.6.30.4/fs/nilfs2/super.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nilfs2/super.c 2009-07-30 12:07:21.041339808 -0400 +@@ -520,7 +520,7 @@ static int nilfs_statfs(struct dentry *d + return 0; + } + +-static struct super_operations nilfs_sops = { ++static const struct super_operations nilfs_sops = { + .alloc_inode = nilfs_alloc_inode, + .destroy_inode = nilfs_destroy_inode, + .dirty_inode = nilfs_dirty_inode, +diff -urNp linux-2.6.30.4/fs/nls/nls_base.c linux-2.6.30.4/fs/nls/nls_base.c +--- linux-2.6.30.4/fs/nls/nls_base.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/nls/nls_base.c 2009-07-30 09:48:10.092682326 -0400 @@ -40,7 +40,7 @@ static const struct utf8_table utf8_tabl {0xF8, 0xF0, 3*6, 0x1FFFFF, 0x10000, /* 4 byte sequence */}, {0xFC, 0xF8, 4*6, 0x3FFFFFF, 0x200000, /* 5 byte sequence */}, @@ -24513,9 +23921,9 @@ diff -urNp linux-2.6.29.6/fs/nls/nls_base.c linux-2.6.29.6/fs/nls/nls_base.c }; int -diff -urNp linux-2.6.29.6/fs/ntfs/file.c linux-2.6.29.6/fs/ntfs/file.c ---- linux-2.6.29.6/fs/ntfs/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ntfs/file.c 2009-07-23 17:34:32.162058358 -0400 +diff -urNp linux-2.6.30.4/fs/ntfs/file.c linux-2.6.30.4/fs/ntfs/file.c +--- linux-2.6.30.4/fs/ntfs/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ntfs/file.c 2009-07-30 09:48:10.092682326 -0400 @@ -2291,6 +2291,6 @@ const struct inode_operations ntfs_file_ #endif /* NTFS_RW */ }; @@ -24525,9 +23933,21 @@ diff -urNp linux-2.6.29.6/fs/ntfs/file.c linux-2.6.29.6/fs/ntfs/file.c -const struct inode_operations ntfs_empty_inode_ops = {}; +const struct inode_operations ntfs_empty_inode_ops; -diff -urNp linux-2.6.29.6/fs/ocfs2/cluster/netdebug.c linux-2.6.29.6/fs/ocfs2/cluster/netdebug.c ---- linux-2.6.29.6/fs/ocfs2/cluster/netdebug.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/cluster/netdebug.c 2009-07-23 18:40:28.530706067 -0400 +diff -urNp linux-2.6.30.4/fs/ocfs2/cluster/heartbeat.c linux-2.6.30.4/fs/ocfs2/cluster/heartbeat.c +--- linux-2.6.30.4/fs/ocfs2/cluster/heartbeat.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/cluster/heartbeat.c 2009-07-30 12:06:52.144842473 -0400 +@@ -966,7 +966,7 @@ static ssize_t o2hb_debug_read(struct fi + } + #endif /* CONFIG_DEBUG_FS */ + +-static struct file_operations o2hb_debug_fops = { ++static const struct file_operations o2hb_debug_fops = { + .open = o2hb_debug_open, + .release = o2hb_debug_release, + .read = o2hb_debug_read, +diff -urNp linux-2.6.30.4/fs/ocfs2/cluster/netdebug.c linux-2.6.30.4/fs/ocfs2/cluster/netdebug.c +--- linux-2.6.30.4/fs/ocfs2/cluster/netdebug.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/cluster/netdebug.c 2009-07-30 09:48:10.092682326 -0400 @@ -163,7 +163,7 @@ static void nst_seq_stop(struct seq_file { } @@ -24564,34 +23984,10 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/cluster/netdebug.c linux-2.6.29.6/fs/ocfs2/cl .open = sc_fop_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/fs/ocfs2/dcache.c linux-2.6.29.6/fs/ocfs2/dcache.c ---- linux-2.6.29.6/fs/ocfs2/dcache.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/dcache.c 2009-07-23 18:40:28.532382020 -0400 -@@ -455,7 +455,7 @@ out_move: - d_move(dentry, target); - } - --struct dentry_operations ocfs2_dentry_ops = { -+const struct dentry_operations ocfs2_dentry_ops = { - .d_revalidate = ocfs2_dentry_revalidate, - .d_iput = ocfs2_dentry_iput, - }; -diff -urNp linux-2.6.29.6/fs/ocfs2/dcache.h linux-2.6.29.6/fs/ocfs2/dcache.h ---- linux-2.6.29.6/fs/ocfs2/dcache.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/dcache.h 2009-07-23 18:40:28.544320633 -0400 -@@ -26,7 +26,7 @@ - #ifndef OCFS2_DCACHE_H - #define OCFS2_DCACHE_H - --extern struct dentry_operations ocfs2_dentry_ops; -+extern const struct dentry_operations ocfs2_dentry_ops; - - struct ocfs2_dentry_lock { - /* Use count of dentry lock */ -diff -urNp linux-2.6.29.6/fs/ocfs2/dlm/dlmdebug.c linux-2.6.29.6/fs/ocfs2/dlm/dlmdebug.c ---- linux-2.6.29.6/fs/ocfs2/dlm/dlmdebug.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/dlm/dlmdebug.c 2009-07-23 18:40:28.549511769 -0400 -@@ -489,7 +489,7 @@ bail: +diff -urNp linux-2.6.30.4/fs/ocfs2/dlm/dlmdebug.c linux-2.6.30.4/fs/ocfs2/dlm/dlmdebug.c +--- linux-2.6.30.4/fs/ocfs2/dlm/dlmdebug.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/dlm/dlmdebug.c 2009-07-30 09:48:10.092682326 -0400 +@@ -479,7 +479,7 @@ bail: return -ENOMEM; } @@ -24627,7 +24023,7 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/dlm/dlmdebug.c linux-2.6.29.6/fs/ocfs2/dlm/dl .open = debug_lockres_open, .release = debug_lockres_release, .read = seq_read, -@@ -903,7 +903,7 @@ bail: +@@ -926,7 +926,7 @@ bail: return -ENOMEM; } @@ -24636,10 +24032,10 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/dlm/dlmdebug.c linux-2.6.29.6/fs/ocfs2/dlm/dl .open = debug_state_open, .release = debug_buffer_release, .read = debug_buffer_read, -diff -urNp linux-2.6.29.6/fs/ocfs2/localalloc.c linux-2.6.29.6/fs/ocfs2/localalloc.c ---- linux-2.6.29.6/fs/ocfs2/localalloc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/localalloc.c 2009-07-23 17:34:32.162793620 -0400 -@@ -1272,7 +1272,7 @@ static int ocfs2_local_alloc_slide_windo +diff -urNp linux-2.6.30.4/fs/ocfs2/localalloc.c linux-2.6.30.4/fs/ocfs2/localalloc.c +--- linux-2.6.30.4/fs/ocfs2/localalloc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/localalloc.c 2009-07-30 09:48:10.094563975 -0400 +@@ -1186,7 +1186,7 @@ static int ocfs2_local_alloc_slide_windo goto bail; } @@ -24648,9 +24044,9 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/localalloc.c linux-2.6.29.6/fs/ocfs2/localall status = 0; bail: -diff -urNp linux-2.6.29.6/fs/ocfs2/mmap.c linux-2.6.29.6/fs/ocfs2/mmap.c ---- linux-2.6.29.6/fs/ocfs2/mmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/mmap.c 2009-07-23 18:40:28.550266995 -0400 +diff -urNp linux-2.6.30.4/fs/ocfs2/mmap.c linux-2.6.30.4/fs/ocfs2/mmap.c +--- linux-2.6.30.4/fs/ocfs2/mmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/mmap.c 2009-07-30 09:48:10.094563975 -0400 @@ -202,7 +202,7 @@ out: return ret; } @@ -24660,9 +24056,9 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/mmap.c linux-2.6.29.6/fs/ocfs2/mmap.c .fault = ocfs2_fault, .page_mkwrite = ocfs2_page_mkwrite, }; -diff -urNp linux-2.6.29.6/fs/ocfs2/ocfs2.h linux-2.6.29.6/fs/ocfs2/ocfs2.h ---- linux-2.6.29.6/fs/ocfs2/ocfs2.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/ocfs2.h 2009-07-23 17:34:32.162793620 -0400 +diff -urNp linux-2.6.30.4/fs/ocfs2/ocfs2.h linux-2.6.30.4/fs/ocfs2/ocfs2.h +--- linux-2.6.30.4/fs/ocfs2/ocfs2.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/ocfs2.h 2009-07-30 09:48:10.094563975 -0400 @@ -168,11 +168,11 @@ enum ocfs2_vol_state struct ocfs2_alloc_stats @@ -24680,10 +24076,10 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/ocfs2.h linux-2.6.29.6/fs/ocfs2/ocfs2.h }; enum ocfs2_local_alloc_state -diff -urNp linux-2.6.29.6/fs/ocfs2/suballoc.c linux-2.6.29.6/fs/ocfs2/suballoc.c ---- linux-2.6.29.6/fs/ocfs2/suballoc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ocfs2/suballoc.c 2009-07-23 17:34:32.162793620 -0400 -@@ -602,7 +602,7 @@ static int ocfs2_reserve_suballoc_bits(s +diff -urNp linux-2.6.30.4/fs/ocfs2/suballoc.c linux-2.6.30.4/fs/ocfs2/suballoc.c +--- linux-2.6.30.4/fs/ocfs2/suballoc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/suballoc.c 2009-07-30 09:48:10.094563975 -0400 +@@ -620,7 +620,7 @@ static int ocfs2_reserve_suballoc_bits(s mlog_errno(status); goto bail; } @@ -24692,7 +24088,7 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/suballoc.c linux-2.6.29.6/fs/ocfs2/suballoc.c /* You should never ask for this much metadata */ BUG_ON(bits_wanted > -@@ -1608,7 +1608,7 @@ int ocfs2_claim_metadata(struct ocfs2_su +@@ -1641,7 +1641,7 @@ int ocfs2_claim_metadata(struct ocfs2_su mlog_errno(status); goto bail; } @@ -24701,7 +24097,7 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/suballoc.c linux-2.6.29.6/fs/ocfs2/suballoc.c *blkno_start = bg_blkno + (u64) *suballoc_bit_start; ac->ac_bits_given += (*num_bits); -@@ -1647,7 +1647,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s +@@ -1715,7 +1715,7 @@ int ocfs2_claim_new_inode(struct ocfs2_s mlog_errno(status); goto bail; } @@ -24710,7 +24106,7 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/suballoc.c linux-2.6.29.6/fs/ocfs2/suballoc.c BUG_ON(num_bits != 1); -@@ -1748,7 +1748,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ +@@ -1817,7 +1817,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ cluster_start, num_clusters); if (!status) @@ -24719,7 +24115,7 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/suballoc.c linux-2.6.29.6/fs/ocfs2/suballoc.c } else { if (min_clusters > (osb->bitmap_cpg - 1)) { /* The only paths asking for contiguousness -@@ -1776,7 +1776,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ +@@ -1845,7 +1845,7 @@ int __ocfs2_claim_clusters(struct ocfs2_ ocfs2_desc_bitmap_to_cluster_off(ac->ac_inode, bg_blkno, bg_bit_off); @@ -24728,9 +24124,21 @@ diff -urNp linux-2.6.29.6/fs/ocfs2/suballoc.c linux-2.6.29.6/fs/ocfs2/suballoc.c } } if (status < 0) { -diff -urNp linux-2.6.29.6/fs/omfs/dir.c linux-2.6.29.6/fs/omfs/dir.c ---- linux-2.6.29.6/fs/omfs/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/omfs/dir.c 2009-07-23 18:40:28.558460904 -0400 +diff -urNp linux-2.6.30.4/fs/ocfs2/super.c linux-2.6.30.4/fs/ocfs2/super.c +--- linux-2.6.30.4/fs/ocfs2/super.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ocfs2/super.c 2009-07-30 12:06:52.187885986 -0400 +@@ -362,7 +362,7 @@ static ssize_t ocfs2_debug_read(struct f + } + #endif /* CONFIG_DEBUG_FS */ + +-static struct file_operations ocfs2_osb_debug_fops = { ++static const struct file_operations ocfs2_osb_debug_fops = { + .open = ocfs2_osb_debug_open, + .release = ocfs2_debug_release, + .read = ocfs2_debug_read, +diff -urNp linux-2.6.30.4/fs/omfs/dir.c linux-2.6.30.4/fs/omfs/dir.c +--- linux-2.6.30.4/fs/omfs/dir.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/omfs/dir.c 2009-07-30 09:48:10.094563975 -0400 @@ -489,7 +489,7 @@ out: return ret; } @@ -24749,9 +24157,9 @@ diff -urNp linux-2.6.29.6/fs/omfs/dir.c linux-2.6.29.6/fs/omfs/dir.c .read = generic_read_dir, .readdir = omfs_readdir, .llseek = generic_file_llseek, -diff -urNp linux-2.6.29.6/fs/omfs/file.c linux-2.6.29.6/fs/omfs/file.c ---- linux-2.6.29.6/fs/omfs/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/omfs/file.c 2009-07-23 18:40:28.558460904 -0400 +diff -urNp linux-2.6.30.4/fs/omfs/file.c linux-2.6.30.4/fs/omfs/file.c +--- linux-2.6.30.4/fs/omfs/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/omfs/file.c 2009-07-30 09:48:10.094563975 -0400 @@ -337,7 +337,7 @@ static sector_t omfs_bmap(struct address return generic_block_bmap(mapping, block, omfs_get_block); } @@ -24775,10 +24183,10 @@ diff -urNp linux-2.6.29.6/fs/omfs/file.c linux-2.6.29.6/fs/omfs/file.c .readpage = omfs_readpage, .readpages = omfs_readpages, .writepage = omfs_writepage, -diff -urNp linux-2.6.29.6/fs/omfs/inode.c linux-2.6.29.6/fs/omfs/inode.c ---- linux-2.6.29.6/fs/omfs/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/omfs/inode.c 2009-07-23 18:40:28.559411985 -0400 -@@ -273,7 +273,7 @@ static int omfs_statfs(struct dentry *de +diff -urNp linux-2.6.30.4/fs/omfs/inode.c linux-2.6.30.4/fs/omfs/inode.c +--- linux-2.6.30.4/fs/omfs/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/omfs/inode.c 2009-07-30 09:48:10.096509014 -0400 +@@ -278,7 +278,7 @@ static int omfs_statfs(struct dentry *de return 0; } @@ -24787,9 +24195,9 @@ diff -urNp linux-2.6.29.6/fs/omfs/inode.c linux-2.6.29.6/fs/omfs/inode.c .write_inode = omfs_write_inode, .delete_inode = omfs_delete_inode, .put_super = omfs_put_super, -diff -urNp linux-2.6.29.6/fs/omfs/omfs.h linux-2.6.29.6/fs/omfs/omfs.h ---- linux-2.6.29.6/fs/omfs/omfs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/omfs/omfs.h 2009-07-23 18:40:28.560275663 -0400 +diff -urNp linux-2.6.30.4/fs/omfs/omfs.h linux-2.6.30.4/fs/omfs/omfs.h +--- linux-2.6.30.4/fs/omfs/omfs.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/omfs/omfs.h 2009-07-30 09:48:10.096509014 -0400 @@ -44,16 +44,16 @@ extern int omfs_allocate_range(struct su extern int omfs_clear_range(struct super_block *sb, u64 block, int count); @@ -24812,10 +24220,10 @@ diff -urNp linux-2.6.29.6/fs/omfs/omfs.h linux-2.6.29.6/fs/omfs/omfs.h extern void omfs_make_empty_table(struct buffer_head *bh, int offset); extern int omfs_shrink_inode(struct inode *inode); -diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c ---- linux-2.6.29.6/fs/open.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/open.c 2009-07-23 17:34:32.164099579 -0400 -@@ -205,6 +205,9 @@ int do_truncate(struct dentry *dentry, l +diff -urNp linux-2.6.30.4/fs/open.c linux-2.6.30.4/fs/open.c +--- linux-2.6.30.4/fs/open.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/open.c 2009-07-30 11:10:49.258897345 -0400 +@@ -206,6 +206,9 @@ int do_truncate(struct dentry *dentry, l if (length < 0) return -EINVAL; @@ -24825,7 +24233,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c newattrs.ia_size = length; newattrs.ia_valid = ATTR_SIZE | time_attrs; if (filp) { -@@ -509,6 +512,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con +@@ -510,6 +513,9 @@ SYSCALL_DEFINE3(faccessat, int, dfd, con if (__mnt_is_readonly(path.mnt)) res = -EROFS; @@ -24835,7 +24243,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c out_path_release: path_put(&path); out: -@@ -535,6 +541,8 @@ SYSCALL_DEFINE1(chdir, const char __user +@@ -536,6 +542,8 @@ SYSCALL_DEFINE1(chdir, const char __user if (error) goto dput_and_out; @@ -24844,7 +24252,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c set_fs_pwd(current->fs, &path); dput_and_out: -@@ -561,6 +569,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd +@@ -562,6 +570,13 @@ SYSCALL_DEFINE1(fchdir, unsigned int, fd goto out_putf; error = inode_permission(inode, MAY_EXEC | MAY_ACCESS); @@ -24858,7 +24266,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c if (!error) set_fs_pwd(current->fs, &file->f_path); out_putf: -@@ -586,7 +601,18 @@ SYSCALL_DEFINE1(chroot, const char __use +@@ -587,7 +602,18 @@ SYSCALL_DEFINE1(chroot, const char __use if (!capable(CAP_SYS_CHROOT)) goto dput_and_out; @@ -24877,7 +24285,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c error = 0; dput_and_out: path_put(&path); -@@ -614,13 +640,28 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd +@@ -615,13 +641,28 @@ SYSCALL_DEFINE2(fchmod, unsigned int, fd err = mnt_want_write(file->f_path.mnt); if (err) goto out_putf; @@ -24906,7 +24314,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c mnt_drop_write(file->f_path.mnt); out_putf: fput(file); -@@ -643,13 +684,28 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons +@@ -644,13 +685,28 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons error = mnt_want_write(path.mnt); if (error) goto dput_and_out; @@ -24935,7 +24343,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c mnt_drop_write(path.mnt); dput_and_out: path_put(&path); -@@ -662,12 +718,15 @@ SYSCALL_DEFINE2(chmod, const char __user +@@ -663,12 +719,15 @@ SYSCALL_DEFINE2(chmod, const char __user return sys_fchmodat(AT_FDCWD, filename, mode); } @@ -24952,7 +24360,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c newattrs.ia_valid = ATTR_CTIME; if (user != (uid_t) -1) { newattrs.ia_valid |= ATTR_UID; -@@ -698,7 +757,7 @@ SYSCALL_DEFINE3(chown, const char __user +@@ -699,7 +758,7 @@ SYSCALL_DEFINE3(chown, const char __user error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -24961,7 +24369,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -723,7 +782,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons +@@ -724,7 +783,7 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -24970,7 +24378,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -742,7 +801,7 @@ SYSCALL_DEFINE3(lchown, const char __use +@@ -743,7 +802,7 @@ SYSCALL_DEFINE3(lchown, const char __use error = mnt_want_write(path.mnt); if (error) goto out_release; @@ -24979,7 +24387,7 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c mnt_drop_write(path.mnt); out_release: path_put(&path); -@@ -765,7 +824,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd +@@ -766,7 +825,7 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd goto out_fput; dentry = file->f_path.dentry; audit_inode(NULL, dentry); @@ -24988,10 +24396,10 @@ diff -urNp linux-2.6.29.6/fs/open.c linux-2.6.29.6/fs/open.c mnt_drop_write(file->f_path.mnt); out_fput: fput(file); -diff -urNp linux-2.6.29.6/fs/pipe.c linux-2.6.29.6/fs/pipe.c ---- linux-2.6.29.6/fs/pipe.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/pipe.c 2009-07-23 18:40:28.560275663 -0400 -@@ -848,7 +848,7 @@ void free_pipe_info(struct inode *inode) +diff -urNp linux-2.6.30.4/fs/pipe.c linux-2.6.30.4/fs/pipe.c +--- linux-2.6.30.4/fs/pipe.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/pipe.c 2009-07-30 11:10:49.268433019 -0400 +@@ -872,7 +872,7 @@ void free_pipe_info(struct inode *inode) inode->i_pipe = NULL; } @@ -25000,18 +24408,9 @@ diff -urNp linux-2.6.29.6/fs/pipe.c linux-2.6.29.6/fs/pipe.c static int pipefs_delete_dentry(struct dentry *dentry) { /* -@@ -870,7 +870,7 @@ static char *pipefs_dname(struct dentry - dentry->d_inode->i_ino); - } - --static struct dentry_operations pipefs_dentry_operations = { -+static const struct dentry_operations pipefs_dentry_operations = { - .d_delete = pipefs_delete_dentry, - .d_dname = pipefs_dname, - }; -diff -urNp linux-2.6.29.6/fs/proc/array.c linux-2.6.29.6/fs/proc/array.c ---- linux-2.6.29.6/fs/proc/array.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/array.c 2009-07-23 17:34:32.164990172 -0400 +diff -urNp linux-2.6.30.4/fs/proc/array.c linux-2.6.30.4/fs/proc/array.c +--- linux-2.6.30.4/fs/proc/array.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/array.c 2009-07-30 11:10:49.279288424 -0400 @@ -321,6 +321,21 @@ static inline void task_context_switch_c p->nivcsw); } @@ -25102,10 +24501,10 @@ diff -urNp linux-2.6.29.6/fs/proc/array.c linux-2.6.29.6/fs/proc/array.c + return sprintf(buffer, "%u.%u.%u.%u\n", NIPQUAD(task->signal->curr_ip)); +} +#endif -diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c ---- linux-2.6.29.6/fs/proc/base.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/base.c 2009-07-23 17:34:32.165782392 -0400 -@@ -212,6 +212,9 @@ static int check_mem_permission(struct t +diff -urNp linux-2.6.30.4/fs/proc/base.c linux-2.6.30.4/fs/proc/base.c +--- linux-2.6.30.4/fs/proc/base.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/base.c 2009-07-30 11:10:49.291551908 -0400 +@@ -213,6 +213,9 @@ static int check_mem_permission(struct t if (task == current) return 0; @@ -25115,7 +24514,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c /* * If current is actively ptrace'ing, and would also be * permitted to freshly attach with ptrace now, permit it. -@@ -262,6 +265,9 @@ static int proc_pid_cmdline(struct task_ +@@ -263,6 +266,9 @@ static int proc_pid_cmdline(struct task_ if (!mm->arg_end) goto out_mm; /* Shh! No looking before we're done */ @@ -25125,7 +24524,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c len = mm->arg_end - mm->arg_start; if (len > PAGE_SIZE) -@@ -289,12 +295,26 @@ out: +@@ -290,12 +296,26 @@ out: return res; } @@ -25152,7 +24551,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c do { nwords += 2; } while (mm->saved_auxv[nwords - 2] != 0); /* AT_NULL */ -@@ -330,7 +350,7 @@ static int proc_pid_wchan(struct task_st +@@ -331,7 +351,7 @@ static int proc_pid_wchan(struct task_st } #endif /* CONFIG_KALLSYMS */ @@ -25161,7 +24560,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c #define MAX_STACK_TRACE_DEPTH 64 -@@ -523,7 +543,7 @@ static int proc_pid_limits(struct task_s +@@ -524,7 +544,7 @@ static int proc_pid_limits(struct task_s return count; } @@ -25170,7 +24569,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c static int proc_pid_syscall(struct task_struct *task, char *buffer) { long nr; -@@ -937,6 +957,9 @@ static ssize_t environ_read(struct file +@@ -938,6 +958,9 @@ static ssize_t environ_read(struct file if (!task) goto out_no_task; @@ -25180,7 +24579,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c if (!ptrace_may_access(task, PTRACE_MODE_READ)) goto out; -@@ -1440,7 +1463,11 @@ static struct inode *proc_pid_make_inode +@@ -1441,7 +1464,11 @@ static struct inode *proc_pid_make_inode rcu_read_lock(); cred = __task_cred(task); inode->i_uid = cred->euid; @@ -25192,7 +24591,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c rcu_read_unlock(); } security_task_to_inode(task, inode); -@@ -1458,6 +1485,9 @@ static int pid_getattr(struct vfsmount * +@@ -1459,6 +1486,9 @@ static int pid_getattr(struct vfsmount * struct inode *inode = dentry->d_inode; struct task_struct *task; const struct cred *cred; @@ -25202,7 +24601,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c generic_fillattr(inode, stat); -@@ -1465,12 +1495,34 @@ static int pid_getattr(struct vfsmount * +@@ -1466,12 +1496,34 @@ static int pid_getattr(struct vfsmount * stat->uid = 0; stat->gid = 0; task = pid_task(proc_pid(inode), PIDTYPE_PID); @@ -25238,7 +24637,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c } } rcu_read_unlock(); -@@ -1502,11 +1554,20 @@ static int pid_revalidate(struct dentry +@@ -1503,11 +1555,20 @@ static int pid_revalidate(struct dentry if (task) { if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || @@ -25259,7 +24658,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c rcu_read_unlock(); } else { inode->i_uid = 0; -@@ -1627,7 +1688,8 @@ static int proc_fd_info(struct inode *in +@@ -1628,7 +1689,8 @@ static int proc_fd_info(struct inode *in int fd = proc_fd(inode); if (task) { @@ -25269,7 +24668,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c put_task_struct(task); } if (files) { -@@ -1879,12 +1941,22 @@ static const struct file_operations proc +@@ -1880,12 +1942,22 @@ static const struct file_operations proc static int proc_fd_permission(struct inode *inode, int mask) { int rv; @@ -25294,7 +24693,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c return rv; } -@@ -1993,6 +2065,9 @@ static struct dentry *proc_pident_lookup +@@ -1994,6 +2066,9 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -25304,7 +24703,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc/<tgid>/ without very good reasons. -@@ -2037,6 +2112,9 @@ static int proc_pident_readdir(struct fi +@@ -2038,6 +2113,9 @@ static int proc_pident_readdir(struct fi if (!task) goto out_no_task; @@ -25314,7 +24713,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c ret = 0; i = filp->f_pos; switch (i) { -@@ -2397,6 +2475,9 @@ static struct dentry *proc_base_lookup(s +@@ -2398,6 +2476,9 @@ static struct dentry *proc_base_lookup(s if (p > last) goto out; @@ -25324,7 +24723,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c error = proc_base_instantiate(dir, dentry, task, p); out: -@@ -2483,7 +2564,7 @@ static const struct pid_entry tgid_base_ +@@ -2484,7 +2565,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -25333,7 +24732,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2511,7 +2592,7 @@ static const struct pid_entry tgid_base_ +@@ -2512,7 +2593,7 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #endif @@ -25342,7 +24741,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -@@ -2541,6 +2622,9 @@ static const struct pid_entry tgid_base_ +@@ -2542,6 +2623,9 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_TASK_IO_ACCOUNTING INF("io", S_IRUGO, proc_tgid_io_accounting), #endif @@ -25352,7 +24751,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c }; static int proc_tgid_base_readdir(struct file * filp, -@@ -2670,7 +2754,14 @@ static struct dentry *proc_pid_instantia +@@ -2671,7 +2755,14 @@ static struct dentry *proc_pid_instantia if (!inode) goto out; @@ -25367,7 +24766,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c inode->i_op = &proc_tgid_base_inode_operations; inode->i_fop = &proc_tgid_base_operations; inode->i_flags|=S_IMMUTABLE; -@@ -2712,7 +2803,11 @@ struct dentry *proc_pid_lookup(struct in +@@ -2713,7 +2804,11 @@ struct dentry *proc_pid_lookup(struct in if (!task) goto out; @@ -25379,7 +24778,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c put_task_struct(task); out: return result; -@@ -2777,6 +2872,10 @@ int proc_pid_readdir(struct file * filp, +@@ -2778,6 +2873,10 @@ int proc_pid_readdir(struct file * filp, { unsigned int nr = filp->f_pos - FIRST_PROCESS_ENTRY; struct task_struct *reaper = get_proc_task(filp->f_path.dentry->d_inode); @@ -25390,7 +24789,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c struct tgid_iter iter; struct pid_namespace *ns; -@@ -2795,6 +2894,20 @@ int proc_pid_readdir(struct file * filp, +@@ -2796,6 +2895,20 @@ int proc_pid_readdir(struct file * filp, for (iter = next_tgid(ns, iter); iter.task; iter.tgid += 1, iter = next_tgid(ns, iter)) { @@ -25411,7 +24810,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c filp->f_pos = iter.tgid + TGID_OFFSET; if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) { put_task_struct(iter.task); -@@ -2822,7 +2935,7 @@ static const struct pid_entry tid_base_s +@@ -2823,7 +2936,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_SCHED_DEBUG REG("sched", S_IRUGO|S_IWUSR, proc_pid_sched_operations), #endif @@ -25420,7 +24819,7 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c INF("syscall", S_IRUSR, proc_pid_syscall), #endif INF("cmdline", S_IRUGO, proc_pid_cmdline), -@@ -2849,7 +2962,7 @@ static const struct pid_entry tid_base_s +@@ -2850,7 +2963,7 @@ static const struct pid_entry tid_base_s #ifdef CONFIG_KALLSYMS INF("wchan", S_IRUGO, proc_pid_wchan), #endif @@ -25429,9 +24828,9 @@ diff -urNp linux-2.6.29.6/fs/proc/base.c linux-2.6.29.6/fs/proc/base.c ONE("stack", S_IRUSR, proc_pid_stack), #endif #ifdef CONFIG_SCHEDSTATS -diff -urNp linux-2.6.29.6/fs/proc/cmdline.c linux-2.6.29.6/fs/proc/cmdline.c ---- linux-2.6.29.6/fs/proc/cmdline.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/cmdline.c 2009-07-23 17:34:32.166858420 -0400 +diff -urNp linux-2.6.30.4/fs/proc/cmdline.c linux-2.6.30.4/fs/proc/cmdline.c +--- linux-2.6.30.4/fs/proc/cmdline.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/cmdline.c 2009-07-30 11:10:49.303499047 -0400 @@ -23,7 +23,11 @@ static const struct file_operations cmdl static int __init proc_cmdline_init(void) @@ -25444,9 +24843,9 @@ diff -urNp linux-2.6.29.6/fs/proc/cmdline.c linux-2.6.29.6/fs/proc/cmdline.c return 0; } module_init(proc_cmdline_init); -diff -urNp linux-2.6.29.6/fs/proc/devices.c linux-2.6.29.6/fs/proc/devices.c ---- linux-2.6.29.6/fs/proc/devices.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/devices.c 2009-07-23 17:34:32.166858420 -0400 +diff -urNp linux-2.6.30.4/fs/proc/devices.c linux-2.6.30.4/fs/proc/devices.c +--- linux-2.6.30.4/fs/proc/devices.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/devices.c 2009-07-30 11:10:49.304300221 -0400 @@ -64,7 +64,11 @@ static const struct file_operations proc static int __init proc_devices_init(void) @@ -25459,10 +24858,10 @@ diff -urNp linux-2.6.29.6/fs/proc/devices.c linux-2.6.29.6/fs/proc/devices.c return 0; } module_init(proc_devices_init); -diff -urNp linux-2.6.29.6/fs/proc/inode.c linux-2.6.29.6/fs/proc/inode.c ---- linux-2.6.29.6/fs/proc/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/inode.c 2009-07-23 17:34:32.166858420 -0400 -@@ -463,7 +463,11 @@ struct inode *proc_get_inode(struct supe +diff -urNp linux-2.6.30.4/fs/proc/inode.c linux-2.6.30.4/fs/proc/inode.c +--- linux-2.6.30.4/fs/proc/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/inode.c 2009-07-30 11:10:49.304300221 -0400 +@@ -457,7 +457,11 @@ struct inode *proc_get_inode(struct supe if (de->mode) { inode->i_mode = de->mode; inode->i_uid = de->uid; @@ -25474,9 +24873,9 @@ diff -urNp linux-2.6.29.6/fs/proc/inode.c linux-2.6.29.6/fs/proc/inode.c } if (de->size) inode->i_size = de->size; -diff -urNp linux-2.6.29.6/fs/proc/internal.h linux-2.6.29.6/fs/proc/internal.h ---- linux-2.6.29.6/fs/proc/internal.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/internal.h 2009-07-23 17:34:32.166858420 -0400 +diff -urNp linux-2.6.30.4/fs/proc/internal.h linux-2.6.30.4/fs/proc/internal.h +--- linux-2.6.30.4/fs/proc/internal.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/internal.h 2009-07-30 11:10:49.305386482 -0400 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi struct pid *pid, struct task_struct *task); extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, @@ -25487,9 +24886,9 @@ diff -urNp linux-2.6.29.6/fs/proc/internal.h linux-2.6.29.6/fs/proc/internal.h extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); extern const struct file_operations proc_maps_operations; -diff -urNp linux-2.6.29.6/fs/proc/Kconfig linux-2.6.29.6/fs/proc/Kconfig ---- linux-2.6.29.6/fs/proc/Kconfig 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/Kconfig 2009-07-23 17:34:32.166858420 -0400 +diff -urNp linux-2.6.30.4/fs/proc/Kconfig linux-2.6.30.4/fs/proc/Kconfig +--- linux-2.6.30.4/fs/proc/Kconfig 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/Kconfig 2009-07-30 11:10:49.305386482 -0400 @@ -30,12 +30,12 @@ config PROC_FS config PROC_KCORE @@ -25517,9 +24916,9 @@ diff -urNp linux-2.6.29.6/fs/proc/Kconfig linux-2.6.29.6/fs/proc/Kconfig bool "Enable /proc page monitoring" if EMBEDDED help Various /proc files exist to monitor process memory utilization: -diff -urNp linux-2.6.29.6/fs/proc/kcore.c linux-2.6.29.6/fs/proc/kcore.c ---- linux-2.6.29.6/fs/proc/kcore.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/kcore.c 2009-07-23 17:34:32.167803575 -0400 +diff -urNp linux-2.6.30.4/fs/proc/kcore.c linux-2.6.30.4/fs/proc/kcore.c +--- linux-2.6.30.4/fs/proc/kcore.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/kcore.c 2009-07-30 11:10:49.306366172 -0400 @@ -404,10 +404,12 @@ read_kcore(struct file *file, char __use static int __init proc_kcore_init(void) @@ -25533,9 +24932,9 @@ diff -urNp linux-2.6.29.6/fs/proc/kcore.c linux-2.6.29.6/fs/proc/kcore.c return 0; } module_init(proc_kcore_init); -diff -urNp linux-2.6.29.6/fs/proc/nommu.c linux-2.6.29.6/fs/proc/nommu.c ---- linux-2.6.29.6/fs/proc/nommu.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/nommu.c 2009-07-23 18:40:27.471265103 -0400 +diff -urNp linux-2.6.30.4/fs/proc/nommu.c linux-2.6.30.4/fs/proc/nommu.c +--- linux-2.6.30.4/fs/proc/nommu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/nommu.c 2009-07-30 09:48:10.096509014 -0400 @@ -67,7 +67,7 @@ static int nommu_region_show(struct seq_ if (len < 1) len = 1; @@ -25554,9 +24953,9 @@ diff -urNp linux-2.6.29.6/fs/proc/nommu.c linux-2.6.29.6/fs/proc/nommu.c .start = nommu_region_list_start, .next = nommu_region_list_next, .stop = nommu_region_list_stop, -diff -urNp linux-2.6.29.6/fs/proc/proc_net.c linux-2.6.29.6/fs/proc/proc_net.c ---- linux-2.6.29.6/fs/proc/proc_net.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/proc_net.c 2009-07-23 17:34:32.167803575 -0400 +diff -urNp linux-2.6.30.4/fs/proc/proc_net.c linux-2.6.30.4/fs/proc/proc_net.c +--- linux-2.6.30.4/fs/proc/proc_net.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/proc_net.c 2009-07-30 11:10:49.306366172 -0400 @@ -104,6 +104,17 @@ static struct net *get_proc_task_net(str struct task_struct *task; struct nsproxy *ns; @@ -25575,20 +24974,18 @@ diff -urNp linux-2.6.29.6/fs/proc/proc_net.c linux-2.6.29.6/fs/proc/proc_net.c rcu_read_lock(); task = pid_task(proc_pid(dir), PIDTYPE_PID); -diff -urNp linux-2.6.29.6/fs/proc/proc_sysctl.c linux-2.6.29.6/fs/proc/proc_sysctl.c ---- linux-2.6.29.6/fs/proc/proc_sysctl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/proc_sysctl.c 2009-07-23 19:28:12.262381898 -0400 -@@ -7,7 +7,9 @@ +diff -urNp linux-2.6.30.4/fs/proc/proc_sysctl.c linux-2.6.30.4/fs/proc/proc_sysctl.c +--- linux-2.6.30.4/fs/proc/proc_sysctl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/proc_sysctl.c 2009-07-30 11:10:49.307381327 -0400 +@@ -7,6 +7,8 @@ #include <linux/security.h> #include "internal.h" --static struct dentry_operations proc_sys_dentry_operations; +extern __u32 gr_handle_sysctl(const struct ctl_table *table, const int op); + -+static const struct dentry_operations proc_sys_dentry_operations; + static const struct dentry_operations proc_sys_dentry_operations; static const struct file_operations proc_sys_file_operations; static const struct inode_operations proc_sys_inode_operations; - static const struct file_operations proc_sys_dir_file_operations; @@ -109,6 +111,9 @@ static struct dentry *proc_sys_lookup(st if (!p) goto out; @@ -25619,18 +25016,9 @@ diff -urNp linux-2.6.29.6/fs/proc/proc_sysctl.c linux-2.6.29.6/fs/proc/proc_sysc generic_fillattr(inode, stat); if (table) stat->mode = (stat->mode & S_IFMT) | table->mode; -@@ -396,7 +407,7 @@ static int proc_sys_compare(struct dentr - return !sysctl_is_seen(PROC_I(dentry->d_inode)->sysctl); - } - --static struct dentry_operations proc_sys_dentry_operations = { -+static const struct dentry_operations proc_sys_dentry_operations = { - .d_revalidate = proc_sys_revalidate, - .d_delete = proc_sys_delete, - .d_compare = proc_sys_compare, -diff -urNp linux-2.6.29.6/fs/proc/root.c linux-2.6.29.6/fs/proc/root.c ---- linux-2.6.29.6/fs/proc/root.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/root.c 2009-07-23 17:34:32.167803575 -0400 +diff -urNp linux-2.6.30.4/fs/proc/root.c linux-2.6.30.4/fs/proc/root.c +--- linux-2.6.30.4/fs/proc/root.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/root.c 2009-07-30 11:10:49.307381327 -0400 @@ -101,6 +101,11 @@ static struct file_system_type proc_fs_t .kill_sb = proc_kill_sb, }; @@ -25665,9 +25053,9 @@ diff -urNp linux-2.6.29.6/fs/proc/root.c linux-2.6.29.6/fs/proc/root.c } static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat -diff -urNp linux-2.6.29.6/fs/proc/task_mmu.c linux-2.6.29.6/fs/proc/task_mmu.c ---- linux-2.6.29.6/fs/proc/task_mmu.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/task_mmu.c 2009-07-23 17:34:32.168754984 -0400 +diff -urNp linux-2.6.30.4/fs/proc/task_mmu.c linux-2.6.30.4/fs/proc/task_mmu.c +--- linux-2.6.30.4/fs/proc/task_mmu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/task_mmu.c 2009-07-30 11:27:12.967439752 -0400 @@ -46,15 +46,26 @@ void task_mem(struct seq_file *m, struct "VmStk:\t%8lu kB\n" "VmExe:\t%8lu kB\n" @@ -25711,7 +25099,7 @@ diff -urNp linux-2.6.29.6/fs/proc/task_mmu.c linux-2.6.29.6/fs/proc/task_mmu.c static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma) { struct mm_struct *mm = vma->vm_mm; -@@ -214,13 +231,22 @@ static void show_map_vma(struct seq_file +@@ -216,13 +233,22 @@ static void show_map_vma(struct seq_file } seq_printf(m, "%08lx-%08lx %c%c%c%c %08llx %02x:%02x %lu %n", @@ -25727,14 +25115,14 @@ diff -urNp linux-2.6.29.6/fs/proc/task_mmu.c linux-2.6.29.6/fs/proc/task_mmu.c flags & VM_EXEC ? 'x' : '-', flags & VM_MAYSHARE ? 's' : 'p', +#ifdef CONFIG_GRKERNSEC_PROC_MEMMAP -+ PAX_RAND_FLAGS(mm) ? 0UL : ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, ++ PAX_RAND_FLAGS(mm) ? 0UL : pgoff, +#else - ((loff_t)vma->vm_pgoff) << PAGE_SHIFT, + pgoff, +#endif MAJOR(dev), MINOR(dev), ino, &len); /* -@@ -229,16 +255,16 @@ static void show_map_vma(struct seq_file +@@ -231,16 +257,16 @@ static void show_map_vma(struct seq_file */ if (file) { pad_len_spaces(m, len); @@ -25756,7 +25144,7 @@ diff -urNp linux-2.6.29.6/fs/proc/task_mmu.c linux-2.6.29.6/fs/proc/task_mmu.c name = "[stack]"; } } else { -@@ -381,9 +407,16 @@ static int show_smap(struct seq_file *m, +@@ -383,9 +409,16 @@ static int show_smap(struct seq_file *m, }; memset(&mss, 0, sizeof mss); @@ -25776,7 +25164,7 @@ diff -urNp linux-2.6.29.6/fs/proc/task_mmu.c linux-2.6.29.6/fs/proc/task_mmu.c show_map_vma(m, vma); -@@ -399,7 +432,11 @@ static int show_smap(struct seq_file *m, +@@ -401,7 +434,11 @@ static int show_smap(struct seq_file *m, "Swap: %8lu kB\n" "KernelPageSize: %8lu kB\n" "MMUPageSize: %8lu kB\n", @@ -25788,10 +25176,10 @@ diff -urNp linux-2.6.29.6/fs/proc/task_mmu.c linux-2.6.29.6/fs/proc/task_mmu.c mss.resident >> 10, (unsigned long)(mss.pss >> (10 + PSS_SHIFT)), mss.shared_clean >> 10, -diff -urNp linux-2.6.29.6/fs/proc/task_nommu.c linux-2.6.29.6/fs/proc/task_nommu.c ---- linux-2.6.29.6/fs/proc/task_nommu.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/proc/task_nommu.c 2009-07-23 17:34:32.168754984 -0400 -@@ -49,7 +49,7 @@ void task_mem(struct seq_file *m, struct +diff -urNp linux-2.6.30.4/fs/proc/task_nommu.c linux-2.6.30.4/fs/proc/task_nommu.c +--- linux-2.6.30.4/fs/proc/task_nommu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/proc/task_nommu.c 2009-07-30 09:48:10.096509014 -0400 +@@ -50,7 +50,7 @@ void task_mem(struct seq_file *m, struct else bytes += kobjsize(mm); @@ -25800,7 +25188,7 @@ diff -urNp linux-2.6.29.6/fs/proc/task_nommu.c linux-2.6.29.6/fs/proc/task_nommu sbytes += kobjsize(current->fs); else bytes += kobjsize(current->fs); -@@ -151,7 +151,7 @@ static int nommu_vma_show(struct seq_fil +@@ -154,7 +154,7 @@ static int nommu_vma_show(struct seq_fil if (len < 1) len = 1; seq_printf(m, "%*c", len, ' '); @@ -25809,9 +25197,9 @@ diff -urNp linux-2.6.29.6/fs/proc/task_nommu.c linux-2.6.29.6/fs/proc/task_nommu } seq_putc(m, '\n'); -diff -urNp linux-2.6.29.6/fs/readdir.c linux-2.6.29.6/fs/readdir.c ---- linux-2.6.29.6/fs/readdir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/readdir.c 2009-07-23 17:34:32.168754984 -0400 +diff -urNp linux-2.6.30.4/fs/readdir.c linux-2.6.30.4/fs/readdir.c +--- linux-2.6.30.4/fs/readdir.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/readdir.c 2009-07-30 11:10:49.318449083 -0400 @@ -16,6 +16,7 @@ #include <linux/security.h> #include <linux/syscalls.h> @@ -25901,10 +25289,10 @@ diff -urNp linux-2.6.29.6/fs/readdir.c linux-2.6.29.6/fs/readdir.c buf.count = count; buf.error = 0; -diff -urNp linux-2.6.29.6/fs/reiserfs/do_balan.c linux-2.6.29.6/fs/reiserfs/do_balan.c ---- linux-2.6.29.6/fs/reiserfs/do_balan.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/reiserfs/do_balan.c 2009-07-23 17:34:32.169708808 -0400 -@@ -2114,7 +2114,7 @@ void do_balance(struct tree_balance *tb, +diff -urNp linux-2.6.30.4/fs/reiserfs/do_balan.c linux-2.6.30.4/fs/reiserfs/do_balan.c +--- linux-2.6.30.4/fs/reiserfs/do_balan.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/reiserfs/do_balan.c 2009-07-30 09:48:10.096509014 -0400 +@@ -2059,7 +2059,7 @@ void do_balance(struct tree_balance *tb, return; } @@ -25913,21 +25301,21 @@ diff -urNp linux-2.6.29.6/fs/reiserfs/do_balan.c linux-2.6.29.6/fs/reiserfs/do_b do_balance_starts(tb); /* balance leaf returns 0 except if combining L R and S into -diff -urNp linux-2.6.29.6/fs/reiserfs/xattr.c linux-2.6.29.6/fs/reiserfs/xattr.c ---- linux-2.6.29.6/fs/reiserfs/xattr.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/reiserfs/xattr.c 2009-07-23 18:40:28.566682353 -0400 -@@ -1136,7 +1136,7 @@ xattr_lookup_poison(struct dentry *dentr - return 1; - } +diff -urNp linux-2.6.30.4/fs/romfs/super.c linux-2.6.30.4/fs/romfs/super.c +--- linux-2.6.30.4/fs/romfs/super.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/romfs/super.c 2009-07-30 12:07:02.769214712 -0400 +@@ -284,7 +284,7 @@ static const struct file_operations romf + .readdir = romfs_readdir, + }; --static struct dentry_operations xattr_lookup_poison_ops = { -+static const struct dentry_operations xattr_lookup_poison_ops = { - .d_compare = xattr_lookup_poison, +-static struct inode_operations romfs_dir_inode_operations = { ++static const struct inode_operations romfs_dir_inode_operations = { + .lookup = romfs_lookup, }; -diff -urNp linux-2.6.29.6/fs/select.c linux-2.6.29.6/fs/select.c ---- linux-2.6.29.6/fs/select.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/select.c 2009-07-23 17:34:32.169708808 -0400 +diff -urNp linux-2.6.30.4/fs/select.c linux-2.6.30.4/fs/select.c +--- linux-2.6.30.4/fs/select.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/select.c 2009-07-30 11:10:49.324080336 -0400 @@ -19,6 +19,7 @@ #include <linux/module.h> #include <linux/slab.h> @@ -25944,9 +25332,9 @@ diff -urNp linux-2.6.29.6/fs/select.c linux-2.6.29.6/fs/select.c if (nfds > current->signal->rlim[RLIMIT_NOFILE].rlim_cur) return -EINVAL; -diff -urNp linux-2.6.29.6/fs/seq_file.c linux-2.6.29.6/fs/seq_file.c ---- linux-2.6.29.6/fs/seq_file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/seq_file.c 2009-07-23 17:34:32.169708808 -0400 +diff -urNp linux-2.6.30.4/fs/seq_file.c linux-2.6.30.4/fs/seq_file.c +--- linux-2.6.30.4/fs/seq_file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/seq_file.c 2009-07-30 11:10:49.336155631 -0400 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, return 0; } @@ -25987,9 +25375,9 @@ diff -urNp linux-2.6.29.6/fs/seq_file.c linux-2.6.29.6/fs/seq_file.c if (!m->buf) goto Enomem; m->count = 0; -diff -urNp linux-2.6.29.6/fs/smbfs/symlink.c linux-2.6.29.6/fs/smbfs/symlink.c ---- linux-2.6.29.6/fs/smbfs/symlink.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/smbfs/symlink.c 2009-07-23 17:34:32.169708808 -0400 +diff -urNp linux-2.6.30.4/fs/smbfs/symlink.c linux-2.6.30.4/fs/smbfs/symlink.c +--- linux-2.6.30.4/fs/smbfs/symlink.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/smbfs/symlink.c 2009-07-30 09:48:10.098443569 -0400 @@ -55,7 +55,7 @@ static void *smb_follow_link(struct dent static void smb_put_link(struct dentry *dentry, struct nameidata *nd, void *p) @@ -25999,9 +25387,9 @@ diff -urNp linux-2.6.29.6/fs/smbfs/symlink.c linux-2.6.29.6/fs/smbfs/symlink.c if (!IS_ERR(s)) __putname(s); } -diff -urNp linux-2.6.29.6/fs/squashfs/super.c linux-2.6.29.6/fs/squashfs/super.c ---- linux-2.6.29.6/fs/squashfs/super.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/squashfs/super.c 2009-07-23 18:40:28.577043173 -0400 +diff -urNp linux-2.6.30.4/fs/squashfs/super.c linux-2.6.30.4/fs/squashfs/super.c +--- linux-2.6.30.4/fs/squashfs/super.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/squashfs/super.c 2009-07-30 09:48:10.098443569 -0400 @@ -43,7 +43,7 @@ #include "squashfs.h" @@ -26011,7 +25399,7 @@ diff -urNp linux-2.6.29.6/fs/squashfs/super.c linux-2.6.29.6/fs/squashfs/super.c static int supported_squashfs_filesystem(short major, short minor, short comp) { -@@ -426,7 +426,7 @@ static struct file_system_type squashfs_ +@@ -439,7 +439,7 @@ static struct file_system_type squashfs_ .fs_flags = FS_REQUIRES_DEV }; @@ -26020,21 +25408,30 @@ diff -urNp linux-2.6.29.6/fs/squashfs/super.c linux-2.6.29.6/fs/squashfs/super.c .alloc_inode = squashfs_alloc_inode, .destroy_inode = squashfs_destroy_inode, .statfs = squashfs_statfs, -diff -urNp linux-2.6.29.6/fs/sysfs/dir.c linux-2.6.29.6/fs/sysfs/dir.c ---- linux-2.6.29.6/fs/sysfs/dir.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/sysfs/dir.c 2009-07-23 18:40:28.589290669 -0400 -@@ -302,7 +302,7 @@ static void sysfs_d_iput(struct dentry * - iput(inode); +diff -urNp linux-2.6.30.4/fs/sysfs/bin.c linux-2.6.30.4/fs/sysfs/bin.c +--- linux-2.6.30.4/fs/sysfs/bin.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/sysfs/bin.c 2009-07-30 12:02:44.278047822 -0400 +@@ -40,7 +40,7 @@ struct bin_buffer { + struct mutex mutex; + void *buffer; + int mmapped; +- struct vm_operations_struct *vm_ops; ++ const struct vm_operations_struct *vm_ops; + struct file *file; + struct hlist_node list; + }; +@@ -330,7 +330,7 @@ static int bin_migrate(struct vm_area_st } + #endif --static struct dentry_operations sysfs_dentry_ops = { -+static const struct dentry_operations sysfs_dentry_ops = { - .d_iput = sysfs_d_iput, - }; - -diff -urNp linux-2.6.29.6/fs/sysfs/symlink.c linux-2.6.29.6/fs/sysfs/symlink.c ---- linux-2.6.29.6/fs/sysfs/symlink.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/sysfs/symlink.c 2009-07-23 17:34:32.169708808 -0400 +-static struct vm_operations_struct bin_vm_ops = { ++static const struct vm_operations_struct bin_vm_ops = { + .open = bin_vma_open, + .close = bin_vma_close, + .fault = bin_fault, +diff -urNp linux-2.6.30.4/fs/sysfs/symlink.c linux-2.6.30.4/fs/sysfs/symlink.c +--- linux-2.6.30.4/fs/sysfs/symlink.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/sysfs/symlink.c 2009-07-30 09:48:10.098443569 -0400 @@ -200,7 +200,7 @@ static void *sysfs_follow_link(struct de static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie) @@ -26044,34 +25441,10 @@ diff -urNp linux-2.6.29.6/fs/sysfs/symlink.c linux-2.6.29.6/fs/sysfs/symlink.c if (!IS_ERR(page)) free_page((unsigned long)page); } -diff -urNp linux-2.6.29.6/fs/sysv/namei.c linux-2.6.29.6/fs/sysv/namei.c ---- linux-2.6.29.6/fs/sysv/namei.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/sysv/namei.c 2009-07-23 18:40:28.589290669 -0400 -@@ -38,7 +38,7 @@ static int sysv_hash(struct dentry *dent - return 0; - } - --struct dentry_operations sysv_dentry_operations = { -+const struct dentry_operations sysv_dentry_operations = { - .d_hash = sysv_hash, - }; - -diff -urNp linux-2.6.29.6/fs/sysv/sysv.h linux-2.6.29.6/fs/sysv/sysv.h ---- linux-2.6.29.6/fs/sysv/sysv.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/sysv/sysv.h 2009-07-23 18:40:28.590278279 -0400 -@@ -170,7 +170,7 @@ extern const struct file_operations sysv - extern const struct file_operations sysv_dir_operations; - extern const struct address_space_operations sysv_aops; - extern const struct super_operations sysv_sops; --extern struct dentry_operations sysv_dentry_operations; -+extern const struct dentry_operations sysv_dentry_operations; - - - enum { -diff -urNp linux-2.6.29.6/fs/ubifs/file.c linux-2.6.29.6/fs/ubifs/file.c ---- linux-2.6.29.6/fs/ubifs/file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ubifs/file.c 2009-07-23 18:40:28.610477859 -0400 -@@ -1526,7 +1526,7 @@ out_unlock: +diff -urNp linux-2.6.30.4/fs/ubifs/file.c linux-2.6.30.4/fs/ubifs/file.c +--- linux-2.6.30.4/fs/ubifs/file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ubifs/file.c 2009-07-30 09:48:10.100960655 -0400 +@@ -1536,7 +1536,7 @@ out_unlock: return err; } @@ -26080,21 +25453,21 @@ diff -urNp linux-2.6.29.6/fs/ubifs/file.c linux-2.6.29.6/fs/ubifs/file.c .fault = filemap_fault, .page_mkwrite = ubifs_vm_page_mkwrite, }; -diff -urNp linux-2.6.29.6/fs/udf/balloc.c linux-2.6.29.6/fs/udf/balloc.c ---- linux-2.6.29.6/fs/udf/balloc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/udf/balloc.c 2009-07-23 17:34:32.170868529 -0400 -@@ -169,9 +169,7 @@ static void udf_bitmap_free_blocks(struc - unsigned long overflow; +diff -urNp linux-2.6.30.4/fs/udf/balloc.c linux-2.6.30.4/fs/udf/balloc.c +--- linux-2.6.30.4/fs/udf/balloc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/udf/balloc.c 2009-07-30 09:48:10.100960655 -0400 +@@ -172,9 +172,7 @@ static void udf_bitmap_free_blocks(struc mutex_lock(&sbi->s_alloc_mutex); -- if (bloc.logicalBlockNum < 0 || -- (bloc.logicalBlockNum + count) > -- sbi->s_partmaps[bloc.partitionReferenceNum].s_partition_len) { -+ if (bloc.logicalBlockNum + count > sbi->s_partmaps[bloc.partitionReferenceNum].s_partition_len) { + partmap = &sbi->s_partmaps[bloc->partitionReferenceNum]; +- if (bloc->logicalBlockNum < 0 || +- (bloc->logicalBlockNum + count) > +- partmap->s_partition_len) { ++ if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) { udf_debug("%d < %d || %d + %d > %d\n", - bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, - sbi->s_partmaps[bloc.partitionReferenceNum]. -@@ -239,7 +237,7 @@ static int udf_bitmap_prealloc_blocks(st + bloc->logicalBlockNum, 0, bloc->logicalBlockNum, + count, partmap->s_partition_len); +@@ -238,7 +236,7 @@ static int udf_bitmap_prealloc_blocks(st mutex_lock(&sbi->s_alloc_mutex); part_len = sbi->s_partmaps[partition].s_partition_len; @@ -26103,7 +25476,7 @@ diff -urNp linux-2.6.29.6/fs/udf/balloc.c linux-2.6.29.6/fs/udf/balloc.c goto out; if (first_block + block_count > part_len) -@@ -300,7 +298,7 @@ static int udf_bitmap_new_block(struct s +@@ -297,7 +295,7 @@ static int udf_bitmap_new_block(struct s mutex_lock(&sbi->s_alloc_mutex); repeat: @@ -26112,18 +25485,18 @@ diff -urNp linux-2.6.29.6/fs/udf/balloc.c linux-2.6.29.6/fs/udf/balloc.c goal = 0; nr_groups = bitmap->s_nr_groups; -@@ -438,9 +436,7 @@ static void udf_table_free_blocks(struct - struct udf_inode_info *iinfo; +@@ -436,9 +434,7 @@ static void udf_table_free_blocks(struct mutex_lock(&sbi->s_alloc_mutex); -- if (bloc.logicalBlockNum < 0 || -- (bloc.logicalBlockNum + count) > -- sbi->s_partmaps[bloc.partitionReferenceNum].s_partition_len) { -+ if (bloc.logicalBlockNum + count > sbi->s_partmaps[bloc.partitionReferenceNum].s_partition_len) { + partmap = &sbi->s_partmaps[bloc->partitionReferenceNum]; +- if (bloc->logicalBlockNum < 0 || +- (bloc->logicalBlockNum + count) > +- partmap->s_partition_len) { ++ if ((bloc->logicalBlockNum + count) > partmap->s_partition_len) { udf_debug("%d < %d || %d + %d > %d\n", bloc.logicalBlockNum, 0, bloc.logicalBlockNum, count, - sbi->s_partmaps[bloc.partitionReferenceNum]. -@@ -671,8 +667,7 @@ static int udf_table_prealloc_blocks(str + partmap->s_partition_len); +@@ -666,8 +662,7 @@ static int udf_table_prealloc_blocks(str int8_t etype = -1; struct udf_inode_info *iinfo; @@ -26133,7 +25506,7 @@ diff -urNp linux-2.6.29.6/fs/udf/balloc.c linux-2.6.29.6/fs/udf/balloc.c return 0; iinfo = UDF_I(table); -@@ -750,7 +745,7 @@ static int udf_table_new_block(struct su +@@ -743,7 +738,7 @@ static int udf_table_new_block(struct su return newblock; mutex_lock(&sbi->s_alloc_mutex); @@ -26142,9 +25515,9 @@ diff -urNp linux-2.6.29.6/fs/udf/balloc.c linux-2.6.29.6/fs/udf/balloc.c goal = 0; /* We search for the closest matching block to goal. If we find -diff -urNp linux-2.6.29.6/fs/ufs/inode.c linux-2.6.29.6/fs/ufs/inode.c ---- linux-2.6.29.6/fs/ufs/inode.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/ufs/inode.c 2009-07-23 17:34:32.170868529 -0400 +diff -urNp linux-2.6.30.4/fs/ufs/inode.c linux-2.6.30.4/fs/ufs/inode.c +--- linux-2.6.30.4/fs/ufs/inode.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/ufs/inode.c 2009-07-30 09:48:10.101729491 -0400 @@ -56,9 +56,7 @@ static int ufs_block_to_path(struct inod @@ -26176,9 +25549,9 @@ diff -urNp linux-2.6.29.6/fs/ufs/inode.c linux-2.6.29.6/fs/ufs/inode.c abort_too_big: ufs_warning(sb, "ufs_get_block", "block > big"); goto abort; -diff -urNp linux-2.6.29.6/fs/utimes.c linux-2.6.29.6/fs/utimes.c ---- linux-2.6.29.6/fs/utimes.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/utimes.c 2009-07-23 17:34:32.170868529 -0400 +diff -urNp linux-2.6.30.4/fs/utimes.c linux-2.6.30.4/fs/utimes.c +--- linux-2.6.30.4/fs/utimes.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/utimes.c 2009-07-30 11:10:49.345424878 -0400 @@ -1,6 +1,7 @@ #include <linux/compiler.h> #include <linux/file.h> @@ -26200,9 +25573,9 @@ diff -urNp linux-2.6.29.6/fs/utimes.c linux-2.6.29.6/fs/utimes.c mutex_lock(&inode->i_mutex); error = notify_change(path->dentry, &newattrs); mutex_unlock(&inode->i_mutex); -diff -urNp linux-2.6.29.6/fs/xfs/linux-2.6/xfs_file.c linux-2.6.29.6/fs/xfs/linux-2.6/xfs_file.c ---- linux-2.6.29.6/fs/xfs/linux-2.6/xfs_file.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/xfs/linux-2.6/xfs_file.c 2009-07-23 18:40:28.621302411 -0400 +diff -urNp linux-2.6.30.4/fs/xfs/linux-2.6/xfs_file.c linux-2.6.30.4/fs/xfs/linux-2.6/xfs_file.c +--- linux-2.6.30.4/fs/xfs/linux-2.6/xfs_file.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/xfs/linux-2.6/xfs_file.c 2009-07-30 09:48:10.102932228 -0400 @@ -43,7 +43,7 @@ #include <linux/dcache.h> #include <linux/smp_lock.h> @@ -26221,10 +25594,10 @@ diff -urNp linux-2.6.29.6/fs/xfs/linux-2.6/xfs_file.c linux-2.6.29.6/fs/xfs/linu .fault = filemap_fault, .page_mkwrite = xfs_vm_page_mkwrite, }; -diff -urNp linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c ---- linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c 2009-07-23 17:34:32.170868529 -0400 -@@ -494,7 +494,7 @@ xfs_vn_put_link( +diff -urNp linux-2.6.30.4/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.30.4/fs/xfs/linux-2.6/xfs_iops.c +--- linux-2.6.30.4/fs/xfs/linux-2.6/xfs_iops.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/xfs/linux-2.6/xfs_iops.c 2009-07-30 09:48:10.102932228 -0400 +@@ -482,7 +482,7 @@ xfs_vn_put_link( struct nameidata *nd, void *p) { @@ -26233,19 +25606,19 @@ diff -urNp linux-2.6.29.6/fs/xfs/linux-2.6/xfs_iops.c linux-2.6.29.6/fs/xfs/linu if (!IS_ERR(s)) kfree(s); -diff -urNp linux-2.6.29.6/fs/xfs/linux-2.6/xfs_super.c linux-2.6.29.6/fs/xfs/linux-2.6/xfs_super.c ---- linux-2.6.29.6/fs/xfs/linux-2.6/xfs_super.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/xfs/linux-2.6/xfs_super.c 2009-07-23 18:40:28.631296881 -0400 -@@ -69,7 +69,7 @@ +diff -urNp linux-2.6.30.4/fs/xfs/linux-2.6/xfs_super.c linux-2.6.30.4/fs/xfs/linux-2.6/xfs_super.c +--- linux-2.6.30.4/fs/xfs/linux-2.6/xfs_super.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/xfs/linux-2.6/xfs_super.c 2009-07-30 13:03:07.229966859 -0400 +@@ -68,7 +68,7 @@ + #include <linux/freezer.h> #include <linux/parser.h> - static struct quotactl_ops xfs_quotactl_operations; -static struct super_operations xfs_super_operations; +static const struct super_operations xfs_super_operations; static kmem_zone_t *xfs_ioend_zone; mempool_t *xfs_ioend_pool; -@@ -1564,7 +1564,7 @@ xfs_fs_get_sb( +@@ -1527,7 +1527,7 @@ xfs_fs_get_sb( mnt); } @@ -26254,9 +25627,9 @@ diff -urNp linux-2.6.29.6/fs/xfs/linux-2.6/xfs_super.c linux-2.6.29.6/fs/xfs/lin .alloc_inode = xfs_fs_alloc_inode, .destroy_inode = xfs_fs_destroy_inode, .write_inode = xfs_fs_write_inode, -diff -urNp linux-2.6.29.6/fs/xfs/xfs_bmap.c linux-2.6.29.6/fs/xfs/xfs_bmap.c ---- linux-2.6.29.6/fs/xfs/xfs_bmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/fs/xfs/xfs_bmap.c 2009-07-23 17:34:32.171850695 -0400 +diff -urNp linux-2.6.30.4/fs/xfs/xfs_bmap.c linux-2.6.30.4/fs/xfs/xfs_bmap.c +--- linux-2.6.30.4/fs/xfs/xfs_bmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/fs/xfs/xfs_bmap.c 2009-07-30 09:48:10.103749934 -0400 @@ -360,7 +360,7 @@ xfs_bmap_validate_ret( int nmap, int ret_nmap); @@ -26266,9 +25639,9 @@ diff -urNp linux-2.6.29.6/fs/xfs/xfs_bmap.c linux-2.6.29.6/fs/xfs/xfs_bmap.c #endif /* DEBUG */ #if defined(XFS_RW_TRACE) -diff -urNp linux-2.6.29.6/grsecurity/gracl_alloc.c linux-2.6.29.6/grsecurity/gracl_alloc.c ---- linux-2.6.29.6/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_alloc.c 2009-07-23 17:34:32.172792791 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl_alloc.c linux-2.6.30.4/grsecurity/gracl_alloc.c +--- linux-2.6.30.4/grsecurity/gracl_alloc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_alloc.c 2009-07-30 11:10:49.345424878 -0400 @@ -0,0 +1,105 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -26375,9 +25748,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_alloc.c linux-2.6.29.6/grsecurity/gra + else + return 1; +} -diff -urNp linux-2.6.29.6/grsecurity/gracl.c linux-2.6.29.6/grsecurity/gracl.c ---- linux-2.6.29.6/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl.c 2009-07-23 18:43:31.274004949 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl.c linux-2.6.30.4/grsecurity/gracl.c +--- linux-2.6.30.4/grsecurity/gracl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl.c 2009-07-30 11:10:49.345424878 -0400 @@ -0,0 +1,3892 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -30271,9 +29644,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl.c linux-2.6.29.6/grsecurity/gracl.c +EXPORT_SYMBOL(gr_check_group_change); +#endif + -diff -urNp linux-2.6.29.6/grsecurity/gracl_cap.c linux-2.6.29.6/grsecurity/gracl_cap.c ---- linux-2.6.29.6/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_cap.c 2009-07-23 17:34:32.174773311 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl_cap.c linux-2.6.30.4/grsecurity/gracl_cap.c +--- linux-2.6.30.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_cap.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,131 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -30406,10 +29779,10 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_cap.c linux-2.6.29.6/grsecurity/gracl + return 0; +} + -diff -urNp linux-2.6.29.6/grsecurity/gracl_fs.c linux-2.6.29.6/grsecurity/gracl_fs.c ---- linux-2.6.29.6/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_fs.c 2009-07-23 17:34:32.174773311 -0400 -@@ -0,0 +1,423 @@ +diff -urNp linux-2.6.30.4/grsecurity/gracl_fs.c linux-2.6.30.4/grsecurity/gracl_fs.c +--- linux-2.6.30.4/grsecurity/gracl_fs.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_fs.c 2009-08-01 15:00:28.098114831 -0400 +@@ -0,0 +1,424 @@ +#include <linux/kernel.h> +#include <linux/sched.h> +#include <linux/types.h> @@ -30460,7 +29833,8 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_fs.c linux-2.6.29.6/grsecurity/gracl_ + reqmode |= GR_WRITE; + if (likely((fmode & FMODE_READ) && !(fmode & O_DIRECTORY))) + reqmode |= GR_READ; -+ ++ if ((fmode & FMODE_GREXEC) && (fmode & FMODE_EXEC)) ++ reqmode &= ~GR_READ; + mode = + gr_search_file(dentry, reqmode | to_gr_audit(reqmode) | GR_SUPPRESS, + mnt); @@ -30833,9 +30207,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_fs.c linux-2.6.29.6/grsecurity/gracl_ + + return 0; +} -diff -urNp linux-2.6.29.6/grsecurity/gracl_ip.c linux-2.6.29.6/grsecurity/gracl_ip.c ---- linux-2.6.29.6/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_ip.c 2009-07-23 17:34:32.174773311 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl_ip.c linux-2.6.30.4/grsecurity/gracl_ip.c +--- linux-2.6.30.4/grsecurity/gracl_ip.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_ip.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,340 @@ +#include <linux/kernel.h> +#include <asm/uaccess.h> @@ -31177,9 +30551,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_ip.c linux-2.6.29.6/grsecurity/gracl_ + + return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM); +} -diff -urNp linux-2.6.29.6/grsecurity/gracl_learn.c linux-2.6.29.6/grsecurity/gracl_learn.c ---- linux-2.6.29.6/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_learn.c 2009-07-23 18:43:31.274004949 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl_learn.c linux-2.6.30.4/grsecurity/gracl_learn.c +--- linux-2.6.30.4/grsecurity/gracl_learn.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_learn.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,211 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -31392,9 +30766,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_learn.c linux-2.6.29.6/grsecurity/gra + .release = close_learn, + .poll = poll_learn, +}; -diff -urNp linux-2.6.29.6/grsecurity/gracl_res.c linux-2.6.29.6/grsecurity/gracl_res.c ---- linux-2.6.29.6/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_res.c 2009-07-23 17:34:32.175727734 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl_res.c linux-2.6.30.4/grsecurity/gracl_res.c +--- linux-2.6.30.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_res.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,58 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -31454,9 +30828,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_res.c linux-2.6.29.6/grsecurity/gracl + + return; +} -diff -urNp linux-2.6.29.6/grsecurity/gracl_segv.c linux-2.6.29.6/grsecurity/gracl_segv.c ---- linux-2.6.29.6/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_segv.c 2009-07-23 17:34:32.175727734 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl_segv.c linux-2.6.30.4/grsecurity/gracl_segv.c +--- linux-2.6.30.4/grsecurity/gracl_segv.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_segv.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,307 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -31765,9 +31139,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_segv.c linux-2.6.29.6/grsecurity/grac + + return; +} -diff -urNp linux-2.6.29.6/grsecurity/gracl_shm.c linux-2.6.29.6/grsecurity/gracl_shm.c ---- linux-2.6.29.6/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/gracl_shm.c 2009-07-23 17:34:32.175727734 -0400 +diff -urNp linux-2.6.30.4/grsecurity/gracl_shm.c linux-2.6.30.4/grsecurity/gracl_shm.c +--- linux-2.6.30.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/gracl_shm.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,37 @@ +#include <linux/kernel.h> +#include <linux/mm.h> @@ -31806,9 +31180,9 @@ diff -urNp linux-2.6.29.6/grsecurity/gracl_shm.c linux-2.6.29.6/grsecurity/gracl + + return 1; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_chdir.c linux-2.6.29.6/grsecurity/grsec_chdir.c ---- linux-2.6.29.6/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_chdir.c 2009-07-23 17:34:32.175727734 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_chdir.c linux-2.6.30.4/grsecurity/grsec_chdir.c +--- linux-2.6.30.4/grsecurity/grsec_chdir.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_chdir.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,19 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -31829,9 +31203,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_chdir.c linux-2.6.29.6/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_chroot.c linux-2.6.29.6/grsecurity/grsec_chroot.c ---- linux-2.6.29.6/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_chroot.c 2009-07-23 17:34:32.175727734 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_chroot.c linux-2.6.30.4/grsecurity/grsec_chroot.c +--- linux-2.6.30.4/grsecurity/grsec_chroot.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_chroot.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,350 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -32183,9 +31557,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_chroot.c linux-2.6.29.6/grsecurity/gr +#ifdef CONFIG_SECURITY +EXPORT_SYMBOL(gr_handle_chroot_caps); +#endif -diff -urNp linux-2.6.29.6/grsecurity/grsec_disabled.c linux-2.6.29.6/grsecurity/grsec_disabled.c ---- linux-2.6.29.6/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_disabled.c 2009-07-23 17:34:32.175727734 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_disabled.c linux-2.6.30.4/grsecurity/grsec_disabled.c +--- linux-2.6.30.4/grsecurity/grsec_disabled.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_disabled.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,426 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -32613,9 +31987,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_disabled.c linux-2.6.29.6/grsecurity/ +EXPORT_SYMBOL(gr_check_user_change); +EXPORT_SYMBOL(gr_check_group_change); +#endif -diff -urNp linux-2.6.29.6/grsecurity/grsec_exec.c linux-2.6.29.6/grsecurity/grsec_exec.c ---- linux-2.6.29.6/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_exec.c 2009-07-23 17:34:32.176740408 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_exec.c linux-2.6.30.4/grsecurity/grsec_exec.c +--- linux-2.6.30.4/grsecurity/grsec_exec.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_exec.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,89 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -32706,9 +32080,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_exec.c linux-2.6.29.6/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_fifo.c linux-2.6.29.6/grsecurity/grsec_fifo.c ---- linux-2.6.29.6/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_fifo.c 2009-07-23 17:34:32.176740408 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_fifo.c linux-2.6.30.4/grsecurity/grsec_fifo.c +--- linux-2.6.30.4/grsecurity/grsec_fifo.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_fifo.c 2009-07-30 11:10:49.347341041 -0400 @@ -0,0 +1,24 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -32734,9 +32108,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_fifo.c linux-2.6.29.6/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_fork.c linux-2.6.29.6/grsecurity/grsec_fork.c ---- linux-2.6.29.6/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_fork.c 2009-07-23 17:34:32.176740408 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_fork.c linux-2.6.30.4/grsecurity/grsec_fork.c +--- linux-2.6.30.4/grsecurity/grsec_fork.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_fork.c 2009-07-30 11:10:49.349503559 -0400 @@ -0,0 +1,15 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -32753,9 +32127,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_fork.c linux-2.6.29.6/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_init.c linux-2.6.29.6/grsecurity/grsec_init.c ---- linux-2.6.29.6/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_init.c 2009-07-23 18:43:31.274004949 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_init.c linux-2.6.30.4/grsecurity/grsec_init.c +--- linux-2.6.30.4/grsecurity/grsec_init.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_init.c 2009-08-02 09:38:20.116597572 -0400 @@ -0,0 +1,230 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -32836,7 +32210,7 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_init.c linux-2.6.29.6/grsecurity/grse +#endif + + for (j = 0; j < 4; j++) { -+ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE); ++ gr_shared_page[j] = (char *)__alloc_percpu(PAGE_SIZE, __alignof__(unsigned long long)); + if (gr_shared_page[j] == NULL) { + panic("Unable to allocate grsecurity shared page"); + return; @@ -32987,9 +32361,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_init.c linux-2.6.29.6/grsecurity/grse + + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_ipc.c linux-2.6.29.6/grsecurity/grsec_ipc.c ---- linux-2.6.29.6/grsecurity/grsec_ipc.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_ipc.c 2009-07-23 17:34:32.176740408 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_ipc.c linux-2.6.30.4/grsecurity/grsec_ipc.c +--- linux-2.6.30.4/grsecurity/grsec_ipc.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_ipc.c 2009-07-30 11:10:49.349503559 -0400 @@ -0,0 +1,81 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -33072,9 +32446,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_ipc.c linux-2.6.29.6/grsecurity/grsec +#endif + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_link.c linux-2.6.29.6/grsecurity/grsec_link.c ---- linux-2.6.29.6/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_link.c 2009-07-23 17:34:32.176740408 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_link.c linux-2.6.30.4/grsecurity/grsec_link.c +--- linux-2.6.30.4/grsecurity/grsec_link.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_link.c 2009-07-30 11:10:49.349503559 -0400 @@ -0,0 +1,43 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -33119,9 +32493,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_link.c linux-2.6.29.6/grsecurity/grse +#endif + return 0; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_log.c linux-2.6.29.6/grsecurity/grsec_log.c ---- linux-2.6.29.6/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_log.c 2009-07-23 17:34:32.177726844 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_log.c linux-2.6.30.4/grsecurity/grsec_log.c +--- linux-2.6.30.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_log.c 2009-07-30 11:10:49.350327012 -0400 @@ -0,0 +1,288 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -33411,9 +32785,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_log.c linux-2.6.29.6/grsecurity/grsec + gr_log_end(audit); + END_LOCKS(audit); +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_mem.c linux-2.6.29.6/grsecurity/grsec_mem.c ---- linux-2.6.29.6/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_mem.c 2009-07-23 17:34:32.177726844 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_mem.c linux-2.6.30.4/grsecurity/grsec_mem.c +--- linux-2.6.30.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_mem.c 2009-07-30 11:10:49.350327012 -0400 @@ -0,0 +1,71 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -33486,9 +32860,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_mem.c linux-2.6.29.6/grsecurity/grsec + + return 0; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_mount.c linux-2.6.29.6/grsecurity/grsec_mount.c ---- linux-2.6.29.6/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_mount.c 2009-07-23 17:34:32.177726844 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_mount.c linux-2.6.30.4/grsecurity/grsec_mount.c +--- linux-2.6.30.4/grsecurity/grsec_mount.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_mount.c 2009-07-30 11:10:49.350327012 -0400 @@ -0,0 +1,34 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -33524,9 +32898,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_mount.c linux-2.6.29.6/grsecurity/grs +#endif + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_sig.c linux-2.6.29.6/grsecurity/grsec_sig.c ---- linux-2.6.29.6/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_sig.c 2009-07-23 17:34:32.177726844 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_sig.c linux-2.6.30.4/grsecurity/grsec_sig.c +--- linux-2.6.30.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_sig.c 2009-07-30 11:10:49.350327012 -0400 @@ -0,0 +1,58 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -33586,9 +32960,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_sig.c linux-2.6.29.6/grsecurity/grsec + return; +} + -diff -urNp linux-2.6.29.6/grsecurity/grsec_sock.c linux-2.6.29.6/grsecurity/grsec_sock.c ---- linux-2.6.29.6/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_sock.c 2009-07-23 17:34:32.177726844 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_sock.c linux-2.6.30.4/grsecurity/grsec_sock.c +--- linux-2.6.30.4/grsecurity/grsec_sock.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_sock.c 2009-07-30 11:10:49.350327012 -0400 @@ -0,0 +1,269 @@ +#include <linux/kernel.h> +#include <linux/module.h> @@ -33859,9 +33233,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_sock.c linux-2.6.29.6/grsecurity/grse + return current_cap(); +#endif +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_sysctl.c linux-2.6.29.6/grsecurity/grsec_sysctl.c ---- linux-2.6.29.6/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_sysctl.c 2009-07-23 17:34:32.178838233 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_sysctl.c linux-2.6.30.4/grsecurity/grsec_sysctl.c +--- linux-2.6.30.4/grsecurity/grsec_sysctl.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_sysctl.c 2009-07-30 11:10:49.351429069 -0400 @@ -0,0 +1,435 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -34298,9 +33672,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_sysctl.c linux-2.6.29.6/grsecurity/gr +#endif + return 0; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_textrel.c linux-2.6.29.6/grsecurity/grsec_textrel.c ---- linux-2.6.29.6/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_textrel.c 2009-07-23 17:34:32.178838233 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_textrel.c linux-2.6.30.4/grsecurity/grsec_textrel.c +--- linux-2.6.30.4/grsecurity/grsec_textrel.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_textrel.c 2009-07-30 11:10:49.351429069 -0400 @@ -0,0 +1,16 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -34318,9 +33692,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_textrel.c linux-2.6.29.6/grsecurity/g +#endif + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_time.c linux-2.6.29.6/grsecurity/grsec_time.c ---- linux-2.6.29.6/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_time.c 2009-07-23 17:34:32.178838233 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_time.c linux-2.6.30.4/grsecurity/grsec_time.c +--- linux-2.6.30.4/grsecurity/grsec_time.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_time.c 2009-07-30 11:10:49.351429069 -0400 @@ -0,0 +1,13 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -34335,9 +33709,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_time.c linux-2.6.29.6/grsecurity/grse +#endif + return; +} -diff -urNp linux-2.6.29.6/grsecurity/grsec_tpe.c linux-2.6.29.6/grsecurity/grsec_tpe.c ---- linux-2.6.29.6/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsec_tpe.c 2009-07-23 17:34:32.178838233 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsec_tpe.c linux-2.6.30.4/grsecurity/grsec_tpe.c +--- linux-2.6.30.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsec_tpe.c 2009-07-30 11:10:49.351429069 -0400 @@ -0,0 +1,38 @@ +#include <linux/kernel.h> +#include <linux/sched.h> @@ -34377,9 +33751,9 @@ diff -urNp linux-2.6.29.6/grsecurity/grsec_tpe.c linux-2.6.29.6/grsecurity/grsec +#endif + return 1; +} -diff -urNp linux-2.6.29.6/grsecurity/grsum.c linux-2.6.29.6/grsecurity/grsum.c ---- linux-2.6.29.6/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/grsum.c 2009-07-23 17:34:32.179767198 -0400 +diff -urNp linux-2.6.30.4/grsecurity/grsum.c linux-2.6.30.4/grsecurity/grsum.c +--- linux-2.6.30.4/grsecurity/grsum.c 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/grsum.c 2009-07-30 11:10:49.351429069 -0400 @@ -0,0 +1,59 @@ +#include <linux/err.h> +#include <linux/kernel.h> @@ -34440,10 +33814,10 @@ diff -urNp linux-2.6.29.6/grsecurity/grsum.c linux-2.6.29.6/grsecurity/grsum.c + + return retval; +} -diff -urNp linux-2.6.29.6/grsecurity/Kconfig linux-2.6.29.6/grsecurity/Kconfig ---- linux-2.6.29.6/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/Kconfig 2009-07-23 17:36:47.298949106 -0400 -@@ -0,0 +1,894 @@ +diff -urNp linux-2.6.30.4/grsecurity/Kconfig linux-2.6.30.4/grsecurity/Kconfig +--- linux-2.6.30.4/grsecurity/Kconfig 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/Kconfig 2009-07-30 11:21:32.668508126 -0400 +@@ -0,0 +1,895 @@ +# +# grecurity configuration +# @@ -34596,11 +33970,11 @@ diff -urNp linux-2.6.29.6/grsecurity/Kconfig linux-2.6.29.6/grsecurity/Kconfig + select PAX_EI_PAX + select PAX_PT_PAX_FLAGS + select PAX_HAVE_ACL_FLAGS -+ select PAX_KERNEXEC if (X86 && !EFI && !COMPAT_VDSO && !PARAVIRT && (!X86_32 || X86_WP_WORKS_OK)) -+ select PAX_MEMORY_UDEREF if (!X86_64 && !COMPAT_VDSO) ++ select PAX_KERNEXEC if (X86 && (!X86_32 || X86_WP_WORKS_OK)) ++ select PAX_MEMORY_UDEREF if (X86_32) + select PAX_RANDKSTACK if (X86_TSC && !X86_64) -+ select PAX_SEGMEXEC if (X86 && !X86_64) -+ select PAX_PAGEEXEC if (!X86) ++ select PAX_SEGMEXEC if (X86_32) ++ select PAX_PAGEEXEC + select PAX_EMUPLT if (ALPHA || PARISC || PPC32 || SPARC32 || SPARC64) + select PAX_DLRESOLVE if (SPARC32 || SPARC64) + select PAX_SYSCALL if (PPC32) @@ -34692,6 +34066,7 @@ diff -urNp linux-2.6.29.6/grsecurity/Kconfig linux-2.6.29.6/grsecurity/Kconfig + +config GRKERNSEC_PROC_MEMMAP + bool "Remove addresses from /proc/<pid>/[smaps|maps|stat]" ++ default y if (PAX_NOEXEC || PAX_ASLR) + depends on PAX_NOEXEC || PAX_ASLR + help + If you say Y here, the /proc/<pid>/maps and /proc/<pid>/stat files will @@ -34962,8 +34337,8 @@ diff -urNp linux-2.6.29.6/grsecurity/Kconfig linux-2.6.29.6/grsecurity/Kconfig + depends on GRKERNSEC_CHROOT + help + If you say Y here, processes inside a chroot will not be able to -+ kill, send signals with fcntl, ptrace, capget, getpgid, getsid, -+ or view any process outside of the chroot. If the sysctl ++ kill, send signals with fcntl, ptrace, capget, getpgid, setpgid, ++ getsid, or view any process outside of the chroot. If the sysctl + option is enabled, a sysctl option with name "chroot_findtask" is + created. + @@ -35338,9 +34713,9 @@ diff -urNp linux-2.6.29.6/grsecurity/Kconfig linux-2.6.29.6/grsecurity/Kconfig +endmenu + +endmenu -diff -urNp linux-2.6.29.6/grsecurity/Makefile linux-2.6.29.6/grsecurity/Makefile ---- linux-2.6.29.6/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/grsecurity/Makefile 2009-07-23 17:34:32.180729893 -0400 +diff -urNp linux-2.6.30.4/grsecurity/Makefile linux-2.6.30.4/grsecurity/Makefile +--- linux-2.6.30.4/grsecurity/Makefile 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/grsecurity/Makefile 2009-07-30 11:10:49.352668479 -0400 @@ -0,0 +1,21 @@ +# grsecurity's ACL system was originally written in 2001 by Michael Dalton +# during 2001-2005 it has been completely redesigned by Brad Spengler @@ -35363,55 +34738,9 @@ diff -urNp linux-2.6.29.6/grsecurity/Makefile linux-2.6.29.6/grsecurity/Makefile +obj-y += grsec_disabled.o +endif + -diff -urNp linux-2.6.29.6/include/acpi/processor.h linux-2.6.29.6/include/acpi/processor.h ---- linux-2.6.29.6/include/acpi/processor.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/acpi/processor.h 2009-07-23 18:40:28.648332539 -0400 -@@ -322,7 +322,7 @@ static inline int acpi_processor_ppc_has - int acpi_processor_tstate_has_changed(struct acpi_processor *pr); - int acpi_processor_get_throttling_info(struct acpi_processor *pr); - extern int acpi_processor_set_throttling(struct acpi_processor *pr, int state); --extern struct file_operations acpi_processor_throttling_fops; -+extern const struct file_operations acpi_processor_throttling_fops; - extern void acpi_processor_throttling_init(void); - /* in processor_idle.c */ - int acpi_processor_power_init(struct acpi_processor *pr, -@@ -336,7 +336,7 @@ extern struct cpuidle_driver acpi_idle_d - - /* in processor_thermal.c */ - int acpi_processor_get_limit_info(struct acpi_processor *pr); --extern struct file_operations acpi_processor_limit_fops; -+extern const struct file_operations acpi_processor_limit_fops; - extern struct thermal_cooling_device_ops processor_cooling_ops; - #ifdef CONFIG_CPU_FREQ - void acpi_thermal_cpufreq_init(void); -diff -urNp linux-2.6.29.6/include/asm-frv/atomic.h linux-2.6.29.6/include/asm-frv/atomic.h ---- linux-2.6.29.6/include/asm-frv/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-frv/atomic.h 2009-07-23 17:34:32.180729893 -0400 -@@ -114,6 +114,10 @@ static inline void atomic_dec(atomic_t * - atomic_sub_return(1, v); - } - -+#define atomic_inc_unchecked(v) atomic_inc(v) -+#define atomic_add_unchecked(i,v) atomic_add((i),(v)) -+#define atomic_sub_unchecked(i,v) atomic_sub((i),(v)) -+ - #define atomic_dec_return(v) atomic_sub_return(1, (v)) - #define atomic_inc_return(v) atomic_add_return(1, (v)) - -diff -urNp linux-2.6.29.6/include/asm-frv/kmap_types.h linux-2.6.29.6/include/asm-frv/kmap_types.h ---- linux-2.6.29.6/include/asm-frv/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-frv/kmap_types.h 2009-07-23 17:34:32.180729893 -0400 -@@ -23,6 +23,7 @@ enum km_type { - KM_IRQ1, - KM_SOFTIRQ0, - KM_SOFTIRQ1, -+ KM_CLEARPAGE, - KM_TYPE_NR - }; - -diff -urNp linux-2.6.29.6/include/asm-generic/futex.h linux-2.6.29.6/include/asm-generic/futex.h ---- linux-2.6.29.6/include/asm-generic/futex.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-generic/futex.h 2009-07-23 17:34:32.180729893 -0400 +diff -urNp linux-2.6.30.4/include/asm-generic/futex.h linux-2.6.30.4/include/asm-generic/futex.h +--- linux-2.6.30.4/include/asm-generic/futex.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/asm-generic/futex.h 2009-07-30 09:48:10.105294791 -0400 @@ -6,7 +6,7 @@ #include <asm/errno.h> @@ -35430,9 +34759,9 @@ diff -urNp linux-2.6.29.6/include/asm-generic/futex.h linux-2.6.29.6/include/asm { return -ENOSYS; } -diff -urNp linux-2.6.29.6/include/asm-generic/int-l64.h linux-2.6.29.6/include/asm-generic/int-l64.h ---- linux-2.6.29.6/include/asm-generic/int-l64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-generic/int-l64.h 2009-07-23 17:34:32.180729893 -0400 +diff -urNp linux-2.6.30.4/include/asm-generic/int-l64.h linux-2.6.30.4/include/asm-generic/int-l64.h +--- linux-2.6.30.4/include/asm-generic/int-l64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/asm-generic/int-l64.h 2009-07-30 09:48:10.105294791 -0400 @@ -44,6 +44,8 @@ typedef unsigned int u32; typedef signed long s64; typedef unsigned long u64; @@ -35442,9 +34771,9 @@ diff -urNp linux-2.6.29.6/include/asm-generic/int-l64.h linux-2.6.29.6/include/a #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.29.6/include/asm-generic/int-ll64.h linux-2.6.29.6/include/asm-generic/int-ll64.h ---- linux-2.6.29.6/include/asm-generic/int-ll64.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-generic/int-ll64.h 2009-07-23 17:34:32.180729893 -0400 +diff -urNp linux-2.6.30.4/include/asm-generic/int-ll64.h linux-2.6.30.4/include/asm-generic/int-ll64.h +--- linux-2.6.30.4/include/asm-generic/int-ll64.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/asm-generic/int-ll64.h 2009-07-30 09:48:10.105294791 -0400 @@ -49,6 +49,8 @@ typedef unsigned int u32; typedef signed long long s64; typedef unsigned long long u64; @@ -35454,10 +34783,10 @@ diff -urNp linux-2.6.29.6/include/asm-generic/int-ll64.h linux-2.6.29.6/include/ #define S8_C(x) x #define U8_C(x) x ## U #define S16_C(x) x -diff -urNp linux-2.6.29.6/include/asm-generic/vmlinux.lds.h linux-2.6.29.6/include/asm-generic/vmlinux.lds.h ---- linux-2.6.29.6/include/asm-generic/vmlinux.lds.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-generic/vmlinux.lds.h 2009-07-23 17:34:32.181776916 -0400 -@@ -88,6 +88,7 @@ +diff -urNp linux-2.6.30.4/include/asm-generic/vmlinux.lds.h linux-2.6.30.4/include/asm-generic/vmlinux.lds.h +--- linux-2.6.30.4/include/asm-generic/vmlinux.lds.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/asm-generic/vmlinux.lds.h 2009-08-04 17:52:34.399966119 -0400 +@@ -121,6 +121,7 @@ .rodata : AT(ADDR(.rodata) - LOAD_OFFSET) { \ VMLINUX_SYMBOL(__start_rodata) = .; \ *(.rodata) *(.rodata.*) \ @@ -35465,71 +34794,30 @@ diff -urNp linux-2.6.29.6/include/asm-generic/vmlinux.lds.h linux-2.6.29.6/inclu *(__vermagic) /* Kernel version magic */ \ *(__markers_strings) /* Markers: strings */ \ *(__tracepoints_strings)/* Tracepoints: strings */ \ -diff -urNp linux-2.6.29.6/include/asm-m32r/atomic.h linux-2.6.29.6/include/asm-m32r/atomic.h ---- linux-2.6.29.6/include/asm-m32r/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-m32r/atomic.h 2009-07-23 17:34:32.181776916 -0400 -@@ -308,6 +308,10 @@ static __inline__ void atomic_set_mask(u - local_irq_restore(flags); - } - -+#define atomic_inc_unchecked(v) atomic_inc(v) -+#define atomic_add_unchecked(i,v) atomic_add((i),(v)) -+#define atomic_sub_unchecked(i,v) atomic_sub((i),(v)) -+ - /* Atomic operations are already serializing on m32r */ - #define smp_mb__before_atomic_dec() barrier() - #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.29.6/include/asm-m32r/kmap_types.h linux-2.6.29.6/include/asm-m32r/kmap_types.h ---- linux-2.6.29.6/include/asm-m32r/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-m32r/kmap_types.h 2009-07-23 17:34:32.181776916 -0400 -@@ -21,7 +21,8 @@ D(9) KM_IRQ0, - D(10) KM_IRQ1, - D(11) KM_SOFTIRQ0, - D(12) KM_SOFTIRQ1, --D(13) KM_TYPE_NR -+D(13) KM_CLEARPAGE, -+D(14) KM_TYPE_NR - }; - - #undef D -diff -urNp linux-2.6.29.6/include/asm-mn10300/atomic.h linux-2.6.29.6/include/asm-mn10300/atomic.h ---- linux-2.6.29.6/include/asm-mn10300/atomic.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-mn10300/atomic.h 2009-07-23 17:34:32.181776916 -0400 -@@ -145,6 +145,10 @@ static inline void atomic_clear_mask(uns - #define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v))) - #define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new))) - -+#define atomic_inc_unchecked(v) atomic_inc(v) -+#define atomic_add_unchecked(i,v) atomic_add((i),(v)) -+#define atomic_sub_unchecked(i,v) atomic_sub((i),(v)) -+ - /* Atomic operations are already serializing on MN10300??? */ - #define smp_mb__before_atomic_dec() barrier() - #define smp_mb__after_atomic_dec() barrier() -diff -urNp linux-2.6.29.6/include/asm-mn10300/kmap_types.h linux-2.6.29.6/include/asm-mn10300/kmap_types.h ---- linux-2.6.29.6/include/asm-mn10300/kmap_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/asm-mn10300/kmap_types.h 2009-07-23 17:34:32.181776916 -0400 -@@ -25,6 +25,7 @@ enum km_type { - KM_IRQ1, - KM_SOFTIRQ0, - KM_SOFTIRQ1, -+ KM_CLEARPAGE, - KM_TYPE_NR - }; - -diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/drm_pciids.h ---- linux-2.6.29.6/include/drm/drm_pciids.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/drm/drm_pciids.h 2009-07-23 17:34:32.182748165 -0400 -@@ -243,7 +243,7 @@ - {0x1002, 0x796d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ - {0x1002, 0x796e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ - {0x1002, 0x796f, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS740|RADEON_IS_IGP|RADEON_NEW_MEMMAP|RADEON_IS_IGPGART}, \ +@@ -476,8 +477,10 @@ + VMLINUX_SYMBOL(__per_cpu_load) = .; \ + .data.percpu vaddr : AT(VMLINUX_SYMBOL(__per_cpu_load) \ + - LOAD_OFFSET) { \ ++ VMLINUX_SYMBOL(__per_cpu_load) = . + __per_cpu_load; \ + VMLINUX_SYMBOL(__per_cpu_start) = .; \ + *(.data.percpu.first) \ ++ . = ALIGN(PAGE_SIZE); \ + *(.data.percpu.page_aligned) \ + *(.data.percpu) \ + *(.data.percpu.shared_aligned) \ +diff -urNp linux-2.6.30.4/include/drm/drm_pciids.h linux-2.6.30.4/include/drm/drm_pciids.h +--- linux-2.6.30.4/include/drm/drm_pciids.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/drm/drm_pciids.h 2009-07-30 09:48:10.106233963 -0400 +@@ -356,7 +356,7 @@ + {0x1002, 0x9614, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9615, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ + {0x1002, 0x9616, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_RS780|RADEON_NEW_MEMMAP|RADEON_IS_IGP}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} #define r128_PCI_IDS \ {0x1002, 0x4c45, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -283,14 +283,14 @@ +@@ -396,14 +396,14 @@ {0x1002, 0x5446, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x544C, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x5452, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ @@ -35546,7 +34834,7 @@ diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/dr #define mach64_PCI_IDS \ {0x1002, 0x4749, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -313,7 +313,7 @@ +@@ -426,7 +426,7 @@ {0x1002, 0x4c53, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x4c4d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1002, 0x4c4e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ @@ -35555,7 +34843,7 @@ diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/dr #define sisdrv_PCI_IDS \ {0x1039, 0x0300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -324,7 +324,7 @@ +@@ -437,7 +437,7 @@ {0x1039, 0x7300, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x18CA, 0x0040, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ {0x18CA, 0x0042, PCI_ANY_ID, PCI_ANY_ID, 0, 0, SIS_CHIP_315}, \ @@ -35564,7 +34852,7 @@ diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/dr #define tdfx_PCI_IDS \ {0x121a, 0x0003, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -333,7 +333,7 @@ +@@ -446,7 +446,7 @@ {0x121a, 0x0007, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x121a, 0x0009, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x121a, 0x000b, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ @@ -35573,7 +34861,7 @@ diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/dr #define viadrv_PCI_IDS \ {0x1106, 0x3022, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ -@@ -345,25 +345,25 @@ +@@ -458,14 +458,14 @@ {0x1106, 0x3343, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x1106, 0x3230, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_DX9_0}, \ {0x1106, 0x3157, PCI_ANY_ID, PCI_ANY_ID, 0, 0, VIA_PRO_GROUP_A}, \ @@ -35590,9 +34878,10 @@ diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/dr #define i830_PCI_IDS \ {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0x8086, 0x2562, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ +@@ -473,11 +473,11 @@ {0x8086, 0x3582, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x8086, 0x2572, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ + {0x8086, 0x358e, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} @@ -35603,7 +34892,7 @@ diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/dr #define savage_PCI_IDS \ {0x5333, 0x8a20, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_SAVAGE3D}, \ -@@ -389,10 +389,10 @@ +@@ -503,10 +503,10 @@ {0x5333, 0x8d02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_TWISTER}, \ {0x5333, 0x8d03, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ {0x5333, 0x8d04, PCI_ANY_ID, PCI_ANY_ID, 0, 0, S3_PROSAVAGEDDR}, \ @@ -35616,16 +34905,16 @@ diff -urNp linux-2.6.29.6/include/drm/drm_pciids.h linux-2.6.29.6/include/drm/dr #define i915_PCI_IDS \ {0x8086, 0x3577, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ -@@ -419,4 +419,4 @@ - {0x8086, 0x2e12, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0x8086, 0x2e22, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0x8086, 0x2e32, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ +@@ -536,4 +536,4 @@ + {0x8086, 0xa001, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ + {0x8086, 0xa011, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ + {0x8086, 0x35e8, PCI_ANY_ID, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA << 8, 0xffff00, 0}, \ - {0, 0, 0} + {0, 0, 0, 0, 0, 0} -diff -urNp linux-2.6.29.6/include/drm/drmP.h linux-2.6.29.6/include/drm/drmP.h ---- linux-2.6.29.6/include/drm/drmP.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/drm/drmP.h 2009-07-23 18:40:27.472293076 -0400 -@@ -769,7 +769,7 @@ struct drm_driver { +diff -urNp linux-2.6.30.4/include/drm/drmP.h linux-2.6.30.4/include/drm/drmP.h +--- linux-2.6.30.4/include/drm/drmP.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/drm/drmP.h 2009-07-30 09:48:10.106233963 -0400 +@@ -783,7 +783,7 @@ struct drm_driver { void (*gem_free_object) (struct drm_gem_object *obj); /* Driver private ops for this object */ @@ -35634,7 +34923,7 @@ diff -urNp linux-2.6.29.6/include/drm/drmP.h linux-2.6.29.6/include/drm/drmP.h int major; int minor; -@@ -825,7 +825,7 @@ struct drm_device { +@@ -886,7 +886,7 @@ struct drm_device { /** \name Usage Counters */ /*@{ */ @@ -35643,7 +34932,7 @@ diff -urNp linux-2.6.29.6/include/drm/drmP.h linux-2.6.29.6/include/drm/drmP.h atomic_t ioctl_count; /**< Outstanding IOCTLs pending */ atomic_t vma_count; /**< Outstanding vma areas open */ int buf_use; /**< Buffers in use -- cannot alloc */ -@@ -836,7 +836,7 @@ struct drm_device { +@@ -897,7 +897,7 @@ struct drm_device { /*@{ */ unsigned long counters; enum drm_stat_type types[15]; @@ -35652,9 +34941,9 @@ diff -urNp linux-2.6.29.6/include/drm/drmP.h linux-2.6.29.6/include/drm/drmP.h /*@} */ struct list_head filelist; -diff -urNp linux-2.6.29.6/include/linux/a.out.h linux-2.6.29.6/include/linux/a.out.h ---- linux-2.6.29.6/include/linux/a.out.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/a.out.h 2009-07-23 17:34:32.184929094 -0400 +diff -urNp linux-2.6.30.4/include/linux/a.out.h linux-2.6.30.4/include/linux/a.out.h +--- linux-2.6.30.4/include/linux/a.out.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/a.out.h 2009-07-30 09:48:10.107682096 -0400 @@ -39,6 +39,14 @@ enum machine_type { M_MIPS2 = 152 /* MIPS R6000/R4000 binary */ }; @@ -35670,9 +34959,9 @@ diff -urNp linux-2.6.29.6/include/linux/a.out.h linux-2.6.29.6/include/linux/a.o #if !defined (N_MAGIC) #define N_MAGIC(exec) ((exec).a_info & 0xffff) #endif -diff -urNp linux-2.6.29.6/include/linux/atmdev.h linux-2.6.29.6/include/linux/atmdev.h ---- linux-2.6.29.6/include/linux/atmdev.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/atmdev.h 2009-07-23 17:34:32.185714643 -0400 +diff -urNp linux-2.6.30.4/include/linux/atmdev.h linux-2.6.30.4/include/linux/atmdev.h +--- linux-2.6.30.4/include/linux/atmdev.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/atmdev.h 2009-07-30 09:48:10.107682096 -0400 @@ -237,7 +237,7 @@ struct compat_atm_iobuf { #endif @@ -35682,10 +34971,10 @@ diff -urNp linux-2.6.29.6/include/linux/atmdev.h linux-2.6.29.6/include/linux/at __AAL_STAT_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.29.6/include/linux/binfmts.h linux-2.6.29.6/include/linux/binfmts.h ---- linux-2.6.29.6/include/linux/binfmts.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/binfmts.h 2009-07-23 17:34:32.186791450 -0400 -@@ -79,6 +79,7 @@ struct linux_binfmt { +diff -urNp linux-2.6.30.4/include/linux/binfmts.h linux-2.6.30.4/include/linux/binfmts.h +--- linux-2.6.30.4/include/linux/binfmts.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/binfmts.h 2009-07-30 09:48:10.107682096 -0400 +@@ -78,6 +78,7 @@ struct linux_binfmt { int (*load_binary)(struct linux_binprm *, struct pt_regs * regs); int (*load_shlib)(struct file *); int (*core_dump)(long signr, struct pt_regs *regs, struct file *file, unsigned long limit); @@ -35693,9 +34982,9 @@ diff -urNp linux-2.6.29.6/include/linux/binfmts.h linux-2.6.29.6/include/linux/b unsigned long min_coredump; /* minimal dump size */ int hasvdso; }; -diff -urNp linux-2.6.29.6/include/linux/cache.h linux-2.6.29.6/include/linux/cache.h ---- linux-2.6.29.6/include/linux/cache.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/cache.h 2009-07-23 17:34:32.186791450 -0400 +diff -urNp linux-2.6.30.4/include/linux/cache.h linux-2.6.30.4/include/linux/cache.h +--- linux-2.6.30.4/include/linux/cache.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/cache.h 2009-07-30 09:48:10.107682096 -0400 @@ -16,6 +16,10 @@ #define __read_mostly #endif @@ -35707,9 +34996,9 @@ diff -urNp linux-2.6.29.6/include/linux/cache.h linux-2.6.29.6/include/linux/cac #ifndef ____cacheline_aligned #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES))) #endif -diff -urNp linux-2.6.29.6/include/linux/capability.h linux-2.6.29.6/include/linux/capability.h ---- linux-2.6.29.6/include/linux/capability.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/capability.h 2009-07-23 17:34:32.186791450 -0400 +diff -urNp linux-2.6.30.4/include/linux/capability.h linux-2.6.30.4/include/linux/capability.h +--- linux-2.6.30.4/include/linux/capability.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/capability.h 2009-07-30 11:10:49.423442785 -0400 @@ -563,6 +563,7 @@ extern const kernel_cap_t __cap_init_eff (security_real_capable_noaudit((t), (cap)) == 0) @@ -35718,10 +35007,10 @@ diff -urNp linux-2.6.29.6/include/linux/capability.h linux-2.6.29.6/include/linu /* audit system wants to get cap info from files as well */ struct dentry; -diff -urNp linux-2.6.29.6/include/linux/cgroup.h linux-2.6.29.6/include/linux/cgroup.h ---- linux-2.6.29.6/include/linux/cgroup.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/cgroup.h 2009-07-23 18:40:28.658648615 -0400 -@@ -35,7 +35,7 @@ extern void cgroup_exit(struct task_stru +diff -urNp linux-2.6.30.4/include/linux/cgroup.h linux-2.6.30.4/include/linux/cgroup.h +--- linux-2.6.30.4/include/linux/cgroup.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/cgroup.h 2009-07-30 09:48:10.107682096 -0400 +@@ -37,7 +37,7 @@ extern void cgroup_exit(struct task_stru extern int cgroupstats_build(struct cgroupstats *stats, struct dentry *dentry); @@ -35730,9 +35019,9 @@ diff -urNp linux-2.6.29.6/include/linux/cgroup.h linux-2.6.29.6/include/linux/cg /* Define the enumeration of all cgroup subsystems */ #define SUBSYS(_x) _x ## _subsys_id, -diff -urNp linux-2.6.29.6/include/linux/cpumask.h linux-2.6.29.6/include/linux/cpumask.h ---- linux-2.6.29.6/include/linux/cpumask.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/cpumask.h 2009-07-23 17:34:32.187810630 -0400 +diff -urNp linux-2.6.30.4/include/linux/cpumask.h linux-2.6.30.4/include/linux/cpumask.h +--- linux-2.6.30.4/include/linux/cpumask.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/cpumask.h 2009-07-30 09:48:10.109008378 -0400 @@ -142,7 +142,6 @@ #include <linux/bitmap.h> @@ -35741,21 +35030,9 @@ diff -urNp linux-2.6.29.6/include/linux/cpumask.h linux-2.6.29.6/include/linux/c #ifndef CONFIG_DISABLE_OBSOLETE_CPUMASK_FUNCTIONS #define cpu_set(cpu, dst) __cpu_set((cpu), &(dst)) -diff -urNp linux-2.6.29.6/include/linux/dcache.h linux-2.6.29.6/include/linux/dcache.h ---- linux-2.6.29.6/include/linux/dcache.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/dcache.h 2009-07-23 18:40:28.672304095 -0400 -@@ -112,7 +112,7 @@ struct dentry { - struct list_head d_subdirs; /* our children */ - struct list_head d_alias; /* inode alias list */ - unsigned long d_time; /* used by d_revalidate */ -- struct dentry_operations *d_op; -+ const struct dentry_operations *d_op; - struct super_block *d_sb; /* The root of the dentry tree */ - void *d_fsdata; /* fs-specific data */ - -diff -urNp linux-2.6.29.6/include/linux/elf.h linux-2.6.29.6/include/linux/elf.h ---- linux-2.6.29.6/include/linux/elf.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/elf.h 2009-07-23 17:34:32.187810630 -0400 +diff -urNp linux-2.6.30.4/include/linux/elf.h linux-2.6.30.4/include/linux/elf.h +--- linux-2.6.30.4/include/linux/elf.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/elf.h 2009-07-30 09:48:10.109008378 -0400 @@ -49,6 +49,17 @@ typedef __s64 Elf64_Sxword; #define PT_GNU_EH_FRAME 0x6474e550 @@ -35828,10 +35105,21 @@ diff -urNp linux-2.6.29.6/include/linux/elf.h linux-2.6.29.6/include/linux/elf.h #endif -diff -urNp linux-2.6.29.6/include/linux/fs.h linux-2.6.29.6/include/linux/fs.h ---- linux-2.6.29.6/include/linux/fs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/fs.h 2009-07-23 18:40:28.682280722 -0400 -@@ -2207,7 +2207,7 @@ static int __fops ## _open(struct inode +diff -urNp linux-2.6.30.4/include/linux/fs.h linux-2.6.30.4/include/linux/fs.h +--- linux-2.6.30.4/include/linux/fs.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/fs.h 2009-08-01 14:57:12.341093728 -0400 +@@ -87,6 +87,10 @@ struct inodes_stat_t { + */ + #define FMODE_NOCMTIME ((__force fmode_t)2048) + ++/* Hack for grsec so as not to require read permission simply to execute ++ a binary */ ++#define FMODE_GREXEC ((__force fmode_t)8192) ++ + /* + * The below are the various read and write types that we support. Some of + * them include behavioral modifiers that send information down to the +@@ -2423,7 +2427,7 @@ static int __fops ## _open(struct inode __simple_attr_check_format(__fmt, 0ull); \ return simple_attr_open(inode, file, __get, __set, __fmt); \ } \ @@ -35840,9 +35128,9 @@ diff -urNp linux-2.6.29.6/include/linux/fs.h linux-2.6.29.6/include/linux/fs.h .owner = THIS_MODULE, \ .open = __fops ## _open, \ .release = simple_attr_release, \ -diff -urNp linux-2.6.29.6/include/linux/fs_struct.h linux-2.6.29.6/include/linux/fs_struct.h ---- linux-2.6.29.6/include/linux/fs_struct.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/fs_struct.h 2009-07-23 17:34:32.187810630 -0400 +diff -urNp linux-2.6.30.4/include/linux/fs_struct.h linux-2.6.30.4/include/linux/fs_struct.h +--- linux-2.6.30.4/include/linux/fs_struct.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/fs_struct.h 2009-07-30 09:48:10.109883773 -0400 @@ -4,7 +4,7 @@ #include <linux/path.h> @@ -35852,9 +35140,9 @@ diff -urNp linux-2.6.29.6/include/linux/fs_struct.h linux-2.6.29.6/include/linux rwlock_t lock; int umask; int in_exec; -diff -urNp linux-2.6.29.6/include/linux/genhd.h linux-2.6.29.6/include/linux/genhd.h ---- linux-2.6.29.6/include/linux/genhd.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/genhd.h 2009-07-23 17:34:32.188714513 -0400 +diff -urNp linux-2.6.30.4/include/linux/genhd.h linux-2.6.30.4/include/linux/genhd.h +--- linux-2.6.30.4/include/linux/genhd.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/genhd.h 2009-07-30 09:48:10.109883773 -0400 @@ -159,7 +159,7 @@ struct gendisk { struct timer_rand_state *random; @@ -35864,9 +35152,9 @@ diff -urNp linux-2.6.29.6/include/linux/genhd.h linux-2.6.29.6/include/linux/gen struct work_struct async_notify; #ifdef CONFIG_BLK_DEV_INTEGRITY struct blk_integrity *integrity; -diff -urNp linux-2.6.29.6/include/linux/gracl.h linux-2.6.29.6/include/linux/gracl.h ---- linux-2.6.29.6/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/include/linux/gracl.h 2009-07-23 17:34:32.188714513 -0400 +diff -urNp linux-2.6.30.4/include/linux/gracl.h linux-2.6.30.4/include/linux/gracl.h +--- linux-2.6.30.4/include/linux/gracl.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/include/linux/gracl.h 2009-07-30 11:10:49.440849797 -0400 @@ -0,0 +1,318 @@ +#ifndef GR_ACL_H +#define GR_ACL_H @@ -36186,9 +35474,9 @@ diff -urNp linux-2.6.29.6/include/linux/gracl.h linux-2.6.29.6/include/linux/gra + +#endif + -diff -urNp linux-2.6.29.6/include/linux/gralloc.h linux-2.6.29.6/include/linux/gralloc.h ---- linux-2.6.29.6/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/include/linux/gralloc.h 2009-07-23 17:34:32.188714513 -0400 +diff -urNp linux-2.6.30.4/include/linux/gralloc.h linux-2.6.30.4/include/linux/gralloc.h +--- linux-2.6.30.4/include/linux/gralloc.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/include/linux/gralloc.h 2009-07-30 11:10:49.444477054 -0400 @@ -0,0 +1,9 @@ +#ifndef __GRALLOC_H +#define __GRALLOC_H @@ -36199,9 +35487,9 @@ diff -urNp linux-2.6.29.6/include/linux/gralloc.h linux-2.6.29.6/include/linux/g +void *acl_alloc_num(unsigned long num, unsigned long len); + +#endif -diff -urNp linux-2.6.29.6/include/linux/grdefs.h linux-2.6.29.6/include/linux/grdefs.h ---- linux-2.6.29.6/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/include/linux/grdefs.h 2009-07-23 17:34:32.188714513 -0400 +diff -urNp linux-2.6.30.4/include/linux/grdefs.h linux-2.6.30.4/include/linux/grdefs.h +--- linux-2.6.30.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/include/linux/grdefs.h 2009-07-30 11:10:49.454486092 -0400 @@ -0,0 +1,136 @@ +#ifndef GRDEFS_H +#define GRDEFS_H @@ -36339,9 +35627,9 @@ diff -urNp linux-2.6.29.6/include/linux/grdefs.h linux-2.6.29.6/include/linux/gr +}; + +#endif -diff -urNp linux-2.6.29.6/include/linux/grinternal.h linux-2.6.29.6/include/linux/grinternal.h ---- linux-2.6.29.6/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/include/linux/grinternal.h 2009-07-23 17:34:32.188714513 -0400 +diff -urNp linux-2.6.30.4/include/linux/grinternal.h linux-2.6.30.4/include/linux/grinternal.h +--- linux-2.6.30.4/include/linux/grinternal.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/include/linux/grinternal.h 2009-07-30 11:10:49.454486092 -0400 @@ -0,0 +1,211 @@ +#ifndef __GRINTERNAL_H +#define __GRINTERNAL_H @@ -36554,9 +35842,9 @@ diff -urNp linux-2.6.29.6/include/linux/grinternal.h linux-2.6.29.6/include/linu +#endif + +#endif -diff -urNp linux-2.6.29.6/include/linux/grmsg.h linux-2.6.29.6/include/linux/grmsg.h ---- linux-2.6.29.6/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/include/linux/grmsg.h 2009-07-23 17:34:32.188714513 -0400 +diff -urNp linux-2.6.30.4/include/linux/grmsg.h linux-2.6.30.4/include/linux/grmsg.h +--- linux-2.6.30.4/include/linux/grmsg.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/include/linux/grmsg.h 2009-07-30 11:10:49.454486092 -0400 @@ -0,0 +1,108 @@ +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u" +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%u.%u.%u.%u 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:%u.%u.%u.%u TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u" @@ -36666,13 +35954,14 @@ diff -urNp linux-2.6.29.6/include/linux/grmsg.h linux-2.6.29.6/include/linux/grm +#define GR_SHMR_AUDIT_MSG "shared memory of uid:%u euid:%u removed by " +#define GR_RESOURCE_MSG "denied resource overstep by requesting %lu for %.16s against limit %lu for " +#define GR_TEXTREL_AUDIT_MSG "text relocation in %s, VMA:0x%08lx 0x%08lx by " -diff -urNp linux-2.6.29.6/include/linux/grsecurity.h linux-2.6.29.6/include/linux/grsecurity.h ---- linux-2.6.29.6/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/include/linux/grsecurity.h 2009-07-23 17:34:32.189932774 -0400 -@@ -0,0 +1,201 @@ +diff -urNp linux-2.6.30.4/include/linux/grsecurity.h linux-2.6.30.4/include/linux/grsecurity.h +--- linux-2.6.30.4/include/linux/grsecurity.h 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/include/linux/grsecurity.h 2009-07-30 11:54:10.952982697 -0400 +@@ -0,0 +1,202 @@ +#ifndef GR_SECURITY_H +#define GR_SECURITY_H +#include <linux/fs.h> ++#include <linux/fs_struct.h> +#include <linux/binfmts.h> +#include <linux/gracl.h> + @@ -36871,10 +36160,10 @@ diff -urNp linux-2.6.29.6/include/linux/grsecurity.h linux-2.6.29.6/include/linu +#endif + +#endif -diff -urNp linux-2.6.29.6/include/linux/highmem.h linux-2.6.29.6/include/linux/highmem.h ---- linux-2.6.29.6/include/linux/highmem.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/highmem.h 2009-07-23 17:34:32.189932774 -0400 -@@ -124,6 +124,18 @@ static inline void clear_highpage(struct +diff -urNp linux-2.6.30.4/include/linux/highmem.h linux-2.6.30.4/include/linux/highmem.h +--- linux-2.6.30.4/include/linux/highmem.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/highmem.h 2009-07-30 09:48:10.109883773 -0400 +@@ -135,6 +135,18 @@ static inline void clear_highpage(struct kunmap_atomic(kaddr, KM_USER0); } @@ -36893,9 +36182,9 @@ diff -urNp linux-2.6.29.6/include/linux/highmem.h linux-2.6.29.6/include/linux/h static inline void zero_user_segments(struct page *page, unsigned start1, unsigned end1, unsigned start2, unsigned end2) -diff -urNp linux-2.6.29.6/include/linux/hugetlb.h linux-2.6.29.6/include/linux/hugetlb.h ---- linux-2.6.29.6/include/linux/hugetlb.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/hugetlb.h 2009-07-23 18:40:28.693352210 -0400 +diff -urNp linux-2.6.30.4/include/linux/hugetlb.h linux-2.6.30.4/include/linux/hugetlb.h +--- linux-2.6.30.4/include/linux/hugetlb.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/hugetlb.h 2009-07-30 09:48:10.109883773 -0400 @@ -138,7 +138,7 @@ static inline struct hugetlbfs_sb_info * } @@ -36905,9 +36194,9 @@ diff -urNp linux-2.6.29.6/include/linux/hugetlb.h linux-2.6.29.6/include/linux/h struct file *hugetlb_file_setup(const char *name, size_t, int); int hugetlb_get_quota(struct address_space *mapping, long delta); void hugetlb_put_quota(struct address_space *mapping, long delta); -diff -urNp linux-2.6.29.6/include/linux/jbd2.h linux-2.6.29.6/include/linux/jbd2.h ---- linux-2.6.29.6/include/linux/jbd2.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/jbd2.h 2009-07-23 17:34:32.189932774 -0400 +diff -urNp linux-2.6.30.4/include/linux/jbd2.h linux-2.6.30.4/include/linux/jbd2.h +--- linux-2.6.30.4/include/linux/jbd2.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/jbd2.h 2009-07-30 09:48:10.111182036 -0400 @@ -66,7 +66,7 @@ extern u8 jbd2_journal_enable_debug; } \ } while (0) @@ -36917,9 +36206,9 @@ diff -urNp linux-2.6.29.6/include/linux/jbd2.h linux-2.6.29.6/include/linux/jbd2 #endif static inline void *jbd2_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.29.6/include/linux/jbd.h linux-2.6.29.6/include/linux/jbd.h ---- linux-2.6.29.6/include/linux/jbd.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/jbd.h 2009-07-23 17:34:32.189932774 -0400 +diff -urNp linux-2.6.30.4/include/linux/jbd.h linux-2.6.30.4/include/linux/jbd.h +--- linux-2.6.30.4/include/linux/jbd.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/jbd.h 2009-07-30 09:48:10.111182036 -0400 @@ -66,7 +66,7 @@ extern u8 journal_enable_debug; } \ } while (0) @@ -36929,10 +36218,10 @@ diff -urNp linux-2.6.29.6/include/linux/jbd.h linux-2.6.29.6/include/linux/jbd.h #endif static inline void *jbd_alloc(size_t size, gfp_t flags) -diff -urNp linux-2.6.29.6/include/linux/kvm_host.h linux-2.6.29.6/include/linux/kvm_host.h ---- linux-2.6.29.6/include/linux/kvm_host.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/kvm_host.h 2009-07-23 17:34:32.189932774 -0400 -@@ -155,7 +155,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc +diff -urNp linux-2.6.30.4/include/linux/kvm_host.h linux-2.6.30.4/include/linux/kvm_host.h +--- linux-2.6.30.4/include/linux/kvm_host.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/kvm_host.h 2009-07-30 09:48:10.112173628 -0400 +@@ -172,7 +172,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc void vcpu_load(struct kvm_vcpu *vcpu); void vcpu_put(struct kvm_vcpu *vcpu); @@ -36941,8 +36230,8 @@ diff -urNp linux-2.6.29.6/include/linux/kvm_host.h linux-2.6.29.6/include/linux/ struct module *module); void kvm_exit(void); -@@ -263,7 +263,7 @@ int kvm_arch_vcpu_ioctl_debug_guest(stru - struct kvm_debug_guest *dbg); +@@ -279,7 +279,7 @@ int kvm_arch_vcpu_ioctl_set_guest_debug( + struct kvm_guest_debug *dbg); int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run); -int kvm_arch_init(void *opaque); @@ -36950,9 +36239,9 @@ diff -urNp linux-2.6.29.6/include/linux/kvm_host.h linux-2.6.29.6/include/linux/ void kvm_arch_exit(void); int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu); -diff -urNp linux-2.6.29.6/include/linux/libata.h linux-2.6.29.6/include/linux/libata.h ---- linux-2.6.29.6/include/linux/libata.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/libata.h 2009-07-23 17:34:32.190921738 -0400 +diff -urNp linux-2.6.30.4/include/linux/libata.h linux-2.6.30.4/include/linux/libata.h +--- linux-2.6.30.4/include/linux/libata.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/libata.h 2009-07-30 09:48:10.113041063 -0400 @@ -64,11 +64,11 @@ #ifdef ATA_VERBOSE_DEBUG #define VPRINTK(fmt, args...) printk(KERN_ERR "%s: " fmt, __func__, ## args) @@ -36968,9 +36257,9 @@ diff -urNp linux-2.6.29.6/include/linux/libata.h linux-2.6.29.6/include/linux/li #endif /* ATA_DEBUG */ #define BPRINTK(fmt, args...) if (ap->flags & ATA_FLAG_DEBUGMSG) printk(KERN_ERR "%s: " fmt, __func__, ## args) -diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h ---- linux-2.6.29.6/include/linux/mm.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/mm.h 2009-07-23 17:34:32.190921738 -0400 +diff -urNp linux-2.6.30.4/include/linux/mm.h linux-2.6.30.4/include/linux/mm.h +--- linux-2.6.30.4/include/linux/mm.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/mm.h 2009-07-30 09:48:10.113041063 -0400 @@ -39,6 +39,7 @@ extern unsigned long mmap_min_addr; #include <asm/page.h> #include <asm/pgtable.h> @@ -36979,18 +36268,18 @@ diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h #define nth_page(page,n) pfn_to_page(page_to_pfn((page)) + (n)) -@@ -105,6 +106,10 @@ extern unsigned int kobjsize(const void - #define VM_MIXEDMAP 0x10000000 /* Can contain "struct page" and pure PFN pages */ +@@ -106,6 +107,10 @@ extern unsigned int kobjsize(const void #define VM_SAO 0x20000000 /* Strong Access Ordering (powerpc) */ + #define VM_PFN_AT_MMAP 0x40000000 /* PFNMAP vma that is fully mapped at mmap time */ +#ifdef CONFIG_PAX_PAGEEXEC -+#define VM_PAGEEXEC 0x40000000 /* vma->vm_page_prot needs special handling */ ++#define VM_PAGEEXEC 0x80000000 /* vma->vm_page_prot needs special handling */ +#endif + #ifndef VM_STACK_DEFAULT_FLAGS /* arch can override this */ #define VM_STACK_DEFAULT_FLAGS VM_DATA_DEFAULT_FLAGS #endif -@@ -899,6 +904,8 @@ struct shrinker { +@@ -888,6 +893,8 @@ struct shrinker { extern void register_shrinker(struct shrinker *); extern void unregister_shrinker(struct shrinker *); @@ -36999,7 +36288,7 @@ diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h int vma_wants_writenotify(struct vm_area_struct *vma); extern pte_t *get_locked_pte(struct mm_struct *mm, unsigned long addr, spinlock_t **ptl); -@@ -1170,6 +1177,7 @@ out: +@@ -1159,6 +1166,7 @@ out: } extern int do_munmap(struct mm_struct *, unsigned long, size_t); @@ -37007,7 +36296,7 @@ diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h extern unsigned long do_brk(unsigned long, unsigned long); -@@ -1223,6 +1231,10 @@ extern struct vm_area_struct * find_vma( +@@ -1212,6 +1220,10 @@ extern struct vm_area_struct * find_vma( extern struct vm_area_struct * find_vma_prev(struct mm_struct * mm, unsigned long addr, struct vm_area_struct **pprev); @@ -37018,7 +36307,7 @@ diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h /* Look up the first VMA which intersects the interval start_addr..end_addr-1, NULL if none. Assume start_addr < end_addr. */ static inline struct vm_area_struct * find_vma_intersection(struct mm_struct * mm, unsigned long start_addr, unsigned long end_addr) -@@ -1239,7 +1251,6 @@ static inline unsigned long vma_pages(st +@@ -1228,7 +1240,6 @@ static inline unsigned long vma_pages(st return (vma->vm_end - vma->vm_start) >> PAGE_SHIFT; } @@ -37026,7 +36315,7 @@ diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h struct vm_area_struct *find_extend_vma(struct mm_struct *, unsigned long addr); int remap_pfn_range(struct vm_area_struct *, unsigned long addr, unsigned long pfn, unsigned long size, pgprot_t); -@@ -1331,5 +1342,12 @@ void vmemmap_populate_print_last(void); +@@ -1320,5 +1331,12 @@ void vmemmap_populate_print_last(void); extern void *alloc_locked_buffer(size_t size); extern void free_locked_buffer(void *buffer, size_t size); extern void release_locked_buffer(void *buffer, size_t size); @@ -37039,10 +36328,10 @@ diff -urNp linux-2.6.29.6/include/linux/mm.h linux-2.6.29.6/include/linux/mm.h + #endif /* __KERNEL__ */ #endif /* _LINUX_MM_H */ -diff -urNp linux-2.6.29.6/include/linux/mm_types.h linux-2.6.29.6/include/linux/mm_types.h ---- linux-2.6.29.6/include/linux/mm_types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/mm_types.h 2009-07-23 18:40:27.472293076 -0400 -@@ -159,7 +159,7 @@ struct vm_area_struct { +diff -urNp linux-2.6.30.4/include/linux/mm_types.h linux-2.6.30.4/include/linux/mm_types.h +--- linux-2.6.30.4/include/linux/mm_types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/mm_types.h 2009-07-30 09:48:10.114071629 -0400 +@@ -163,7 +163,7 @@ struct vm_area_struct { struct anon_vma *anon_vma; /* Serialized by page_table_lock */ /* Function pointers to deal with this struct. */ @@ -37051,7 +36340,7 @@ diff -urNp linux-2.6.29.6/include/linux/mm_types.h linux-2.6.29.6/include/linux/ /* Information about our backing store: */ unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE -@@ -174,6 +174,8 @@ struct vm_area_struct { +@@ -178,6 +178,8 @@ struct vm_area_struct { #ifdef CONFIG_NUMA struct mempolicy *vm_policy; /* NUMA policy for the VMA */ #endif @@ -37060,7 +36349,7 @@ diff -urNp linux-2.6.29.6/include/linux/mm_types.h linux-2.6.29.6/include/linux/ }; struct core_thread { -@@ -274,6 +276,24 @@ struct mm_struct { +@@ -278,6 +280,24 @@ struct mm_struct { #ifdef CONFIG_MMU_NOTIFIER struct mmu_notifier_mm *mmu_notifier_mm; #endif @@ -37085,10 +36374,10 @@ diff -urNp linux-2.6.29.6/include/linux/mm_types.h linux-2.6.29.6/include/linux/ }; /* Future-safe accessor for struct mm_struct's cpu_vm_mask. */ -diff -urNp linux-2.6.29.6/include/linux/module.h linux-2.6.29.6/include/linux/module.h ---- linux-2.6.29.6/include/linux/module.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/module.h 2009-07-23 17:34:32.191875265 -0400 -@@ -278,16 +278,16 @@ struct module +diff -urNp linux-2.6.30.4/include/linux/module.h linux-2.6.30.4/include/linux/module.h +--- linux-2.6.30.4/include/linux/module.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/module.h 2009-07-30 09:48:10.114071629 -0400 +@@ -282,16 +282,16 @@ struct module int (*init)(void); /* If this is non-NULL, vfree after init() returns */ @@ -37109,9 +36398,9 @@ diff -urNp linux-2.6.29.6/include/linux/module.h linux-2.6.29.6/include/linux/mo /* Arch-specific module values */ struct mod_arch_specific arch; -@@ -363,16 +363,46 @@ struct module *module_text_address(unsig - struct module *__module_text_address(unsigned long addr); - int is_module_address(unsigned long addr); +@@ -374,16 +374,46 @@ struct module *__module_address(unsigned + bool is_module_address(unsigned long addr); + bool is_module_text_address(unsigned long addr); +static inline int within_module_range(unsigned long addr, void *start, unsigned long size) +{ @@ -37159,8 +36448,8 @@ diff -urNp linux-2.6.29.6/include/linux/module.h linux-2.6.29.6/include/linux/mo + return within_module_init_rx(addr, mod) || within_module_init_rw(addr, mod); } - /* Returns 0 and fills in value, defined and namebuf, or -ERANGE if -@@ -396,7 +426,11 @@ void symbol_put_addr(void *addr); + /* Search for module by name: must hold module_mutex. */ +@@ -436,7 +466,11 @@ void symbol_put_addr(void *addr); static inline local_t *__module_ref_addr(struct module *mod, int cpu) { #ifdef CONFIG_SMP @@ -37172,9 +36461,9 @@ diff -urNp linux-2.6.29.6/include/linux/module.h linux-2.6.29.6/include/linux/mo #else return &mod->ref; #endif -diff -urNp linux-2.6.29.6/include/linux/moduleloader.h linux-2.6.29.6/include/linux/moduleloader.h ---- linux-2.6.29.6/include/linux/moduleloader.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/moduleloader.h 2009-07-23 17:34:32.192794045 -0400 +diff -urNp linux-2.6.30.4/include/linux/moduleloader.h linux-2.6.30.4/include/linux/moduleloader.h +--- linux-2.6.30.4/include/linux/moduleloader.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/moduleloader.h 2009-07-30 09:48:10.114071629 -0400 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st sections. Returns NULL on failure. */ void *module_alloc(unsigned long size); @@ -37197,9 +36486,9 @@ diff -urNp linux-2.6.29.6/include/linux/moduleloader.h linux-2.6.29.6/include/li /* Apply the given relocation to the (simplified) ELF. Return -error or 0. */ int apply_relocate(Elf_Shdr *sechdrs, -diff -urNp linux-2.6.29.6/include/linux/namei.h linux-2.6.29.6/include/linux/namei.h ---- linux-2.6.29.6/include/linux/namei.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/namei.h 2009-07-23 17:34:32.192794045 -0400 +diff -urNp linux-2.6.30.4/include/linux/namei.h linux-2.6.30.4/include/linux/namei.h +--- linux-2.6.30.4/include/linux/namei.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/namei.h 2009-07-30 09:48:10.115035001 -0400 @@ -21,7 +21,7 @@ struct nameidata { unsigned int flags; int last_type; @@ -37209,7 +36498,7 @@ diff -urNp linux-2.6.29.6/include/linux/namei.h linux-2.6.29.6/include/linux/nam /* Intent data */ union { -@@ -84,12 +84,12 @@ extern int follow_up(struct vfsmount **, +@@ -83,12 +83,12 @@ extern int follow_up(struct vfsmount **, extern struct dentry *lock_rename(struct dentry *, struct dentry *); extern void unlock_rename(struct dentry *, struct dentry *); @@ -37224,10 +36513,10 @@ diff -urNp linux-2.6.29.6/include/linux/namei.h linux-2.6.29.6/include/linux/nam { return nd->saved_names[nd->depth]; } -diff -urNp linux-2.6.29.6/include/linux/nfsd/nfsd.h linux-2.6.29.6/include/linux/nfsd/nfsd.h ---- linux-2.6.29.6/include/linux/nfsd/nfsd.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/nfsd/nfsd.h 2009-07-23 18:40:28.718303595 -0400 -@@ -56,7 +56,7 @@ extern struct svc_version nfsd_version2, +diff -urNp linux-2.6.30.4/include/linux/nfsd/nfsd.h linux-2.6.30.4/include/linux/nfsd/nfsd.h +--- linux-2.6.30.4/include/linux/nfsd/nfsd.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/nfsd/nfsd.h 2009-07-30 09:48:10.115035001 -0400 +@@ -57,7 +57,7 @@ extern u32 nfsd_supported_minorversion extern struct mutex nfsd_mutex; extern struct svc_serv *nfsd_serv; @@ -37236,33 +36525,9 @@ diff -urNp linux-2.6.29.6/include/linux/nfsd/nfsd.h linux-2.6.29.6/include/linux /* * Function prototypes. -diff -urNp linux-2.6.29.6/include/linux/nfs_fs.h linux-2.6.29.6/include/linux/nfs_fs.h ---- linux-2.6.29.6/include/linux/nfs_fs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/nfs_fs.h 2009-07-23 18:40:28.706582042 -0400 -@@ -415,7 +415,7 @@ extern const struct inode_operations nfs - extern const struct inode_operations nfs3_dir_inode_operations; - #endif /* CONFIG_NFS_V3 */ - extern const struct file_operations nfs_dir_operations; --extern struct dentry_operations nfs_dentry_operations; -+extern const struct dentry_operations nfs_dentry_operations; - - extern void nfs_force_lookup_revalidate(struct inode *dir); - extern int nfs_instantiate(struct dentry *dentry, struct nfs_fh *fh, struct nfs_fattr *fattr); -diff -urNp linux-2.6.29.6/include/linux/nfs_xdr.h linux-2.6.29.6/include/linux/nfs_xdr.h ---- linux-2.6.29.6/include/linux/nfs_xdr.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/nfs_xdr.h 2009-07-23 18:40:28.713831736 -0400 -@@ -785,7 +785,7 @@ struct nfs_access_entry; - */ - struct nfs_rpc_ops { - u32 version; /* Protocol version */ -- struct dentry_operations *dentry_ops; -+ const struct dentry_operations *dentry_ops; - const struct inode_operations *dir_inode_ops; - const struct inode_operations *file_inode_ops; - -diff -urNp linux-2.6.29.6/include/linux/nodemask.h linux-2.6.29.6/include/linux/nodemask.h ---- linux-2.6.29.6/include/linux/nodemask.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/nodemask.h 2009-07-23 17:34:32.192794045 -0400 +diff -urNp linux-2.6.30.4/include/linux/nodemask.h linux-2.6.30.4/include/linux/nodemask.h +--- linux-2.6.30.4/include/linux/nodemask.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/nodemask.h 2009-07-30 09:48:10.115035001 -0400 @@ -442,11 +442,11 @@ static inline int num_node_state(enum no #define any_online_node(mask) \ @@ -37279,9 +36544,9 @@ diff -urNp linux-2.6.29.6/include/linux/nodemask.h linux-2.6.29.6/include/linux/ }) #define num_online_nodes() num_node_state(N_ONLINE) -diff -urNp linux-2.6.29.6/include/linux/oprofile.h linux-2.6.29.6/include/linux/oprofile.h ---- linux-2.6.29.6/include/linux/oprofile.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/oprofile.h 2009-07-23 17:34:32.192794045 -0400 +diff -urNp linux-2.6.30.4/include/linux/oprofile.h linux-2.6.30.4/include/linux/oprofile.h +--- linux-2.6.30.4/include/linux/oprofile.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/oprofile.h 2009-07-30 09:48:10.116076362 -0400 @@ -128,7 +128,7 @@ int oprofilefs_create_ro_ulong(struct su /** Create a file for read-only access to an atomic_t. */ @@ -37291,33 +36556,9 @@ diff -urNp linux-2.6.29.6/include/linux/oprofile.h linux-2.6.29.6/include/linux/ /** create a directory */ struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root, -diff -urNp linux-2.6.29.6/include/linux/percpu.h linux-2.6.29.6/include/linux/percpu.h ---- linux-2.6.29.6/include/linux/percpu.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/percpu.h 2009-07-23 17:34:32.192794045 -0400 -@@ -50,7 +50,7 @@ - #endif - - #define PERCPU_ENOUGH_ROOM \ -- (__per_cpu_end - __per_cpu_start + PERCPU_MODULE_RESERVE) -+ ((unsigned long)(__per_cpu_end - __per_cpu_start + PERCPU_MODULE_RESERVE)) - #endif /* PERCPU_ENOUGH_ROOM */ - - /* -diff -urNp linux-2.6.29.6/include/linux/personality.h linux-2.6.29.6/include/linux/personality.h ---- linux-2.6.29.6/include/linux/personality.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/personality.h 2009-07-23 17:34:32.192794045 -0400 -@@ -40,7 +40,7 @@ enum { - * Security-relevant compatibility flags that must be - * cleared upon setuid or setgid exec: - */ --#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE) -+#define PER_CLEAR_ON_SETID (READ_IMPLIES_EXEC|ADDR_NO_RANDOMIZE|ADDR_COMPAT_LAYOUT|MMAP_PAGE_ZERO) - - /* - * Personality types. -diff -urNp linux-2.6.29.6/include/linux/poison.h linux-2.6.29.6/include/linux/poison.h ---- linux-2.6.29.6/include/linux/poison.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/poison.h 2009-07-23 17:34:32.193834517 -0400 +diff -urNp linux-2.6.30.4/include/linux/poison.h linux-2.6.30.4/include/linux/poison.h +--- linux-2.6.30.4/include/linux/poison.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/poison.h 2009-07-30 09:48:10.116076362 -0400 @@ -7,8 +7,8 @@ * under normal circumstances, used to verify that nobody uses * non-initialized list entries. @@ -37329,10 +36570,10 @@ diff -urNp linux-2.6.29.6/include/linux/poison.h linux-2.6.29.6/include/linux/po /********** include/linux/timer.h **********/ /* -diff -urNp linux-2.6.29.6/include/linux/proc_fs.h linux-2.6.29.6/include/linux/proc_fs.h ---- linux-2.6.29.6/include/linux/proc_fs.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/proc_fs.h 2009-07-23 17:34:32.193834517 -0400 -@@ -174,6 +174,19 @@ static inline struct proc_dir_entry *pro +diff -urNp linux-2.6.30.4/include/linux/proc_fs.h linux-2.6.30.4/include/linux/proc_fs.h +--- linux-2.6.30.4/include/linux/proc_fs.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/proc_fs.h 2009-07-30 11:10:49.495569147 -0400 +@@ -170,6 +170,19 @@ static inline struct proc_dir_entry *pro return proc_create_data(name, mode, parent, proc_fops, NULL); } @@ -37352,21 +36593,9 @@ diff -urNp linux-2.6.29.6/include/linux/proc_fs.h linux-2.6.29.6/include/linux/p static inline struct proc_dir_entry *create_proc_read_entry(const char *name, mode_t mode, struct proc_dir_entry *base, read_proc_t *read_proc, void * data) -diff -urNp linux-2.6.29.6/include/linux/raid/md_k.h linux-2.6.29.6/include/linux/raid/md_k.h ---- linux-2.6.29.6/include/linux/raid/md_k.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/raid/md_k.h 2009-07-23 17:34:32.193834517 -0400 -@@ -293,7 +293,7 @@ static inline void rdev_dec_pending(mdk_ - - static inline void md_sync_acct(struct block_device *bdev, unsigned long nr_sectors) - { -- atomic_add(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); -+ atomic_add_unchecked(nr_sectors, &bdev->bd_contains->bd_disk->sync_io); - } - - struct mdk_personality -diff -urNp linux-2.6.29.6/include/linux/random.h linux-2.6.29.6/include/linux/random.h ---- linux-2.6.29.6/include/linux/random.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/random.h 2009-07-23 17:34:32.193834517 -0400 +diff -urNp linux-2.6.30.4/include/linux/random.h linux-2.6.30.4/include/linux/random.h +--- linux-2.6.30.4/include/linux/random.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/random.h 2009-07-30 09:48:10.116076362 -0400 @@ -74,6 +74,11 @@ unsigned long randomize_range(unsigned l u32 random32(void); void srandom32(u32 seed); @@ -37379,10 +36608,10 @@ diff -urNp linux-2.6.29.6/include/linux/random.h linux-2.6.29.6/include/linux/ra #endif /* __KERNEL___ */ #endif /* _LINUX_RANDOM_H */ -diff -urNp linux-2.6.29.6/include/linux/reiserfs_fs_sb.h linux-2.6.29.6/include/linux/reiserfs_fs_sb.h ---- linux-2.6.29.6/include/linux/reiserfs_fs_sb.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/reiserfs_fs_sb.h 2009-07-23 17:34:32.194808945 -0400 -@@ -374,7 +374,7 @@ struct reiserfs_sb_info { +diff -urNp linux-2.6.30.4/include/linux/reiserfs_fs_sb.h linux-2.6.30.4/include/linux/reiserfs_fs_sb.h +--- linux-2.6.30.4/include/linux/reiserfs_fs_sb.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/reiserfs_fs_sb.h 2009-07-30 09:48:10.116076362 -0400 +@@ -377,7 +377,7 @@ struct reiserfs_sb_info { /* Comment? -Hans */ wait_queue_head_t s_wait; /* To be obsoleted soon by per buffer seals.. -Hans */ @@ -37391,18 +36620,18 @@ diff -urNp linux-2.6.29.6/include/linux/reiserfs_fs_sb.h linux-2.6.29.6/include/ // tree gets re-balanced unsigned long s_properties; /* File system properties. Currently holds on-disk FS format */ -diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sched.h ---- linux-2.6.29.6/include/linux/sched.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/sched.h 2009-07-23 17:34:32.195781799 -0400 -@@ -97,6 +97,7 @@ struct futex_pi_state; - struct robust_list_head; +diff -urNp linux-2.6.30.4/include/linux/sched.h linux-2.6.30.4/include/linux/sched.h +--- linux-2.6.30.4/include/linux/sched.h 2009-07-30 20:32:40.547619620 -0400 ++++ linux-2.6.30.4/include/linux/sched.h 2009-07-30 20:32:48.019825232 -0400 +@@ -98,6 +98,7 @@ struct robust_list_head; struct bio; struct bts_tracer; + struct fs_struct; +struct linux_binprm; /* * List of flags we want to share for kernel threads, -@@ -606,6 +607,15 @@ struct signal_struct { +@@ -604,6 +605,15 @@ struct signal_struct { unsigned audit_tty; struct tty_audit_buf *tty_audit_buf; #endif @@ -37418,7 +36647,7 @@ diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sch }; /* Context switch must be unlocked if interrupts are to be enabled */ -@@ -1114,7 +1124,7 @@ struct sched_rt_entity { +@@ -1116,7 +1126,7 @@ struct sched_rt_entity { struct task_struct { volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ @@ -37427,19 +36656,7 @@ diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sch atomic_t usage; unsigned int flags; /* per process flags, defined below */ unsigned int ptrace; -@@ -1179,10 +1189,9 @@ struct task_struct { - pid_t pid; - pid_t tgid; - --#ifdef CONFIG_CC_STACKPROTECTOR - /* Canary value for the -fstack-protector gcc feature */ - unsigned long stack_canary; --#endif -+ - /* - * pointers to (original) parent process, youngest child, younger sibling, - * older sibling, respectively. (p->father can be replaced with -@@ -1223,8 +1232,8 @@ struct task_struct { +@@ -1227,8 +1237,8 @@ struct task_struct { struct list_head thread_group; struct completion *vfork_done; /* for vfork() */ @@ -37450,7 +36667,7 @@ diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sch cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; -@@ -1418,8 +1427,66 @@ struct task_struct { +@@ -1429,8 +1439,66 @@ struct task_struct { /* state flags for use by tracers */ unsigned long trace; #endif @@ -37517,7 +36734,7 @@ diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sch /* Future-safe accessor for struct task_struct's cpus_allowed. */ #define tsk_cpumask(tsk) (&(tsk)->cpus_allowed) -@@ -1961,7 +2028,7 @@ extern void __cleanup_sighand(struct sig +@@ -1988,7 +2056,7 @@ extern void __cleanup_sighand(struct sig extern void exit_itimers(struct signal_struct *); extern void flush_itimer_signals(void); @@ -37526,7 +36743,7 @@ diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sch extern void daemonize(const char *, ...); extern int allow_signal(int); -@@ -2066,8 +2133,8 @@ static inline void unlock_task_sighand(s +@@ -2098,8 +2166,8 @@ static inline void unlock_task_sighand(s #ifndef __HAVE_THREAD_FUNCTIONS @@ -37537,9 +36754,18 @@ diff -urNp linux-2.6.29.6/include/linux/sched.h linux-2.6.29.6/include/linux/sch static inline void setup_thread_stack(struct task_struct *p, struct task_struct *org) { -diff -urNp linux-2.6.29.6/include/linux/screen_info.h linux-2.6.29.6/include/linux/screen_info.h ---- linux-2.6.29.6/include/linux/screen_info.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/screen_info.h 2009-07-23 17:34:32.195781799 -0400 +@@ -2114,7 +2182,7 @@ static inline unsigned long *end_of_stac + + #endif + +-static inline int object_is_on_stack(void *obj) ++static inline int object_is_on_stack(const void *obj) + { + void *stack = task_stack_page(current); + +diff -urNp linux-2.6.30.4/include/linux/screen_info.h linux-2.6.30.4/include/linux/screen_info.h +--- linux-2.6.30.4/include/linux/screen_info.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/screen_info.h 2009-07-30 09:48:10.117039309 -0400 @@ -42,7 +42,8 @@ struct screen_info { __u16 pages; /* 0x32 */ __u16 vesa_attributes; /* 0x34 */ @@ -37550,20 +36776,20 @@ diff -urNp linux-2.6.29.6/include/linux/screen_info.h linux-2.6.29.6/include/lin } __attribute__((packed)); #define VIDEO_TYPE_MDA 0x10 /* Monochrome Text Display */ -diff -urNp linux-2.6.29.6/include/linux/security.h linux-2.6.29.6/include/linux/security.h ---- linux-2.6.29.6/include/linux/security.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/security.h 2009-07-23 17:34:32.196774213 -0400 -@@ -32,6 +32,7 @@ - #include <linux/sched.h> +diff -urNp linux-2.6.30.4/include/linux/security.h linux-2.6.30.4/include/linux/security.h +--- linux-2.6.30.4/include/linux/security.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/security.h 2009-07-30 11:22:42.449401037 -0400 +@@ -33,6 +33,7 @@ #include <linux/key.h> #include <linux/xfrm.h> + #include <linux/gfp.h> +#include <linux/grsecurity.h> #include <net/flow.h> /* Maximum number of letters for an LSM name string */ -diff -urNp linux-2.6.29.6/include/linux/shm.h linux-2.6.29.6/include/linux/shm.h ---- linux-2.6.29.6/include/linux/shm.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/shm.h 2009-07-23 17:34:32.196774213 -0400 +diff -urNp linux-2.6.30.4/include/linux/shm.h linux-2.6.30.4/include/linux/shm.h +--- linux-2.6.30.4/include/linux/shm.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/shm.h 2009-07-30 11:10:49.530519651 -0400 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke pid_t shm_cprid; pid_t shm_lprid; @@ -37575,9 +36801,9 @@ diff -urNp linux-2.6.29.6/include/linux/shm.h linux-2.6.29.6/include/linux/shm.h }; /* shm_mode upper byte flags */ -diff -urNp linux-2.6.29.6/include/linux/slab.h linux-2.6.29.6/include/linux/slab.h ---- linux-2.6.29.6/include/linux/slab.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/slab.h 2009-07-23 17:34:32.196774213 -0400 +diff -urNp linux-2.6.30.4/include/linux/slab.h linux-2.6.30.4/include/linux/slab.h +--- linux-2.6.30.4/include/linux/slab.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/slab.h 2009-07-30 09:48:10.117976173 -0400 @@ -73,10 +73,9 @@ * ZERO_SIZE_PTR can be passed to kfree though in the same way that NULL can. * Both make kfree a no-op. @@ -37599,45 +36825,47 @@ diff -urNp linux-2.6.29.6/include/linux/slab.h linux-2.6.29.6/include/linux/slab /* * Allocator specific definitions. These are mainly used to establish optimized -@@ -317,4 +317,35 @@ static inline void *kzalloc_node(size_t +@@ -317,4 +317,37 @@ static inline void *kzalloc_node(size_t return kmalloc_node(size, flags | __GFP_ZERO, node); } -+#define kmalloc(x,y) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = kmalloc((size_t)___x, y); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define kmalloc_node(x,y,z) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = kmalloc_node((size_t)___x, y, z); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define kzalloc(x,y) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = kzalloc((size_t)___x, y); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) ++#define kmalloc(x, y) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "kmalloc size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = kmalloc((size_t)___x, (y)); \ ++ ___retval; \ ++}) ++ ++#define kmalloc_node(x, y, z) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "kmalloc_node size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = kmalloc_node((size_t)___x, (y), (z));\ ++ ___retval; \ ++}) ++ ++#define kzalloc(x, y) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "kzalloc size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = kzalloc((size_t)___x, (y)); \ ++ ___retval; \ ++}) + #endif /* _LINUX_SLAB_H */ -diff -urNp linux-2.6.29.6/include/linux/slub_def.h linux-2.6.29.6/include/linux/slub_def.h ---- linux-2.6.29.6/include/linux/slub_def.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/slub_def.h 2009-07-23 17:34:32.196774213 -0400 +diff -urNp linux-2.6.30.4/include/linux/slub_def.h linux-2.6.30.4/include/linux/slub_def.h +--- linux-2.6.30.4/include/linux/slub_def.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/slub_def.h 2009-07-30 09:48:10.117976173 -0400 @@ -85,7 +85,7 @@ struct kmem_cache { struct kmem_cache_order_objects max; struct kmem_cache_order_objects min; @@ -37647,9 +36875,9 @@ diff -urNp linux-2.6.29.6/include/linux/slub_def.h linux-2.6.29.6/include/linux/ void (*ctor)(void *); int inuse; /* Offset to metadata */ int align; /* Alignment */ -diff -urNp linux-2.6.29.6/include/linux/sonet.h linux-2.6.29.6/include/linux/sonet.h ---- linux-2.6.29.6/include/linux/sonet.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/sonet.h 2009-07-23 17:34:37.460011249 -0400 +diff -urNp linux-2.6.30.4/include/linux/sonet.h linux-2.6.30.4/include/linux/sonet.h +--- linux-2.6.30.4/include/linux/sonet.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/sonet.h 2009-07-30 09:48:10.118663996 -0400 @@ -61,7 +61,7 @@ struct sonet_stats { #include <asm/atomic.h> @@ -37659,9 +36887,9 @@ diff -urNp linux-2.6.29.6/include/linux/sonet.h linux-2.6.29.6/include/linux/son __SONET_ITEMS #undef __HANDLE_ITEM }; -diff -urNp linux-2.6.29.6/include/linux/sysctl.h linux-2.6.29.6/include/linux/sysctl.h ---- linux-2.6.29.6/include/linux/sysctl.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/sysctl.h 2009-07-23 17:34:32.197772567 -0400 +diff -urNp linux-2.6.30.4/include/linux/sysctl.h linux-2.6.30.4/include/linux/sysctl.h +--- linux-2.6.30.4/include/linux/sysctl.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/sysctl.h 2009-07-30 09:48:10.118663996 -0400 @@ -165,7 +165,11 @@ enum KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */ }; @@ -37675,9 +36903,9 @@ diff -urNp linux-2.6.29.6/include/linux/sysctl.h linux-2.6.29.6/include/linux/sy /* CTL_VM names: */ enum -diff -urNp linux-2.6.29.6/include/linux/thread_info.h linux-2.6.29.6/include/linux/thread_info.h ---- linux-2.6.29.6/include/linux/thread_info.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/thread_info.h 2009-07-23 17:34:32.197772567 -0400 +diff -urNp linux-2.6.30.4/include/linux/thread_info.h linux-2.6.30.4/include/linux/thread_info.h +--- linux-2.6.30.4/include/linux/thread_info.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/thread_info.h 2009-07-30 09:48:10.118663996 -0400 @@ -23,7 +23,7 @@ struct restart_block { }; /* For futex_wait */ @@ -37687,9 +36915,9 @@ diff -urNp linux-2.6.29.6/include/linux/thread_info.h linux-2.6.29.6/include/lin u32 val; u32 flags; u32 bitset; -diff -urNp linux-2.6.29.6/include/linux/tty_ldisc.h linux-2.6.29.6/include/linux/tty_ldisc.h ---- linux-2.6.29.6/include/linux/tty_ldisc.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/tty_ldisc.h 2009-07-23 17:34:32.197772567 -0400 +diff -urNp linux-2.6.30.4/include/linux/tty_ldisc.h linux-2.6.30.4/include/linux/tty_ldisc.h +--- linux-2.6.30.4/include/linux/tty_ldisc.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/tty_ldisc.h 2009-07-30 09:48:10.118663996 -0400 @@ -139,12 +139,12 @@ struct tty_ldisc_ops { struct module *owner; @@ -37705,10 +36933,10 @@ diff -urNp linux-2.6.29.6/include/linux/tty_ldisc.h linux-2.6.29.6/include/linux }; #define TTY_LDISC_MAGIC 0x5403 -diff -urNp linux-2.6.29.6/include/linux/types.h linux-2.6.29.6/include/linux/types.h ---- linux-2.6.29.6/include/linux/types.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/types.h 2009-07-23 17:34:32.197772567 -0400 -@@ -198,10 +198,26 @@ typedef struct { +diff -urNp linux-2.6.30.4/include/linux/types.h linux-2.6.30.4/include/linux/types.h +--- linux-2.6.30.4/include/linux/types.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/types.h 2009-07-30 09:48:10.118663996 -0400 +@@ -191,10 +191,26 @@ typedef struct { volatile int counter; } atomic_t; @@ -37735,9 +36963,9 @@ diff -urNp linux-2.6.29.6/include/linux/types.h linux-2.6.29.6/include/linux/typ #endif struct ustat { -diff -urNp linux-2.6.29.6/include/linux/uaccess.h linux-2.6.29.6/include/linux/uaccess.h ---- linux-2.6.29.6/include/linux/uaccess.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/uaccess.h 2009-07-23 17:34:32.197772567 -0400 +diff -urNp linux-2.6.30.4/include/linux/uaccess.h linux-2.6.30.4/include/linux/uaccess.h +--- linux-2.6.30.4/include/linux/uaccess.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/uaccess.h 2009-07-30 09:48:10.118663996 -0400 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_ long ret; \ mm_segment_t old_fs = get_fs(); \ @@ -37752,9 +36980,9 @@ diff -urNp linux-2.6.29.6/include/linux/uaccess.h linux-2.6.29.6/include/linux/u ret; \ }) -diff -urNp linux-2.6.29.6/include/linux/vmalloc.h linux-2.6.29.6/include/linux/vmalloc.h ---- linux-2.6.29.6/include/linux/vmalloc.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/linux/vmalloc.h 2009-07-23 17:34:32.197772567 -0400 +diff -urNp linux-2.6.30.4/include/linux/vmalloc.h linux-2.6.30.4/include/linux/vmalloc.h +--- linux-2.6.30.4/include/linux/vmalloc.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/linux/vmalloc.h 2009-07-30 09:48:10.119975963 -0400 @@ -13,6 +13,11 @@ struct vm_area_struct; /* vma defining #define VM_MAP 0x00000004 /* vmap()ed pages */ #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ @@ -37767,86 +36995,92 @@ diff -urNp linux-2.6.29.6/include/linux/vmalloc.h linux-2.6.29.6/include/linux/v /* bits [20..32] reserved for arch specific ioremap internals */ /* -@@ -111,4 +116,75 @@ extern long vwrite(char *buf, char *addr - extern rwlock_t vmlist_lock; +@@ -115,4 +120,81 @@ extern rwlock_t vmlist_lock; extern struct vm_struct *vmlist; - -+#define vmalloc(x) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = vmalloc((unsigned long)___x); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define __vmalloc(x,y,z) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = __vmalloc((unsigned long)___x, y, z); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define vmalloc_user(x) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = vmalloc_user((unsigned long)___x); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define vmalloc_exec(x) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = vmalloc_exec((unsigned long)___x); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define vmalloc_node(x,y) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = vmalloc_node((unsigned long)___x,y); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define vmalloc_32(x) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = vmalloc_32((unsigned long)___x); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) -+#define vmalloc_32_user(x) \ -+ ({ \ -+ void *___retval; \ -+ intoverflow_t ___x = (intoverflow_t)x; \ -+ if (likely(___x <= ULONG_MAX)) \ -+ ___retval = vmalloc_32_user((unsigned long)___x); \ -+ else \ -+ ___retval = NULL; \ -+ ___retval; \ -+ }) + extern __init void vm_area_register_early(struct vm_struct *vm, size_t align); + ++#define vmalloc(x) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "vmalloc size overflow\n")) \ ++ ___retval = NULL; \ ++ else \ ++ ___retval = vmalloc((unsigned long)___x); \ ++ ___retval; \ ++}) ++ ++#define __vmalloc(x, y, z) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "__vmalloc size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = __vmalloc((unsigned long)___x, (y), (z));\ ++ ___retval; \ ++}) ++ ++#define vmalloc_user(x) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "vmalloc_user size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = vmalloc_user((unsigned long)___x); \ ++ ___retval; \ ++}) ++ ++#define vmalloc_exec(x) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "vmalloc_exec size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = vmalloc_exec((unsigned long)___x); \ ++ ___retval; \ ++}) ++ ++#define vmalloc_node(x, y) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "vmalloc_node size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = vmalloc_node((unsigned long)___x, (y));\ ++ ___retval; \ ++}) ++ ++#define vmalloc_32(x) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "vmalloc_32 size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = vmalloc_32((unsigned long)___x); \ ++ ___retval; \ ++}) ++ ++#define vmalloc_32_user(x) \ ++({ \ ++ void *___retval; \ ++ intoverflow_t ___x = (intoverflow_t)x; \ ++ if (WARN(___x > ULONG_MAX, "vmalloc_32_user size overflow\n"))\ ++ ___retval = NULL; \ ++ else \ ++ ___retval = vmalloc_32_user((unsigned long)___x);\ ++ ___retval; \ ++}) + #endif /* _LINUX_VMALLOC_H */ -diff -urNp linux-2.6.29.6/include/net/sctp/sctp.h linux-2.6.29.6/include/net/sctp/sctp.h ---- linux-2.6.29.6/include/net/sctp/sctp.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/net/sctp/sctp.h 2009-07-23 17:34:32.198741602 -0400 -@@ -310,8 +310,8 @@ extern int sctp_debug_flag; +diff -urNp linux-2.6.30.4/include/net/sctp/sctp.h linux-2.6.30.4/include/net/sctp/sctp.h +--- linux-2.6.30.4/include/net/sctp/sctp.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/net/sctp/sctp.h 2009-07-30 09:48:10.119975963 -0400 +@@ -305,8 +305,8 @@ extern int sctp_debug_flag; #else /* SCTP_DEBUG */ @@ -37857,10 +37091,10 @@ diff -urNp linux-2.6.29.6/include/net/sctp/sctp.h linux-2.6.29.6/include/net/sct #define SCTP_ENABLE_DEBUG #define SCTP_DISABLE_DEBUG #define SCTP_ASSERT(expr, str, func) -diff -urNp linux-2.6.29.6/include/sound/core.h linux-2.6.29.6/include/sound/core.h ---- linux-2.6.29.6/include/sound/core.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/sound/core.h 2009-07-23 17:34:32.198741602 -0400 -@@ -427,7 +427,7 @@ static inline int __snd_bug_on(int cond) +diff -urNp linux-2.6.30.4/include/sound/core.h linux-2.6.30.4/include/sound/core.h +--- linux-2.6.30.4/include/sound/core.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/sound/core.h 2009-07-30 09:48:10.119975963 -0400 +@@ -439,7 +439,7 @@ static inline int __snd_bug_on(int cond) */ #define snd_printdd(format, args...) snd_printk(format, ##args) #else @@ -37869,9 +37103,9 @@ diff -urNp linux-2.6.29.6/include/sound/core.h linux-2.6.29.6/include/sound/core #endif -diff -urNp linux-2.6.29.6/include/video/uvesafb.h linux-2.6.29.6/include/video/uvesafb.h ---- linux-2.6.29.6/include/video/uvesafb.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/include/video/uvesafb.h 2009-07-23 17:34:32.198741602 -0400 +diff -urNp linux-2.6.30.4/include/video/uvesafb.h linux-2.6.30.4/include/video/uvesafb.h +--- linux-2.6.30.4/include/video/uvesafb.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/include/video/uvesafb.h 2009-07-30 09:48:10.120938150 -0400 @@ -177,6 +177,7 @@ struct uvesafb_par { u8 ypan; /* 0 - nothing, 1 - ypan, 2 - ywrap */ u8 pmi_setpal; /* PMI for palette changes */ @@ -37880,10 +37114,10 @@ diff -urNp linux-2.6.29.6/include/video/uvesafb.h linux-2.6.29.6/include/video/u void *pmi_start; void *pmi_pal; u8 *vbe_state_orig; /* -diff -urNp linux-2.6.29.6/init/do_mounts.c linux-2.6.29.6/init/do_mounts.c ---- linux-2.6.29.6/init/do_mounts.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/do_mounts.c 2009-07-23 17:34:32.198741602 -0400 -@@ -215,11 +215,11 @@ static void __init get_fs_names(char *pa +diff -urNp linux-2.6.30.4/init/do_mounts.c linux-2.6.30.4/init/do_mounts.c +--- linux-2.6.30.4/init/do_mounts.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/do_mounts.c 2009-07-30 09:48:10.121806882 -0400 +@@ -216,11 +216,11 @@ static void __init get_fs_names(char *pa static int __init do_mount_root(char *name, char *fs, int flags, void *data) { @@ -37897,7 +37131,7 @@ diff -urNp linux-2.6.29.6/init/do_mounts.c linux-2.6.29.6/init/do_mounts.c ROOT_DEV = current->fs->pwd.mnt->mnt_sb->s_dev; printk("VFS: Mounted root (%s filesystem)%s on device %u:%u.\n", current->fs->pwd.mnt->mnt_sb->s_type->name, -@@ -309,18 +309,18 @@ void __init change_floppy(char *fmt, ... +@@ -310,18 +310,18 @@ void __init change_floppy(char *fmt, ... va_start(args, fmt); vsprintf(buf, fmt, args); va_end(args); @@ -37919,7 +37153,7 @@ diff -urNp linux-2.6.29.6/init/do_mounts.c linux-2.6.29.6/init/do_mounts.c termios.c_lflag |= ICANON; sys_ioctl(fd, TCSETSF, (long)&termios); sys_close(fd); -@@ -413,7 +413,7 @@ void __init prepare_namespace(void) +@@ -414,7 +414,7 @@ void __init prepare_namespace(void) mount_root(); out: @@ -37929,10 +37163,10 @@ diff -urNp linux-2.6.29.6/init/do_mounts.c linux-2.6.29.6/init/do_mounts.c + sys_chroot((char __user *)"."); } -diff -urNp linux-2.6.29.6/init/do_mounts.h linux-2.6.29.6/init/do_mounts.h ---- linux-2.6.29.6/init/do_mounts.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/do_mounts.h 2009-07-23 17:34:32.198741602 -0400 -@@ -14,15 +14,15 @@ extern int root_mountflags; +diff -urNp linux-2.6.30.4/init/do_mounts.h linux-2.6.30.4/init/do_mounts.h +--- linux-2.6.30.4/init/do_mounts.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/do_mounts.h 2009-07-30 09:48:10.121806882 -0400 +@@ -15,15 +15,15 @@ extern int root_mountflags; static inline int create_dev(char *name, dev_t dev) { @@ -37951,9 +37185,9 @@ diff -urNp linux-2.6.29.6/init/do_mounts.h linux-2.6.29.6/init/do_mounts.h return 0; if (!S_ISBLK(stat.st_mode)) return 0; -diff -urNp linux-2.6.29.6/init/do_mounts_initrd.c linux-2.6.29.6/init/do_mounts_initrd.c ---- linux-2.6.29.6/init/do_mounts_initrd.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/do_mounts_initrd.c 2009-07-23 17:34:32.199729497 -0400 +diff -urNp linux-2.6.30.4/init/do_mounts_initrd.c linux-2.6.30.4/init/do_mounts_initrd.c +--- linux-2.6.30.4/init/do_mounts_initrd.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/do_mounts_initrd.c 2009-07-30 09:48:10.121806882 -0400 @@ -32,7 +32,7 @@ static int __init do_linuxrc(void * shel sys_close(old_fd);sys_close(root_fd); sys_close(0);sys_close(1);sys_close(2); @@ -38037,10 +37271,10 @@ diff -urNp linux-2.6.29.6/init/do_mounts_initrd.c linux-2.6.29.6/init/do_mounts_ + sys_unlink((const char __user *)"/initrd.image"); return 0; } -diff -urNp linux-2.6.29.6/init/do_mounts_md.c linux-2.6.29.6/init/do_mounts_md.c ---- linux-2.6.29.6/init/do_mounts_md.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/do_mounts_md.c 2009-07-23 17:34:32.199729497 -0400 -@@ -171,7 +171,7 @@ static void __init md_setup_drive(void) +diff -urNp linux-2.6.30.4/init/do_mounts_md.c linux-2.6.30.4/init/do_mounts_md.c +--- linux-2.6.30.4/init/do_mounts_md.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/do_mounts_md.c 2009-07-30 09:48:10.121806882 -0400 +@@ -170,7 +170,7 @@ static void __init md_setup_drive(void) partitioned ? "_d" : "", minor, md_setup_args[ent].device_names); @@ -38049,7 +37283,7 @@ diff -urNp linux-2.6.29.6/init/do_mounts_md.c linux-2.6.29.6/init/do_mounts_md.c if (fd < 0) { printk(KERN_ERR "md: open failed - cannot start " "array %s\n", name); -@@ -234,7 +234,7 @@ static void __init md_setup_drive(void) +@@ -233,7 +233,7 @@ static void __init md_setup_drive(void) * array without it */ sys_close(fd); @@ -38058,7 +37292,7 @@ diff -urNp linux-2.6.29.6/init/do_mounts_md.c linux-2.6.29.6/init/do_mounts_md.c sys_ioctl(fd, BLKRRPART, 0); } sys_close(fd); -@@ -284,7 +284,7 @@ static void __init autodetect_raid(void) +@@ -283,7 +283,7 @@ static void __init autodetect_raid(void) wait_for_device_probe(); @@ -38067,10 +37301,10 @@ diff -urNp linux-2.6.29.6/init/do_mounts_md.c linux-2.6.29.6/init/do_mounts_md.c if (fd >= 0) { sys_ioctl(fd, RAID_AUTORUN, raid_autopart); sys_close(fd); -diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c ---- linux-2.6.29.6/init/initramfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/initramfs.c 2009-07-23 17:34:32.199729497 -0400 -@@ -276,7 +276,7 @@ static int __init maybe_link(void) +diff -urNp linux-2.6.30.4/init/initramfs.c linux-2.6.30.4/init/initramfs.c +--- linux-2.6.30.4/init/initramfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/initramfs.c 2009-07-30 09:48:10.121806882 -0400 +@@ -271,7 +271,7 @@ static int __init maybe_link(void) if (nlink >= 2) { char *old = find_link(major, minor, ino, mode, collected); if (old) @@ -38079,7 +37313,7 @@ diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c } return 0; } -@@ -285,11 +285,11 @@ static void __init clean_path(char *path +@@ -280,11 +280,11 @@ static void __init clean_path(char *path { struct stat st; @@ -38094,7 +37328,7 @@ diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c } } -@@ -312,7 +312,7 @@ static int __init do_name(void) +@@ -305,7 +305,7 @@ static int __init do_name(void) int openflags = O_WRONLY|O_CREAT; if (ml != 1) openflags |= O_TRUNC; @@ -38103,7 +37337,7 @@ diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c if (wfd >= 0) { sys_fchown(wfd, uid, gid); -@@ -323,16 +323,16 @@ static int __init do_name(void) +@@ -317,16 +317,16 @@ static int __init do_name(void) } } } else if (S_ISDIR(mode)) { @@ -38126,7 +37360,7 @@ diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c do_utime(collected, mtime); } } -@@ -342,7 +342,7 @@ static int __init do_name(void) +@@ -336,7 +336,7 @@ static int __init do_name(void) static int __init do_copy(void) { if (count >= body_len) { @@ -38135,7 +37369,7 @@ diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c sys_close(wfd); do_utime(vcollected, mtime); kfree(vcollected); -@@ -350,7 +350,7 @@ static int __init do_copy(void) +@@ -344,7 +344,7 @@ static int __init do_copy(void) state = SkipIt; return 0; } else { @@ -38144,7 +37378,7 @@ diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c body_len -= count; eat(count); return 1; -@@ -361,8 +361,8 @@ static int __init do_symlink(void) +@@ -355,8 +355,8 @@ static int __init do_symlink(void) { collected[N_ALIGN(name_len) + body_len] = '\0'; clean_path(collected, 0); @@ -38155,10 +37389,10 @@ diff -urNp linux-2.6.29.6/init/initramfs.c linux-2.6.29.6/init/initramfs.c do_utime(collected, mtime); state = SkipIt; next_state = Reset; -diff -urNp linux-2.6.29.6/init/Kconfig linux-2.6.29.6/init/Kconfig ---- linux-2.6.29.6/init/Kconfig 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/Kconfig 2009-07-23 17:34:32.199729497 -0400 -@@ -712,6 +712,7 @@ config SYSCTL_SYSCALL +diff -urNp linux-2.6.30.4/init/Kconfig linux-2.6.30.4/init/Kconfig +--- linux-2.6.30.4/init/Kconfig 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/Kconfig 2009-07-30 11:10:49.547309962 -0400 +@@ -780,6 +780,7 @@ config SYSCTL_SYSCALL config KALLSYMS bool "Load all symbols for debugging/ksymoops" if EMBEDDED default y @@ -38166,7 +37400,7 @@ diff -urNp linux-2.6.29.6/init/Kconfig linux-2.6.29.6/init/Kconfig help Say Y here to let the kernel print out symbolic crash information and symbolic stack backtraces. This increases the size of the kernel -@@ -887,7 +888,7 @@ config SLUB_DEBUG +@@ -963,7 +964,7 @@ config SLUB_DEBUG config COMPAT_BRK bool "Disable heap randomization" @@ -38175,7 +37409,7 @@ diff -urNp linux-2.6.29.6/init/Kconfig linux-2.6.29.6/init/Kconfig help Randomizing heap placement makes heap exploits harder, but it also breaks ancient binaries (including anything libc5 based). -@@ -960,9 +961,9 @@ config HAVE_GENERIC_DMA_COHERENT +@@ -1050,9 +1051,9 @@ config HAVE_GENERIC_DMA_COHERENT config SLABINFO bool @@ -38187,10 +37421,10 @@ diff -urNp linux-2.6.29.6/init/Kconfig linux-2.6.29.6/init/Kconfig config RT_MUTEXES boolean -diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c ---- linux-2.6.29.6/init/main.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/main.c 2009-07-23 17:34:32.200835198 -0400 -@@ -96,6 +96,7 @@ static inline void mark_rodata_ro(void) +diff -urNp linux-2.6.30.4/init/main.c linux-2.6.30.4/init/main.c +--- linux-2.6.30.4/init/main.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/main.c 2009-07-30 11:10:49.548504780 -0400 +@@ -98,6 +98,7 @@ static inline void mark_rodata_ro(void) #ifdef CONFIG_TC extern void tc_init(void); #endif @@ -38198,7 +37432,7 @@ diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c enum system_states system_state __read_mostly; EXPORT_SYMBOL(system_state); -@@ -182,6 +183,40 @@ static int __init set_reset_devices(char +@@ -184,6 +185,40 @@ static int __init set_reset_devices(char __setup("reset_devices", set_reset_devices); @@ -38239,7 +37473,7 @@ diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c static char * argv_init[MAX_INIT_ARGS+2] = { "init", NULL, }; char * envp_init[MAX_INIT_ENVS+2] = { "HOME=/", "TERM=linux", NULL, }; static const char *panic_later, *panic_param; -@@ -375,7 +410,7 @@ static void __init setup_nr_cpu_ids(void +@@ -377,7 +412,7 @@ static void __init setup_nr_cpu_ids(void } #ifndef CONFIG_HAVE_SETUP_PER_CPU_AREA @@ -38248,7 +37482,7 @@ diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c EXPORT_SYMBOL(__per_cpu_offset); -@@ -694,6 +729,7 @@ int do_one_initcall(initcall_t fn) +@@ -706,6 +741,7 @@ int do_one_initcall(initcall_t fn) { int count = preempt_count(); ktime_t calltime, delta, rettime; @@ -38256,7 +37490,7 @@ diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c char msgbuf[64]; struct boot_trace_call call; struct boot_trace_ret ret; -@@ -724,15 +760,15 @@ int do_one_initcall(initcall_t fn) +@@ -736,15 +772,15 @@ int do_one_initcall(initcall_t fn) sprintf(msgbuf, "error code %d ", ret.result); if (preempt_count() != count) { @@ -38276,7 +37510,7 @@ diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c } return ret.result; -@@ -873,6 +909,8 @@ static int __init kernel_init(void * unu +@@ -885,6 +921,8 @@ static int __init kernel_init(void * unu prepare_namespace(); } @@ -38285,9 +37519,9 @@ diff -urNp linux-2.6.29.6/init/main.c linux-2.6.29.6/init/main.c /* * Ok, we have completed the initial bootup, and * we're essentially up and running. Get rid of the -diff -urNp linux-2.6.29.6/init/noinitramfs.c linux-2.6.29.6/init/noinitramfs.c ---- linux-2.6.29.6/init/noinitramfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/init/noinitramfs.c 2009-07-23 17:34:32.200835198 -0400 +diff -urNp linux-2.6.30.4/init/noinitramfs.c linux-2.6.30.4/init/noinitramfs.c +--- linux-2.6.30.4/init/noinitramfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/init/noinitramfs.c 2009-07-30 09:48:10.122895747 -0400 @@ -29,7 +29,7 @@ static int __init default_rootfs(void) { int err; @@ -38306,9 +37540,9 @@ diff -urNp linux-2.6.29.6/init/noinitramfs.c linux-2.6.29.6/init/noinitramfs.c if (err < 0) goto out; -diff -urNp linux-2.6.29.6/ipc/ipc_sysctl.c linux-2.6.29.6/ipc/ipc_sysctl.c ---- linux-2.6.29.6/ipc/ipc_sysctl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/ipc/ipc_sysctl.c 2009-07-23 17:34:32.200835198 -0400 +diff -urNp linux-2.6.30.4/ipc/ipc_sysctl.c linux-2.6.30.4/ipc/ipc_sysctl.c +--- linux-2.6.30.4/ipc/ipc_sysctl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/ipc/ipc_sysctl.c 2009-07-30 09:48:10.122895747 -0400 @@ -267,7 +267,7 @@ static struct ctl_table ipc_kern_table[] .extra1 = &zero, .extra2 = &one, @@ -38327,10 +37561,10 @@ diff -urNp linux-2.6.29.6/ipc/ipc_sysctl.c linux-2.6.29.6/ipc/ipc_sysctl.c }; static int __init ipc_sysctl_init(void) -diff -urNp linux-2.6.29.6/ipc/mqueue.c linux-2.6.29.6/ipc/mqueue.c ---- linux-2.6.29.6/ipc/mqueue.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/ipc/mqueue.c 2009-07-23 18:40:28.718303595 -0400 -@@ -90,7 +90,7 @@ struct mqueue_inode_info { +diff -urNp linux-2.6.30.4/ipc/mqueue.c linux-2.6.30.4/ipc/mqueue.c +--- linux-2.6.30.4/ipc/mqueue.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/ipc/mqueue.c 2009-07-30 11:10:49.559299006 -0400 +@@ -76,7 +76,7 @@ struct mqueue_inode_info { static const struct inode_operations mqueue_dir_inode_operations; static const struct file_operations mqueue_file_operations; @@ -38338,8 +37572,8 @@ diff -urNp linux-2.6.29.6/ipc/mqueue.c linux-2.6.29.6/ipc/mqueue.c +static const struct super_operations mqueue_super_ops; static void remove_notification(struct mqueue_inode_info *info); - static spinlock_t mq_lock; -@@ -151,6 +151,7 @@ static struct inode *mqueue_get_inode(st + static struct kmem_cache *mqueue_inode_cachep; +@@ -149,6 +149,7 @@ static struct inode *mqueue_get_inode(st mq_bytes = (mq_msg_tblsz + (info->attr.mq_maxmsg * info->attr.mq_msgsize)); @@ -38347,7 +37581,7 @@ diff -urNp linux-2.6.29.6/ipc/mqueue.c linux-2.6.29.6/ipc/mqueue.c spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || u->mq_bytes + mq_bytes > -@@ -1189,7 +1190,7 @@ static const struct file_operations mque +@@ -1222,7 +1223,7 @@ static const struct file_operations mque .read = mqueue_read_file, }; @@ -38356,9 +37590,9 @@ diff -urNp linux-2.6.29.6/ipc/mqueue.c linux-2.6.29.6/ipc/mqueue.c .alloc_inode = mqueue_alloc_inode, .destroy_inode = mqueue_destroy_inode, .statfs = simple_statfs, -diff -urNp linux-2.6.29.6/ipc/msg.c linux-2.6.29.6/ipc/msg.c ---- linux-2.6.29.6/ipc/msg.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/ipc/msg.c 2009-07-23 17:34:32.201947567 -0400 +diff -urNp linux-2.6.30.4/ipc/msg.c linux-2.6.30.4/ipc/msg.c +--- linux-2.6.30.4/ipc/msg.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/ipc/msg.c 2009-07-30 11:10:49.568315799 -0400 @@ -314,6 +314,7 @@ SYSCALL_DEFINE2(msgget, key_t, key, int, struct ipc_namespace *ns; struct ipc_ops msg_ops; @@ -38388,9 +37622,9 @@ diff -urNp linux-2.6.29.6/ipc/msg.c linux-2.6.29.6/ipc/msg.c freeque(ns, ipcp); goto out_up; case IPC_SET: -diff -urNp linux-2.6.29.6/ipc/sem.c linux-2.6.29.6/ipc/sem.c ---- linux-2.6.29.6/ipc/sem.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/ipc/sem.c 2009-07-23 17:34:32.201947567 -0400 +diff -urNp linux-2.6.30.4/ipc/sem.c linux-2.6.30.4/ipc/sem.c +--- linux-2.6.30.4/ipc/sem.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/ipc/sem.c 2009-07-30 11:10:49.579322291 -0400 @@ -313,6 +313,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int, struct ipc_namespace *ns; struct ipc_ops sem_ops; @@ -38420,10 +37654,10 @@ diff -urNp linux-2.6.29.6/ipc/sem.c linux-2.6.29.6/ipc/sem.c freeary(ns, ipcp); goto out_up; case IPC_SET: -diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c ---- linux-2.6.29.6/ipc/shm.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/ipc/shm.c 2009-07-23 19:29:38.792396623 -0400 -@@ -54,7 +54,7 @@ struct shm_file_data { +diff -urNp linux-2.6.30.4/ipc/shm.c linux-2.6.30.4/ipc/shm.c +--- linux-2.6.30.4/ipc/shm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/ipc/shm.c 2009-07-30 11:10:49.582310282 -0400 +@@ -55,7 +55,7 @@ struct shm_file_data { #define shm_file_data(file) (*((struct shm_file_data **)&(file)->private_data)) static const struct file_operations shm_file_operations; @@ -38432,7 +37666,7 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c #define shm_ids(ns) ((ns)->ids[IPC_SHM_IDS]) -@@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name +@@ -70,6 +70,14 @@ static void shm_destroy (struct ipc_name static int sysvipc_shm_proc_show(struct seq_file *s, void *it); #endif @@ -38447,7 +37681,7 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c void shm_init_ns(struct ipc_namespace *ns) { ns->shm_ctlmax = SHMMAX; -@@ -87,6 +95,8 @@ static void do_shm_rmid(struct ipc_names +@@ -88,6 +96,8 @@ static void do_shm_rmid(struct ipc_names struct shmid_kernel *shp; shp = container_of(ipcp, struct shmid_kernel, shm_perm); @@ -38456,7 +37690,7 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c if (shp->shm_nattch){ shp->shm_perm.mode |= SHM_DEST; /* Do not find it any more */ -@@ -311,7 +321,7 @@ static const struct file_operations shm_ +@@ -312,7 +322,7 @@ static const struct file_operations shm_ .get_unmapped_area = shm_get_unmapped_area, }; @@ -38465,7 +37699,7 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c .open = shm_open, /* callback for a new vm-area open */ .close = shm_close, /* callback for when the vm-area is released */ .fault = shm_fault, -@@ -394,6 +404,14 @@ static int newseg(struct ipc_namespace * +@@ -396,6 +406,14 @@ static int newseg(struct ipc_namespace * shp->shm_lprid = 0; shp->shm_atim = shp->shm_dtim = 0; shp->shm_ctim = get_seconds(); @@ -38480,7 +37714,7 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c shp->shm_segsz = size; shp->shm_nattch = 0; shp->shm_file = file; -@@ -447,6 +465,7 @@ SYSCALL_DEFINE3(shmget, key_t, key, size +@@ -449,6 +467,7 @@ SYSCALL_DEFINE3(shmget, key_t, key, size struct ipc_namespace *ns; struct ipc_ops shm_ops; struct ipc_params shm_params; @@ -38488,7 +37722,7 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c ns = current->nsproxy->ipc_ns; -@@ -458,7 +477,11 @@ SYSCALL_DEFINE3(shmget, key_t, key, size +@@ -460,7 +479,11 @@ SYSCALL_DEFINE3(shmget, key_t, key, size shm_params.flg = shmflg; shm_params.u.size = size; @@ -38501,7 +37735,7 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c } static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_ds *in, int version) -@@ -873,9 +896,21 @@ long do_shmat(int shmid, char __user *sh +@@ -877,9 +900,21 @@ long do_shmat(int shmid, char __user *sh if (err) goto out_unlock; @@ -38523,10 +37757,10 @@ diff -urNp linux-2.6.29.6/ipc/shm.c linux-2.6.29.6/ipc/shm.c size = i_size_read(path.dentry->d_inode); shm_unlock(shp); -diff -urNp linux-2.6.29.6/ipc/util.c linux-2.6.29.6/ipc/util.c ---- linux-2.6.29.6/ipc/util.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/ipc/util.c 2009-07-23 18:40:28.718303595 -0400 -@@ -951,7 +951,7 @@ static int sysvipc_proc_show(struct seq_ +diff -urNp linux-2.6.30.4/ipc/util.c linux-2.6.30.4/ipc/util.c +--- linux-2.6.30.4/ipc/util.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/ipc/util.c 2009-07-30 09:48:10.123853712 -0400 +@@ -942,7 +942,7 @@ static int sysvipc_proc_show(struct seq_ return iface->show(s, it); } @@ -38535,9 +37769,9 @@ diff -urNp linux-2.6.29.6/ipc/util.c linux-2.6.29.6/ipc/util.c .start = sysvipc_proc_start, .stop = sysvipc_proc_stop, .next = sysvipc_proc_next, -diff -urNp linux-2.6.29.6/kernel/acct.c linux-2.6.29.6/kernel/acct.c ---- linux-2.6.29.6/kernel/acct.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/acct.c 2009-07-23 17:34:32.202812463 -0400 +diff -urNp linux-2.6.30.4/kernel/acct.c linux-2.6.30.4/kernel/acct.c +--- linux-2.6.30.4/kernel/acct.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/acct.c 2009-07-30 09:48:10.124859675 -0400 @@ -574,7 +574,7 @@ static void do_acct_process(struct bsd_a */ flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -38547,9 +37781,9 @@ diff -urNp linux-2.6.29.6/kernel/acct.c linux-2.6.29.6/kernel/acct.c sizeof(acct_t), &file->f_pos); current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim; set_fs(fs); -diff -urNp linux-2.6.29.6/kernel/capability.c linux-2.6.29.6/kernel/capability.c ---- linux-2.6.29.6/kernel/capability.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/capability.c 2009-07-23 17:34:32.203740622 -0400 +diff -urNp linux-2.6.30.4/kernel/capability.c linux-2.6.30.4/kernel/capability.c +--- linux-2.6.30.4/kernel/capability.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/capability.c 2009-07-30 11:10:49.599076288 -0400 @@ -306,10 +306,21 @@ int capable(int cap) BUG(); } @@ -38573,10 +37807,10 @@ diff -urNp linux-2.6.29.6/kernel/capability.c linux-2.6.29.6/kernel/capability.c + EXPORT_SYMBOL(capable); +EXPORT_SYMBOL(capable_nolog); -diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c ---- linux-2.6.29.6/kernel/cgroup.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/cgroup.c 2009-07-23 18:40:28.719355936 -0400 -@@ -560,8 +560,8 @@ void cgroup_unlock(void) +diff -urNp linux-2.6.30.4/kernel/cgroup.c linux-2.6.30.4/kernel/cgroup.c +--- linux-2.6.30.4/kernel/cgroup.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/cgroup.c 2009-07-30 09:48:10.125699437 -0400 +@@ -594,8 +594,8 @@ void cgroup_unlock(void) static int cgroup_mkdir(struct inode *dir, struct dentry *dentry, int mode); static int cgroup_rmdir(struct inode *unused_dir, struct dentry *dentry); static int cgroup_populate_dir(struct cgroup *cgrp); @@ -38587,7 +37821,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c static struct backing_dev_info cgroup_backing_dev_info = { .capabilities = BDI_CAP_NO_ACCT_AND_WRITEBACK, -@@ -872,7 +872,7 @@ static int cgroup_remount(struct super_b +@@ -930,7 +930,7 @@ static int cgroup_remount(struct super_b return ret; } @@ -38596,7 +37830,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .statfs = simple_statfs, .drop_inode = generic_delete_inode, .show_options = cgroup_show_options, -@@ -1550,7 +1550,7 @@ static int cgroup_seqfile_release(struct +@@ -1612,7 +1612,7 @@ static int cgroup_seqfile_release(struct return single_release(inode, file); } @@ -38605,7 +37839,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .read = seq_read, .write = cgroup_file_write, .llseek = seq_lseek, -@@ -1609,7 +1609,7 @@ static int cgroup_rename(struct inode *o +@@ -1671,7 +1671,7 @@ static int cgroup_rename(struct inode *o return simple_rename(old_dir, old_dentry, new_dir, new_dentry); } @@ -38614,7 +37848,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .read = cgroup_file_read, .write = cgroup_file_write, .llseek = generic_file_llseek, -@@ -1617,7 +1617,7 @@ static struct file_operations cgroup_fil +@@ -1679,7 +1679,7 @@ static struct file_operations cgroup_fil .release = cgroup_file_release, }; @@ -38623,7 +37857,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .lookup = simple_lookup, .mkdir = cgroup_mkdir, .rmdir = cgroup_rmdir, -@@ -2171,7 +2171,7 @@ static int cgroup_tasks_show(struct seq_ +@@ -2262,7 +2262,7 @@ static int cgroup_tasks_show(struct seq_ return seq_printf(s, "%d\n", *(int *)v); } @@ -38632,7 +37866,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .start = cgroup_tasks_start, .stop = cgroup_tasks_stop, .next = cgroup_tasks_next, -@@ -2201,7 +2201,7 @@ static int cgroup_tasks_release(struct i +@@ -2292,7 +2292,7 @@ static int cgroup_tasks_release(struct i return seq_release(inode, file); } @@ -38641,7 +37875,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .read = seq_read, .llseek = seq_lseek, .write = cgroup_file_write, -@@ -2796,7 +2796,7 @@ static int cgroup_open(struct inode *ino +@@ -2930,7 +2930,7 @@ static int cgroup_open(struct inode *ino return single_open(file, proc_cgroup_show, pid); } @@ -38650,7 +37884,7 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .open = cgroup_open, .read = seq_read, .llseek = seq_lseek, -@@ -2825,7 +2825,7 @@ static int cgroupstats_open(struct inode +@@ -2959,7 +2959,7 @@ static int cgroupstats_open(struct inode return single_open(file, proc_cgroupstats_show, NULL); } @@ -38659,9 +37893,9 @@ diff -urNp linux-2.6.29.6/kernel/cgroup.c linux-2.6.29.6/kernel/cgroup.c .open = cgroupstats_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/kernel/configs.c linux-2.6.29.6/kernel/configs.c ---- linux-2.6.29.6/kernel/configs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/configs.c 2009-07-23 17:34:32.203740622 -0400 +diff -urNp linux-2.6.30.4/kernel/configs.c linux-2.6.30.4/kernel/configs.c +--- linux-2.6.30.4/kernel/configs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/configs.c 2009-07-30 11:10:49.609950770 -0400 @@ -73,8 +73,19 @@ static int __init ikconfig_init(void) struct proc_dir_entry *entry; @@ -38682,9 +37916,9 @@ diff -urNp linux-2.6.29.6/kernel/configs.c linux-2.6.29.6/kernel/configs.c if (!entry) return -ENOMEM; -diff -urNp linux-2.6.29.6/kernel/cpu.c linux-2.6.29.6/kernel/cpu.c ---- linux-2.6.29.6/kernel/cpu.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/cpu.c 2009-07-23 17:34:32.203740622 -0400 +diff -urNp linux-2.6.30.4/kernel/cpu.c linux-2.6.30.4/kernel/cpu.c +--- linux-2.6.30.4/kernel/cpu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/cpu.c 2009-07-30 09:48:10.125699437 -0400 @@ -19,7 +19,7 @@ /* Serializes the updates to cpu_online_mask, cpu_present_mask */ static DEFINE_MUTEX(cpu_add_remove_lock); @@ -38694,9 +37928,9 @@ diff -urNp linux-2.6.29.6/kernel/cpu.c linux-2.6.29.6/kernel/cpu.c /* If set, cpu_up and cpu_down will return -EBUSY and do nothing. * Should always be manipulated under cpu_add_remove_lock -diff -urNp linux-2.6.29.6/kernel/cred.c linux-2.6.29.6/kernel/cred.c ---- linux-2.6.29.6/kernel/cred.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/cred.c 2009-07-23 17:34:32.203740622 -0400 +diff -urNp linux-2.6.30.4/kernel/cred.c linux-2.6.30.4/kernel/cred.c +--- linux-2.6.30.4/kernel/cred.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/cred.c 2009-07-30 11:10:49.610408907 -0400 @@ -366,6 +366,8 @@ int commit_creds(struct cred *new) get_cred(new); /* we will require a ref for the subj creds too */ @@ -38706,10 +37940,10 @@ diff -urNp linux-2.6.29.6/kernel/cred.c linux-2.6.29.6/kernel/cred.c /* dumpability changes */ if (old->euid != new->euid || old->egid != new->egid || -diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c ---- linux-2.6.29.6/kernel/exit.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/exit.c 2009-07-23 17:34:32.204997623 -0400 -@@ -59,6 +59,10 @@ DEFINE_TRACE(sched_process_free); +diff -urNp linux-2.6.30.4/kernel/exit.c linux-2.6.30.4/kernel/exit.c +--- linux-2.6.30.4/kernel/exit.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/exit.c 2009-07-30 11:10:49.617311944 -0400 +@@ -60,6 +60,10 @@ DEFINE_TRACE(sched_process_free); DEFINE_TRACE(sched_process_exit); DEFINE_TRACE(sched_process_wait); @@ -38719,8 +37953,8 @@ diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c + static void exit_mm(struct task_struct * tsk); - static inline int task_detached(struct task_struct *p) -@@ -172,6 +176,8 @@ void release_task(struct task_struct * p + static void __unhash_process(struct task_struct *p) +@@ -168,6 +172,8 @@ void release_task(struct task_struct * p struct task_struct *leader; int zap_leader; repeat: @@ -38729,7 +37963,7 @@ diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c tracehook_prepare_release_task(p); /* don't need to get the RCU readlock here - the process is dead and * can't be modifying its own credentials */ -@@ -338,11 +344,22 @@ static void reparent_to_kthreadd(void) +@@ -334,11 +340,22 @@ static void reparent_to_kthreadd(void) { write_lock_irq(&tasklist_lock); @@ -38752,7 +37986,7 @@ diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c /* Set the exit signal to SIGCHLD so we signal init on exit */ current->exit_signal = SIGCHLD; -@@ -435,6 +452,17 @@ void daemonize(const char *name, ...) +@@ -427,6 +444,17 @@ void daemonize(const char *name, ...) vsnprintf(current->comm, sizeof(current->comm), name, args); va_end(args); @@ -38770,7 +38004,7 @@ diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c /* * If we were started as result of loading a module, close all of the * user space pages. We don't need them, and if we didn't close them -@@ -1034,6 +1062,9 @@ NORET_TYPE void do_exit(long code) +@@ -954,6 +982,9 @@ NORET_TYPE void do_exit(long code) tsk->exit_code = code; taskstats_exit(tsk, group_dead); @@ -38780,7 +38014,7 @@ diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c exit_mm(tsk); if (group_dead) -@@ -1238,7 +1269,7 @@ static int wait_task_zombie(struct task_ +@@ -1158,7 +1189,7 @@ static int wait_task_zombie(struct task_ if (unlikely(options & WNOWAIT)) { int exit_code = p->exit_code; @@ -38789,11 +38023,11 @@ diff -urNp linux-2.6.29.6/kernel/exit.c linux-2.6.29.6/kernel/exit.c get_task_struct(p); read_unlock(&tasklist_lock); -diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c ---- linux-2.6.29.6/kernel/fork.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/fork.c 2009-07-23 17:34:32.205707403 -0400 -@@ -239,7 +239,7 @@ static struct task_struct *dup_task_stru - setup_thread_stack(tsk, orig); +diff -urNp linux-2.6.30.4/kernel/fork.c linux-2.6.30.4/kernel/fork.c +--- linux-2.6.30.4/kernel/fork.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/fork.c 2009-07-30 11:10:49.618406568 -0400 +@@ -245,7 +245,7 @@ static struct task_struct *dup_task_stru + *stackend = STACK_END_MAGIC; /* for overflow detection */ #ifdef CONFIG_CC_STACKPROTECTOR - tsk->stack_canary = get_random_int(); @@ -38801,7 +38035,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c #endif /* One for us, one for whoever does the "release_task()" (usually parent) */ -@@ -276,8 +276,8 @@ static int dup_mmap(struct mm_struct *mm +@@ -282,8 +282,8 @@ static int dup_mmap(struct mm_struct *mm mm->locked_vm = 0; mm->mmap = NULL; mm->mmap_cache = NULL; @@ -38810,9 +38044,9 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c + mm->free_area_cache = oldmm->free_area_cache; + mm->cached_hole_size = oldmm->cached_hole_size; mm->map_count = 0; - cpus_clear(mm->cpu_vm_mask); + cpumask_clear(mm_cpumask(mm)); mm->mm_rb = RB_ROOT; -@@ -314,6 +314,7 @@ static int dup_mmap(struct mm_struct *mm +@@ -320,6 +320,7 @@ static int dup_mmap(struct mm_struct *mm tmp->vm_flags &= ~VM_LOCKED; tmp->vm_mm = mm; tmp->vm_next = NULL; @@ -38820,7 +38054,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c anon_vma_link(tmp); file = tmp->vm_file; if (file) { -@@ -361,6 +362,31 @@ static int dup_mmap(struct mm_struct *mm +@@ -367,6 +368,31 @@ static int dup_mmap(struct mm_struct *mm if (retval) goto out; } @@ -38852,7 +38086,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c /* a new mm has just been created */ arch_dup_mmap(oldmm, mm); retval = 0; -@@ -541,9 +567,11 @@ void mm_release(struct task_struct *tsk, +@@ -547,9 +573,11 @@ void mm_release(struct task_struct *tsk, #ifdef CONFIG_FUTEX if (unlikely(tsk->robust_list)) exit_robust_list(tsk); @@ -38864,7 +38098,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c #endif #endif -@@ -565,7 +593,7 @@ void mm_release(struct task_struct *tsk, +@@ -571,7 +599,7 @@ void mm_release(struct task_struct *tsk, if (tsk->clear_child_tid && !(tsk->flags & PF_SIGNALED) && atomic_read(&mm->mm_users) > 1) { @@ -38873,7 +38107,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c tsk->clear_child_tid = NULL; /* -@@ -573,7 +601,7 @@ void mm_release(struct task_struct *tsk, +@@ -579,7 +607,7 @@ void mm_release(struct task_struct *tsk, * not set up a proper pointer then tough luck. */ put_user(0, tidptr); @@ -38882,7 +38116,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c } } -@@ -686,7 +714,7 @@ static int copy_fs(unsigned long clone_f +@@ -695,7 +723,7 @@ static int copy_fs(unsigned long clone_f write_unlock(&fs->lock); return -EAGAIN; } @@ -38891,7 +38125,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c write_unlock(&fs->lock); return 0; } -@@ -978,6 +1006,9 @@ static struct task_struct *copy_process( +@@ -989,6 +1017,9 @@ static struct task_struct *copy_process( DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif retval = -EAGAIN; @@ -38901,7 +38135,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c if (atomic_read(&p->real_cred->user->processes) >= p->signal->rlim[RLIMIT_NPROC].rlim_cur) { if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1138,6 +1169,8 @@ static struct task_struct *copy_process( +@@ -1144,6 +1175,8 @@ static struct task_struct *copy_process( goto bad_fork_free_graph; } @@ -38910,7 +38144,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL; /* * Clear TID on mm_release()? -@@ -1306,6 +1339,8 @@ bad_fork_cleanup_count: +@@ -1310,6 +1343,8 @@ bad_fork_cleanup_count: bad_fork_free: free_task(p); fork_out: @@ -38919,7 +38153,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c return ERR_PTR(retval); } -@@ -1399,6 +1434,8 @@ long do_fork(unsigned long clone_flags, +@@ -1403,6 +1438,8 @@ long do_fork(unsigned long clone_flags, if (clone_flags & CLONE_PARENT_SETTID) put_user(nr, parent_tidptr); @@ -38928,7 +38162,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c if (clone_flags & CLONE_VFORK) { p->vfork_done = &vfork; init_completion(&vfork); -@@ -1530,7 +1567,7 @@ static int unshare_fs(unsigned long unsh +@@ -1535,7 +1572,7 @@ static int unshare_fs(unsigned long unsh return 0; /* don't need lock here; in the worst case we'll do useless copy */ @@ -38937,7 +38171,7 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c return 0; *new_fsp = copy_fs_struct(fs); -@@ -1653,7 +1690,7 @@ SYSCALL_DEFINE1(unshare, unsigned long, +@@ -1658,7 +1695,7 @@ SYSCALL_DEFINE1(unshare, unsigned long, fs = current->fs; write_lock(&fs->lock); current->fs = new_fs; @@ -38946,10 +38180,10 @@ diff -urNp linux-2.6.29.6/kernel/fork.c linux-2.6.29.6/kernel/fork.c new_fs = NULL; else new_fs = fs; -diff -urNp linux-2.6.29.6/kernel/futex.c linux-2.6.29.6/kernel/futex.c ---- linux-2.6.29.6/kernel/futex.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/futex.c 2009-07-23 17:34:32.205707403 -0400 -@@ -213,6 +213,11 @@ get_futex_key(u32 __user *uaddr, int fsh +diff -urNp linux-2.6.30.4/kernel/futex.c linux-2.6.30.4/kernel/futex.c +--- linux-2.6.30.4/kernel/futex.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/futex.c 2009-07-30 09:48:10.127681569 -0400 +@@ -212,6 +212,11 @@ get_futex_key(u32 __user *uaddr, int fsh struct page *page; int err; @@ -38961,7 +38195,7 @@ diff -urNp linux-2.6.29.6/kernel/futex.c linux-2.6.29.6/kernel/futex.c /* * The futex address must be "naturally" aligned. */ -@@ -1306,7 +1311,7 @@ retry: +@@ -1285,7 +1290,7 @@ retry_private: restart = ¤t_thread_info()->restart_block; restart->fn = futex_wait_restart; @@ -38970,7 +38204,7 @@ diff -urNp linux-2.6.29.6/kernel/futex.c linux-2.6.29.6/kernel/futex.c restart->futex.val = val; restart->futex.time = abs_time->tv64; restart->futex.bitset = bitset; -@@ -1848,7 +1853,7 @@ retry: +@@ -1809,7 +1814,7 @@ retry: */ static inline int fetch_robust_entry(struct robust_list __user **entry, struct robust_list __user * __user *head, @@ -38979,22 +38213,9 @@ diff -urNp linux-2.6.29.6/kernel/futex.c linux-2.6.29.6/kernel/futex.c { unsigned long uentry; -diff -urNp linux-2.6.29.6/kernel/irq/handle.c linux-2.6.29.6/kernel/irq/handle.c ---- linux-2.6.29.6/kernel/irq/handle.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/irq/handle.c 2009-07-23 17:34:32.206808804 -0400 -@@ -222,7 +222,8 @@ struct irq_desc irq_desc[NR_IRQS] __cach - .depth = 1, - .lock = __SPIN_LOCK_UNLOCKED(irq_desc->lock), - #ifdef CONFIG_SMP -- .affinity = CPU_MASK_ALL -+ .affinity = CPU_MASK_ALL, -+ .cpu = 0, - #endif - } - }; -diff -urNp linux-2.6.29.6/kernel/kallsyms.c linux-2.6.29.6/kernel/kallsyms.c ---- linux-2.6.29.6/kernel/kallsyms.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/kallsyms.c 2009-07-23 17:34:32.206808804 -0400 +diff -urNp linux-2.6.30.4/kernel/kallsyms.c linux-2.6.30.4/kernel/kallsyms.c +--- linux-2.6.30.4/kernel/kallsyms.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/kallsyms.c 2009-07-30 11:10:49.619428708 -0400 @@ -62,6 +62,18 @@ static inline int is_kernel_text(unsigne static inline int is_kernel(unsigned long addr) @@ -39014,7 +38235,7 @@ diff -urNp linux-2.6.29.6/kernel/kallsyms.c linux-2.6.29.6/kernel/kallsyms.c if (addr >= (unsigned long)_stext && addr <= (unsigned long)_end) return 1; return in_gate_area_no_task(addr); -@@ -372,7 +384,6 @@ static unsigned long get_ksymbol_core(st +@@ -391,7 +403,6 @@ static unsigned long get_ksymbol_core(st static void reset_iter(struct kallsym_iter *iter, loff_t new_pos) { @@ -39022,7 +38243,7 @@ diff -urNp linux-2.6.29.6/kernel/kallsyms.c linux-2.6.29.6/kernel/kallsyms.c iter->nameoff = get_symbol_offset(new_pos); iter->pos = new_pos; } -@@ -456,7 +467,7 @@ static int kallsyms_open(struct inode *i +@@ -475,7 +486,7 @@ static int kallsyms_open(struct inode *i struct kallsym_iter *iter; int ret; @@ -39031,7 +38252,7 @@ diff -urNp linux-2.6.29.6/kernel/kallsyms.c linux-2.6.29.6/kernel/kallsyms.c if (!iter) return -ENOMEM; reset_iter(iter, 0); -@@ -478,7 +489,15 @@ static const struct file_operations kall +@@ -497,7 +508,15 @@ static const struct file_operations kall static int __init kallsyms_init(void) { @@ -39047,22 +38268,10 @@ diff -urNp linux-2.6.29.6/kernel/kallsyms.c linux-2.6.29.6/kernel/kallsyms.c return 0; } __initcall(kallsyms_init); -diff -urNp linux-2.6.29.6/kernel/kmod.c linux-2.6.29.6/kernel/kmod.c ---- linux-2.6.29.6/kernel/kmod.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/kmod.c 2009-07-23 17:34:32.206808804 -0400 -@@ -108,7 +108,7 @@ int request_module(const char *fmt, ...) - return -ENOMEM; - } - -- ret = call_usermodehelper(modprobe_path, argv, envp, 1); -+ ret = call_usermodehelper(modprobe_path, argv, envp, UMH_WAIT_PROC); - atomic_dec(&kmod_concurrent); - return ret; - } -diff -urNp linux-2.6.29.6/kernel/kprobes.c linux-2.6.29.6/kernel/kprobes.c ---- linux-2.6.29.6/kernel/kprobes.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/kprobes.c 2009-07-23 18:40:27.474712638 -0400 -@@ -183,7 +183,7 @@ static kprobe_opcode_t __kprobes *__get_ +diff -urNp linux-2.6.30.4/kernel/kprobes.c linux-2.6.30.4/kernel/kprobes.c +--- linux-2.6.30.4/kernel/kprobes.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/kprobes.c 2009-07-30 09:48:10.128762672 -0400 +@@ -184,7 +184,7 @@ static kprobe_opcode_t __kprobes *__get_ * kernel image and loaded module images reside. This is required * so x86_64 can correctly handle the %rip-relative fixups. */ @@ -39071,7 +38280,7 @@ diff -urNp linux-2.6.29.6/kernel/kprobes.c linux-2.6.29.6/kernel/kprobes.c if (!kip->insns) { kfree(kip); return NULL; -@@ -224,7 +224,7 @@ static int __kprobes collect_one_slot(st +@@ -225,7 +225,7 @@ static int __kprobes collect_one_slot(st hlist_add_head(&kip->hlist, &kprobe_insn_pages); } else { @@ -39080,7 +38289,7 @@ diff -urNp linux-2.6.29.6/kernel/kprobes.c linux-2.6.29.6/kernel/kprobes.c kfree(kip); } return 1; -@@ -1246,7 +1246,7 @@ static int __kprobes show_kprobe_addr(st +@@ -1333,7 +1333,7 @@ static int __kprobes show_kprobe_addr(st return 0; } @@ -39089,7 +38298,7 @@ diff -urNp linux-2.6.29.6/kernel/kprobes.c linux-2.6.29.6/kernel/kprobes.c .start = kprobe_seq_start, .next = kprobe_seq_next, .stop = kprobe_seq_stop, -@@ -1258,7 +1258,7 @@ static int __kprobes kprobes_open(struct +@@ -1345,7 +1345,7 @@ static int __kprobes kprobes_open(struct return seq_open(filp, &kprobes_seq_ops); } @@ -39098,7 +38307,7 @@ diff -urNp linux-2.6.29.6/kernel/kprobes.c linux-2.6.29.6/kernel/kprobes.c .open = kprobes_open, .read = seq_read, .llseek = seq_lseek, -@@ -1371,7 +1371,7 @@ static ssize_t write_enabled_file_bool(s +@@ -1527,7 +1527,7 @@ static ssize_t write_enabled_file_bool(s return count; } @@ -39107,22 +38316,10 @@ diff -urNp linux-2.6.29.6/kernel/kprobes.c linux-2.6.29.6/kernel/kprobes.c .read = read_enabled_file_bool, .write = write_enabled_file_bool, }; -diff -urNp linux-2.6.29.6/kernel/latencytop.c linux-2.6.29.6/kernel/latencytop.c ---- linux-2.6.29.6/kernel/latencytop.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/latencytop.c 2009-07-23 18:40:28.720267146 -0400 -@@ -223,7 +223,7 @@ static int lstats_open(struct inode *ino - return single_open(filp, lstats_show, NULL); - } - --static struct file_operations lstats_fops = { -+static const struct file_operations lstats_fops = { - .open = lstats_open, - .read = seq_read, - .write = lstats_write, -diff -urNp linux-2.6.29.6/kernel/lockdep.c linux-2.6.29.6/kernel/lockdep.c ---- linux-2.6.29.6/kernel/lockdep.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/lockdep.c 2009-07-23 17:34:32.207852017 -0400 -@@ -631,6 +631,10 @@ static int static_obj(void *obj) +diff -urNp linux-2.6.30.4/kernel/lockdep.c linux-2.6.30.4/kernel/lockdep.c +--- linux-2.6.30.4/kernel/lockdep.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/lockdep.c 2009-07-30 09:48:10.130698443 -0400 +@@ -628,6 +628,10 @@ static int static_obj(void *obj) int i; #endif @@ -39133,7 +38330,7 @@ diff -urNp linux-2.6.29.6/kernel/lockdep.c linux-2.6.29.6/kernel/lockdep.c /* * static variable? */ -@@ -642,9 +646,12 @@ static int static_obj(void *obj) +@@ -639,9 +643,12 @@ static int static_obj(void *obj) * percpu var? */ for_each_possible_cpu(i) { @@ -39148,10 +38345,10 @@ diff -urNp linux-2.6.29.6/kernel/lockdep.c linux-2.6.29.6/kernel/lockdep.c if ((addr >= start) && (addr < end)) return 1; -diff -urNp linux-2.6.29.6/kernel/lockdep_proc.c linux-2.6.29.6/kernel/lockdep_proc.c ---- linux-2.6.29.6/kernel/lockdep_proc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/lockdep_proc.c 2009-07-23 18:40:28.720267146 -0400 -@@ -666,7 +666,7 @@ static int ls_show(struct seq_file *m, v +diff -urNp linux-2.6.30.4/kernel/lockdep_proc.c linux-2.6.30.4/kernel/lockdep_proc.c +--- linux-2.6.30.4/kernel/lockdep_proc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/lockdep_proc.c 2009-07-30 09:48:10.130698443 -0400 +@@ -670,7 +670,7 @@ static int ls_show(struct seq_file *m, v return 0; } @@ -39160,9 +38357,9 @@ diff -urNp linux-2.6.29.6/kernel/lockdep_proc.c linux-2.6.29.6/kernel/lockdep_pr .start = ls_start, .next = ls_next, .stop = ls_stop, -diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c ---- linux-2.6.29.6/kernel/module.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/module.c 2009-07-23 17:34:32.207852017 -0400 +diff -urNp linux-2.6.30.4/kernel/module.c linux-2.6.30.4/kernel/module.c +--- linux-2.6.30.4/kernel/module.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/module.c 2009-08-04 17:52:34.401055170 -0400 @@ -46,6 +46,11 @@ #include <linux/rculist.h> #include <asm/uaccess.h> @@ -39175,10 +38372,10 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c #include <linux/license.h> #include <asm/sections.h> #include <linux/tracepoint.h> -@@ -76,7 +81,10 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq +@@ -78,7 +83,10 @@ static DECLARE_WAIT_QUEUE_HEAD(module_wq static BLOCKING_NOTIFIER_HEAD(module_notify_list); - /* Bounds of module allocation, for speeding __module_text_address */ + /* Bounds of module allocation, for speeding __module_address */ -static unsigned long module_addr_min = -1UL, module_addr_max = 0; +static unsigned long module_addr_min_rw = -1UL, module_addr_max_rw = 0; +static unsigned long module_addr_min_rx = -1UL, module_addr_max_rx = 0; @@ -39187,7 +38384,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c int register_module_notifier(struct notifier_block * nb) { -@@ -245,7 +253,7 @@ static bool each_symbol(bool (*fn)(const +@@ -234,7 +242,7 @@ bool each_symbol(bool (*fn)(const struct return true; list_for_each_entry_rcu(mod, &modules, list) { @@ -39196,7 +38393,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c { mod->syms, mod->syms + mod->num_syms, mod->crcs, NOT_GPL_ONLY, false }, { mod->gpl_syms, mod->gpl_syms + mod->num_gpl_syms, -@@ -267,7 +275,7 @@ static bool each_symbol(bool (*fn)(const +@@ -256,7 +264,7 @@ bool each_symbol(bool (*fn)(const struct #endif }; @@ -39205,16 +38402,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c return true; } return false; -@@ -403,6 +411,8 @@ static inline unsigned int block_size(in - return val; - } - -+EXPORT_SYMBOL(__per_cpu_start); -+ - static void *percpu_modalloc(unsigned long size, unsigned long align, - const char *name) - { -@@ -410,7 +420,7 @@ static void *percpu_modalloc(unsigned lo +@@ -430,7 +438,7 @@ static void *percpu_modalloc(unsigned lo unsigned int i; void *ptr; @@ -39223,7 +38411,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c printk(KERN_WARNING "%s: per-cpu alignment %li > %li\n", name, align, PAGE_SIZE); align = PAGE_SIZE; -@@ -492,7 +502,11 @@ static void percpu_modcopy(void *pcpudes +@@ -533,7 +541,11 @@ static void percpu_modcopy(void *pcpudes int cpu; for_each_possible_cpu(cpu) @@ -39234,8 +38422,8 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c +#endif } - static int percpu_modinit(void) -@@ -751,6 +765,9 @@ SYSCALL_DEFINE2(delete_module, const cha + #else /* ... !CONFIG_SMP */ +@@ -777,6 +789,9 @@ SYSCALL_DEFINE2(delete_module, const cha char name[MODULE_NAME_LEN]; int ret, forced = 0; @@ -39245,8 +38433,8 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c if (!capable(CAP_SYS_MODULE)) return -EPERM; -@@ -1458,10 +1475,11 @@ static void free_module(struct module *m - module_unload_free(mod); +@@ -1490,10 +1505,11 @@ static void free_module(struct module *m + destroy_params(mod->kp, mod->num_kp); /* release any pointers to mcount in this module */ - ftrace_release(mod->module_core, mod->core_size); @@ -39259,7 +38447,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c kfree(mod->args); if (mod->percpu) percpu_modfree(mod->percpu); -@@ -1470,10 +1488,12 @@ static void free_module(struct module *m +@@ -1502,10 +1518,12 @@ static void free_module(struct module *m percpu_modfree(mod->refptr); #endif /* Free lock-classes: */ @@ -39274,14 +38462,9 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c } void *__symbol_get(const char *symbol) -@@ -1539,10 +1559,14 @@ static int simplify_symbols(Elf_Shdr *se - struct module *mod) - { - Elf_Sym *sym = (void *)sechdrs[symindex].sh_addr; -- unsigned long secbase; -+ unsigned long secbase, symbol; - unsigned int i, n = sechdrs[symindex].sh_size / sizeof(Elf_Sym); +@@ -1573,6 +1591,10 @@ static int simplify_symbols(Elf_Shdr *se int ret = 0; + const struct kernel_symbol *ksym; +#ifdef CONFIG_PAX_KERNEXEC + unsigned long cr0; @@ -39290,43 +38473,27 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c for (i = 1; i < n; i++) { switch (sym[i].st_shndx) { case SHN_COMMON: -@@ -1561,10 +1585,19 @@ static int simplify_symbols(Elf_Shdr *se - break; - - case SHN_UNDEF: -- sym[i].st_value -- = resolve_symbol(sechdrs, versindex, -+ symbol = resolve_symbol(sechdrs, versindex, - strtab + sym[i].st_name, mod); - +@@ -1595,7 +1617,17 @@ static int simplify_symbols(Elf_Shdr *se + strtab + sym[i].st_name, mod); + /* Ok if resolved. */ + if (ksym) { ++ +#ifdef CONFIG_PAX_KERNEXEC -+ pax_open_kernel(cr0); ++ pax_open_kernel(cr0); +#endif + -+ sym[i].st_value = symbol; + sym[i].st_value = ksym->value; + +#ifdef CONFIG_PAX_KERNEXEC -+ pax_close_kernel(cr0); ++ pax_close_kernel(cr0); +#endif + - /* Ok if resolved. */ - if (!IS_ERR_VALUE(sym[i].st_value)) break; -@@ -1579,11 +1612,27 @@ static int simplify_symbols(Elf_Shdr *se + } - default: - /* Divert to percpu allocation if a percpu var. */ -- if (sym[i].st_shndx == pcpuindex) -+ if (sym[i].st_shndx == pcpuindex) { -+ -+#if defined(CONFIG_X86_32) && defined(CONFIG_SMP) -+ secbase = (unsigned long)mod->percpu - (unsigned long)__per_cpu_start; -+#else +@@ -1614,7 +1646,17 @@ static int simplify_symbols(Elf_Shdr *se secbase = (unsigned long)mod->percpu; -- else -+#endif -+ -+ } else + else secbase = sechdrs[sym[i].st_shndx].sh_addr; + +#ifdef CONFIG_PAX_KERNEXEC @@ -39342,9 +38509,9 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c break; } } -@@ -1645,11 +1694,12 @@ static void layout_sections(struct modul - || strncmp(secstrings + s->sh_name, - ".init", 5) == 0) +@@ -1675,11 +1717,12 @@ static void layout_sections(struct modul + || s->sh_entsize != ~0UL + || strstarts(secstrings + s->sh_name, ".init")) continue; - s->sh_entsize = get_offset(mod, &mod->core_size, s, i); + if ((s->sh_flags & SHF_WRITE) || !(s->sh_flags & SHF_ALLOC)) @@ -39358,9 +38525,9 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c } DEBUGP("Init section allocation order:\n"); -@@ -1663,12 +1713,13 @@ static void layout_sections(struct modul - || strncmp(secstrings + s->sh_name, - ".init", 5) != 0) +@@ -1692,12 +1735,13 @@ static void layout_sections(struct modul + || s->sh_entsize != ~0UL + || !strstarts(secstrings + s->sh_name, ".init")) continue; - s->sh_entsize = (get_offset(mod, &mod->init_size, s, i) - | INIT_OFFSET_MASK); @@ -39376,7 +38543,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c } } -@@ -1808,14 +1859,31 @@ static void add_kallsyms(struct module * +@@ -1836,14 +1880,31 @@ static void add_kallsyms(struct module * { unsigned int i; @@ -39411,8 +38578,8 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c } #else static inline void add_kallsyms(struct module *mod, -@@ -1842,16 +1910,30 @@ static void dynamic_printk_setup(struct - #endif /* CONFIG_DYNAMIC_PRINTK_DEBUG */ +@@ -1864,16 +1925,30 @@ static void dynamic_debug_setup(struct _ + #endif } -static void *module_alloc_update_bounds(unsigned long size) @@ -39447,7 +38614,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c } return ret; } -@@ -1878,6 +1960,10 @@ static noinline struct module *load_modu +@@ -1899,6 +1974,10 @@ static noinline struct module *load_modu unsigned long *mseg; mm_segment_t old_fs; @@ -39458,7 +38625,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c DEBUGP("load_module: umod=%p, len=%lu, uargs=%p\n", umod, len, uargs); if (len < sizeof(*hdr)) -@@ -2034,22 +2120,57 @@ static noinline struct module *load_modu +@@ -2049,22 +2128,57 @@ static noinline struct module *load_modu layout_sections(mod, hdr, sechdrs, secstrings); /* Do the allocs. */ @@ -39480,21 +38647,24 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c + } + memset(ptr, 0, mod->init_size_rw); + mod->module_init_rw = ptr; -+ + +- ptr = module_alloc_update_bounds(mod->init_size); +- if (!ptr && mod->init_size) { + ptr = module_alloc_update_bounds_rx(mod->core_size_rx); + if (!ptr) { -+ err = -ENOMEM; + err = -ENOMEM; +- goto free_core; + goto free_init_rw; -+ } -+ + } +- memset(ptr, 0, mod->init_size); +- mod->module_init = ptr; + +#ifdef CONFIG_PAX_KERNEXEC + pax_open_kernel(cr0); +#endif + + memset(ptr, 0, mod->core_size_rx); - -- ptr = module_alloc_update_bounds(mod->init_size); -- if (!ptr && mod->init_size) { ++ +#ifdef CONFIG_PAX_KERNEXEC + pax_close_kernel(cr0); +#endif @@ -39503,13 +38673,10 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c + + ptr = module_alloc_update_bounds_rx(mod->init_size_rx); + if (!ptr && mod->init_size_rx) { - err = -ENOMEM; -- goto free_core; ++ err = -ENOMEM; + goto free_core_rx; - } -- memset(ptr, 0, mod->init_size); -- mod->module_init = ptr; - ++ } ++ +#ifdef CONFIG_PAX_KERNEXEC + pax_open_kernel(cr0); +#endif @@ -39524,7 +38691,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c /* Transfer each section which specifies SHF_ALLOC */ DEBUGP("final section addresses:\n"); for (i = 0; i < hdr->e_shnum; i++) { -@@ -2058,17 +2179,41 @@ static noinline struct module *load_modu +@@ -2073,17 +2187,41 @@ static noinline struct module *load_modu if (!(sechdrs[i].sh_flags & SHF_ALLOC)) continue; @@ -39546,10 +38713,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c + else + dest = mod->module_core_rx + sechdrs[i].sh_entsize; + } - -- if (sechdrs[i].sh_type != SHT_NOBITS) -- memcpy(dest, (void *)sechdrs[i].sh_addr, -- sechdrs[i].sh_size); ++ + if (sechdrs[i].sh_type != SHT_NOBITS) { + +#ifdef CONFIG_PAX_KERNEXEC @@ -39559,7 +38723,10 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c + pax_close_kernel(cr0); + } else +#endif -+ + +- if (sechdrs[i].sh_type != SHT_NOBITS) +- memcpy(dest, (void *)sechdrs[i].sh_addr, +- sechdrs[i].sh_size); + memcpy(dest, (void *)sechdrs[i].sh_addr, sechdrs[i].sh_size); + } /* Update sh_addr to point to copy in image. */ @@ -39575,7 +38742,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c DEBUGP("\t0x%lx %s\n", sechdrs[i].sh_addr, secstrings + sechdrs[i].sh_name); } /* Module has been moved. */ -@@ -2079,7 +2224,7 @@ static noinline struct module *load_modu +@@ -2094,7 +2232,7 @@ static noinline struct module *load_modu mod->name); if (!mod->refptr) { err = -ENOMEM; @@ -39584,7 +38751,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c } #endif /* Now we've moved module, initialize linked lists, etc. */ -@@ -2176,8 +2321,8 @@ static noinline struct module *load_modu +@@ -2191,8 +2329,8 @@ static noinline struct module *load_modu /* Now do relocations. */ for (i = 1; i < hdr->e_shnum; i++) { @@ -39594,7 +38761,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c /* Not a valid relocation section? */ if (info >= hdr->e_shnum) -@@ -2239,12 +2384,12 @@ static noinline struct module *load_modu +@@ -2255,12 +2393,12 @@ static noinline struct module *load_modu * Do it before processing of module parameters, so the module * can provide parameter accessor functions of its own. */ @@ -39613,7 +38780,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c set_fs(old_fs); -@@ -2285,16 +2430,20 @@ static noinline struct module *load_modu +@@ -2302,16 +2440,20 @@ static noinline struct module *load_modu cleanup: kobject_del(&mod->mkobj.kobj); kobject_put(&mod->mkobj.kobj); @@ -39621,9 +38788,9 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c + ftrace_release(mod->module_core_rx, mod->core_size_rx); free_unload: module_unload_free(mod); + #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) - free_init: + free_init_rx: - #if defined(CONFIG_MODULE_UNLOAD) && defined(CONFIG_SMP) percpu_modfree(mod->refptr); #endif - module_free(mod, mod->module_init); @@ -39639,7 +38806,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c /* mod will be freed with core. Don't access it beyond this line! */ free_percpu: if (percpu) -@@ -2319,6 +2468,9 @@ SYSCALL_DEFINE3(init_module, void __user +@@ -2335,6 +2477,9 @@ SYSCALL_DEFINE3(init_module, void __user struct module *mod; int ret = 0; @@ -39649,7 +38816,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c /* Must have permission */ if (!capable(CAP_SYS_MODULE)) return -EPERM; -@@ -2375,20 +2527,17 @@ SYSCALL_DEFINE3(init_module, void __user +@@ -2394,20 +2539,17 @@ SYSCALL_DEFINE3(init_module, void __user mutex_lock(&module_mutex); /* Drop initial reference. */ module_put(mod); @@ -39676,7 +38843,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c #ifdef CONFIG_KALLSYMS /* * This ignores the intensely annoying "mapping symbols" found -@@ -2409,10 +2558,16 @@ static const char *get_ksymbol(struct mo +@@ -2428,10 +2570,16 @@ static const char *get_ksymbol(struct mo unsigned long nextval; /* At worse, next value is at end of module */ @@ -39696,7 +38863,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c /* Scan for closest preceeding symbol, and next symbol. (ELF starts real symbols at 1). */ -@@ -2639,7 +2794,7 @@ static int m_show(struct seq_file *m, vo +@@ -2677,7 +2825,7 @@ static int m_show(struct seq_file *m, vo char buf[8]; seq_printf(m, "%s %u", @@ -39705,7 +38872,7 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c print_unload_info(m, mod); /* Informative for users. */ -@@ -2648,7 +2803,7 @@ static int m_show(struct seq_file *m, vo +@@ -2686,7 +2834,7 @@ static int m_show(struct seq_file *m, vo mod->state == MODULE_STATE_COMING ? "Loading": "Live"); /* Used by oprofile and other similar tools. */ @@ -39714,29 +38881,50 @@ diff -urNp linux-2.6.29.6/kernel/module.c linux-2.6.29.6/kernel/module.c /* Taints info */ if (mod->taints) -@@ -2741,12 +2896,15 @@ __notrace_funcgraph struct module *__mod +@@ -2781,12 +2929,12 @@ struct module *__module_address(unsigned { struct module *mod; - if (addr < module_addr_min || addr > module_addr_max) -+#ifdef CONFIG_X86_32 -+ addr = ktla_ktva(addr); -+#endif -+ -+ if (addr < module_addr_min_rx || addr > module_addr_max_rx) ++ if ((addr < module_addr_min_rx || addr > module_addr_max_rx) && ++ (addr < module_addr_min_rw || addr > module_addr_max_rw)) return NULL; list_for_each_entry_rcu(mod, &modules, list) -- if (within(addr, mod->module_init, mod->init_text_size) -- || within(addr, mod->module_core, mod->core_text_size)) -+ if (within_module_init_rx(addr, mod) || within_module_core_rx(addr, mod)) +- if (within_module_core(addr, mod) +- || within_module_init(addr, mod)) ++ if (within_module_init(addr, mod) || within_module_core(addr, mod)) return mod; return NULL; } -diff -urNp linux-2.6.29.6/kernel/mutex.c linux-2.6.29.6/kernel/mutex.c ---- linux-2.6.29.6/kernel/mutex.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/mutex.c 2009-07-23 17:34:32.208921522 -0400 -@@ -83,7 +83,7 @@ __mutex_lock_slowpath(atomic_t *lock_cou +@@ -2820,11 +2968,20 @@ bool is_module_text_address(unsigned lon + */ + struct module *__module_text_address(unsigned long addr) + { +- struct module *mod = __module_address(addr); ++ struct module *mod; ++ ++#ifdef CONFIG_X86_32 ++ addr = ktla_ktva(addr); ++#endif ++ ++ if (addr < module_addr_min_rx || addr > module_addr_max_rx) ++ return NULL; ++ ++ mod = __module_address(addr); ++ + if (mod) { + /* Make sure it's within the text section. */ +- if (!within(addr, mod->module_init, mod->init_text_size) +- && !within(addr, mod->module_core, mod->core_text_size)) ++ if (!within_module_init_rx(addr, mod) && !within_module_core_rx(addr, mod)) + mod = NULL; + } + return mod; +diff -urNp linux-2.6.30.4/kernel/mutex.c linux-2.6.30.4/kernel/mutex.c +--- linux-2.6.30.4/kernel/mutex.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/mutex.c 2009-07-30 09:48:10.131672113 -0400 +@@ -89,7 +89,7 @@ __mutex_lock_slowpath(atomic_t *lock_cou * * This function is similar to (but not equivalent to) down(). */ @@ -39745,22 +38933,22 @@ diff -urNp linux-2.6.29.6/kernel/mutex.c linux-2.6.29.6/kernel/mutex.c { might_sleep(); /* -diff -urNp linux-2.6.29.6/kernel/panic.c linux-2.6.29.6/kernel/panic.c ---- linux-2.6.29.6/kernel/panic.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/panic.c 2009-07-23 17:34:32.208921522 -0400 -@@ -361,7 +361,8 @@ EXPORT_SYMBOL(warn_slowpath); +diff -urNp linux-2.6.30.4/kernel/panic.c linux-2.6.30.4/kernel/panic.c +--- linux-2.6.30.4/kernel/panic.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/panic.c 2009-07-30 09:48:10.131672113 -0400 +@@ -390,7 +390,8 @@ EXPORT_SYMBOL(warn_slowpath_null); */ void __stack_chk_fail(void) { -- panic("stack-protector: Kernel stack is corrupted"); +- panic("stack-protector: Kernel stack is corrupted in: %p\n", + dump_stack(); -+ panic("stack-protector: Kernel stack is corrupted in: %pS\n", __builtin_return_address(0)); ++ panic("stack-protector: Kernel stack is corrupted in: %pS\n", + __builtin_return_address(0)); } EXPORT_SYMBOL(__stack_chk_fail); - #endif -diff -urNp linux-2.6.29.6/kernel/pid.c linux-2.6.29.6/kernel/pid.c ---- linux-2.6.29.6/kernel/pid.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/pid.c 2009-07-23 17:34:32.208921522 -0400 +diff -urNp linux-2.6.30.4/kernel/pid.c linux-2.6.30.4/kernel/pid.c +--- linux-2.6.30.4/kernel/pid.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/pid.c 2009-07-30 11:10:49.635626798 -0400 @@ -33,6 +33,7 @@ #include <linux/rculist.h> #include <linux/bootmem.h> @@ -39794,9 +38982,9 @@ diff -urNp linux-2.6.29.6/kernel/pid.c linux-2.6.29.6/kernel/pid.c } EXPORT_SYMBOL(find_task_by_pid_type_ns); -diff -urNp linux-2.6.29.6/kernel/posix-cpu-timers.c linux-2.6.29.6/kernel/posix-cpu-timers.c ---- linux-2.6.29.6/kernel/posix-cpu-timers.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/posix-cpu-timers.c 2009-07-23 17:34:32.209811964 -0400 +diff -urNp linux-2.6.30.4/kernel/posix-cpu-timers.c linux-2.6.30.4/kernel/posix-cpu-timers.c +--- linux-2.6.30.4/kernel/posix-cpu-timers.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/posix-cpu-timers.c 2009-07-30 11:10:49.652340336 -0400 @@ -6,6 +6,7 @@ #include <linux/posix-timers.h> #include <linux/errno.h> @@ -39821,30 +39009,9 @@ diff -urNp linux-2.6.29.6/kernel/posix-cpu-timers.c linux-2.6.29.6/kernel/posix- if (psecs >= sig->rlim[RLIMIT_CPU].rlim_cur) { /* * At the soft limit, send a SIGXCPU every second. -@@ -1419,17 +1422,17 @@ void run_posix_cpu_timers(struct task_st - * timer call will interfere. - */ - list_for_each_entry_safe(timer, next, &firing, it.cpu.entry) { -- int firing; -+ int __firing; - spin_lock(&timer->it_lock); - list_del_init(&timer->it.cpu.entry); -- firing = timer->it.cpu.firing; -+ __firing = timer->it.cpu.firing; - timer->it.cpu.firing = 0; - /* - * The firing flag is -1 if we collided with a reset - * of the timer, which already reported this - * almost-firing as an overrun. So don't generate an event. - */ -- if (likely(firing >= 0)) { -+ if (likely(__firing >= 0)) { - cpu_timer_fire(timer); - } - spin_unlock(&timer->it_lock); -diff -urNp linux-2.6.29.6/kernel/power/poweroff.c linux-2.6.29.6/kernel/power/poweroff.c ---- linux-2.6.29.6/kernel/power/poweroff.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/power/poweroff.c 2009-07-23 17:34:32.209811964 -0400 +diff -urNp linux-2.6.30.4/kernel/power/poweroff.c linux-2.6.30.4/kernel/power/poweroff.c +--- linux-2.6.30.4/kernel/power/poweroff.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/power/poweroff.c 2009-07-30 09:48:10.132674489 -0400 @@ -37,7 +37,7 @@ static struct sysrq_key_op sysrq_powerof .enable_mask = SYSRQ_ENABLE_BOOT, }; @@ -39854,10 +39021,10 @@ diff -urNp linux-2.6.29.6/kernel/power/poweroff.c linux-2.6.29.6/kernel/power/po { register_sysrq_key('o', &sysrq_poweroff_op); return 0; -diff -urNp linux-2.6.29.6/kernel/printk.c linux-2.6.29.6/kernel/printk.c ---- linux-2.6.29.6/kernel/printk.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/printk.c 2009-07-23 17:34:32.209811964 -0400 -@@ -253,6 +253,11 @@ int do_syslog(int type, char __user *buf +diff -urNp linux-2.6.30.4/kernel/printk.c linux-2.6.30.4/kernel/printk.c +--- linux-2.6.30.4/kernel/printk.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/printk.c 2009-07-30 11:10:49.653305213 -0400 +@@ -272,6 +272,11 @@ int do_syslog(int type, char __user *buf char c; int error = 0; @@ -39869,10 +39036,10 @@ diff -urNp linux-2.6.29.6/kernel/printk.c linux-2.6.29.6/kernel/printk.c error = security_syslog(type); if (error) return error; -diff -urNp linux-2.6.29.6/kernel/ptrace.c linux-2.6.29.6/kernel/ptrace.c ---- linux-2.6.29.6/kernel/ptrace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/ptrace.c 2009-07-23 17:34:32.210756226 -0400 -@@ -149,7 +149,7 @@ int __ptrace_may_access(struct task_stru +diff -urNp linux-2.6.30.4/kernel/ptrace.c linux-2.6.30.4/kernel/ptrace.c +--- linux-2.6.30.4/kernel/ptrace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/ptrace.c 2009-07-30 11:10:49.654304318 -0400 +@@ -151,7 +151,7 @@ int __ptrace_may_access(struct task_stru cred->gid != tcred->egid || cred->gid != tcred->sgid || cred->gid != tcred->gid) && @@ -39881,7 +39048,7 @@ diff -urNp linux-2.6.29.6/kernel/ptrace.c linux-2.6.29.6/kernel/ptrace.c rcu_read_unlock(); return -EPERM; } -@@ -157,7 +157,7 @@ int __ptrace_may_access(struct task_stru +@@ -159,7 +159,7 @@ int __ptrace_may_access(struct task_stru smp_rmb(); if (task->mm) dumpable = get_dumpable(task->mm); @@ -39890,7 +39057,7 @@ diff -urNp linux-2.6.29.6/kernel/ptrace.c linux-2.6.29.6/kernel/ptrace.c return -EPERM; return security_ptrace_may_access(task, mode); -@@ -221,7 +221,7 @@ repeat: +@@ -223,7 +223,7 @@ repeat: /* Go */ task->ptrace |= PT_PTRACED; @@ -39899,7 +39066,7 @@ diff -urNp linux-2.6.29.6/kernel/ptrace.c linux-2.6.29.6/kernel/ptrace.c task->ptrace |= PT_PTRACE_CAP; __ptrace_link(task, current); -@@ -612,6 +612,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l +@@ -687,6 +687,11 @@ SYSCALL_DEFINE4(ptrace, long, request, l if (ret < 0) goto out_put_task_struct; @@ -39909,11 +39076,11 @@ diff -urNp linux-2.6.29.6/kernel/ptrace.c linux-2.6.29.6/kernel/ptrace.c + } + ret = arch_ptrace(child, request, addr, data); - if (ret < 0) - goto out_put_task_struct; -diff -urNp linux-2.6.29.6/kernel/rcupreempt_trace.c linux-2.6.29.6/kernel/rcupreempt_trace.c ---- linux-2.6.29.6/kernel/rcupreempt_trace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/rcupreempt_trace.c 2009-07-23 18:40:28.721271955 -0400 + + out_put_task_struct: +diff -urNp linux-2.6.30.4/kernel/rcupreempt_trace.c linux-2.6.30.4/kernel/rcupreempt_trace.c +--- linux-2.6.30.4/kernel/rcupreempt_trace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/rcupreempt_trace.c 2009-07-30 09:48:10.132674489 -0400 @@ -261,17 +261,17 @@ static ssize_t rcuctrs_read(struct file return bcount; } @@ -39935,9 +39102,9 @@ diff -urNp linux-2.6.29.6/kernel/rcupreempt_trace.c linux-2.6.29.6/kernel/rcupre .owner = THIS_MODULE, .read = rcuctrs_read, }; -diff -urNp linux-2.6.29.6/kernel/rcutree_trace.c linux-2.6.29.6/kernel/rcutree_trace.c ---- linux-2.6.29.6/kernel/rcutree_trace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/rcutree_trace.c 2009-07-23 18:40:28.721271955 -0400 +diff -urNp linux-2.6.30.4/kernel/rcutree_trace.c linux-2.6.30.4/kernel/rcutree_trace.c +--- linux-2.6.30.4/kernel/rcutree_trace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/rcutree_trace.c 2009-07-30 09:48:10.132674489 -0400 @@ -88,7 +88,7 @@ static int rcudata_open(struct inode *in return single_open(file, show_rcudata, NULL); } @@ -39947,7 +39114,7 @@ diff -urNp linux-2.6.29.6/kernel/rcutree_trace.c linux-2.6.29.6/kernel/rcutree_t .owner = THIS_MODULE, .open = rcudata_open, .read = seq_read, -@@ -138,7 +138,7 @@ static int rcudata_csv_open(struct inode +@@ -136,7 +136,7 @@ static int rcudata_csv_open(struct inode return single_open(file, show_rcudata_csv, NULL); } @@ -39956,7 +39123,7 @@ diff -urNp linux-2.6.29.6/kernel/rcutree_trace.c linux-2.6.29.6/kernel/rcutree_t .owner = THIS_MODULE, .open = rcudata_csv_open, .read = seq_read, -@@ -185,7 +185,7 @@ static int rcuhier_open(struct inode *in +@@ -183,7 +183,7 @@ static int rcuhier_open(struct inode *in return single_open(file, show_rcuhier, NULL); } @@ -39965,7 +39132,7 @@ diff -urNp linux-2.6.29.6/kernel/rcutree_trace.c linux-2.6.29.6/kernel/rcutree_t .owner = THIS_MODULE, .open = rcuhier_open, .read = seq_read, -@@ -207,7 +207,7 @@ static int rcugp_open(struct inode *inod +@@ -205,7 +205,7 @@ static int rcugp_open(struct inode *inod return single_open(file, show_rcugp, NULL); } @@ -39974,9 +39141,9 @@ diff -urNp linux-2.6.29.6/kernel/rcutree_trace.c linux-2.6.29.6/kernel/rcutree_t .owner = THIS_MODULE, .open = rcugp_open, .read = seq_read, -diff -urNp linux-2.6.29.6/kernel/relay.c linux-2.6.29.6/kernel/relay.c ---- linux-2.6.29.6/kernel/relay.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/relay.c 2009-07-23 18:40:27.474712638 -0400 +diff -urNp linux-2.6.30.4/kernel/relay.c linux-2.6.30.4/kernel/relay.c +--- linux-2.6.30.4/kernel/relay.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/relay.c 2009-07-30 09:48:10.133766067 -0400 @@ -60,7 +60,7 @@ static int relay_buf_fault(struct vm_are /* * vm_ops for relay file mappings. @@ -39995,9 +39162,9 @@ diff -urNp linux-2.6.29.6/kernel/relay.c linux-2.6.29.6/kernel/relay.c return ret; if (read_start + ret == nonpad_end) -diff -urNp linux-2.6.29.6/kernel/resource.c linux-2.6.29.6/kernel/resource.c ---- linux-2.6.29.6/kernel/resource.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/resource.c 2009-07-23 17:34:32.210756226 -0400 +diff -urNp linux-2.6.30.4/kernel/resource.c linux-2.6.30.4/kernel/resource.c +--- linux-2.6.30.4/kernel/resource.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/resource.c 2009-07-30 11:10:49.657454572 -0400 @@ -132,8 +132,18 @@ static const struct file_operations proc static int __init ioresources_init(void) @@ -40017,10 +39184,10 @@ diff -urNp linux-2.6.29.6/kernel/resource.c linux-2.6.29.6/kernel/resource.c return 0; } __initcall(ioresources_init); -diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c ---- linux-2.6.29.6/kernel/sched.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/sched.c 2009-07-23 18:40:27.477441834 -0400 -@@ -801,7 +801,7 @@ static int sched_feat_open(struct inode +diff -urNp linux-2.6.30.4/kernel/sched.c linux-2.6.30.4/kernel/sched.c +--- linux-2.6.30.4/kernel/sched.c 2009-07-30 20:32:40.551917543 -0400 ++++ linux-2.6.30.4/kernel/sched.c 2009-07-30 20:32:48.093586870 -0400 +@@ -819,7 +819,7 @@ static int sched_feat_open(struct inode return single_open(filp, sched_feat_show, NULL); } @@ -40029,7 +39196,7 @@ diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c .open = sched_feat_open, .write = sched_feat_write, .read = seq_read, -@@ -5175,6 +5175,8 @@ int can_nice(const struct task_struct *p +@@ -5663,6 +5663,8 @@ int can_nice(const struct task_struct *p /* convert nice value [19,-20] to rlimit style value [1,40] */ int nice_rlim = 20 - nice; @@ -40038,7 +39205,7 @@ diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c return (nice_rlim <= p->signal->rlim[RLIMIT_NICE].rlim_cur || capable(CAP_SYS_NICE)); } -@@ -5208,7 +5210,8 @@ SYSCALL_DEFINE1(nice, int, increment) +@@ -5696,7 +5698,8 @@ SYSCALL_DEFINE1(nice, int, increment) if (nice > 19) nice = 19; @@ -40048,7 +39215,7 @@ diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c return -EPERM; retval = security_task_setnice(current, nice); -@@ -5350,6 +5353,8 @@ recheck: +@@ -5838,6 +5841,8 @@ recheck: if (rt_policy(policy)) { unsigned long rlim_rtprio; @@ -40057,7 +39224,7 @@ diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c if (!lock_task_sighand(p, &flags)) return -ESRCH; rlim_rtprio = p->signal->rlim[RLIMIT_RTPRIO].rlim_cur; -@@ -6497,7 +6502,7 @@ static struct ctl_table sd_ctl_dir[] = { +@@ -6980,7 +6985,7 @@ static struct ctl_table sd_ctl_dir[] = { .procname = "sched_domain", .mode = 0555, }, @@ -40066,7 +39233,7 @@ diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c }; static struct ctl_table sd_ctl_root[] = { -@@ -6507,7 +6512,7 @@ static struct ctl_table sd_ctl_root[] = +@@ -6990,7 +6995,7 @@ static struct ctl_table sd_ctl_root[] = .mode = 0555, .child = sd_ctl_dir, }, @@ -40075,10 +39242,10 @@ diff -urNp linux-2.6.29.6/kernel/sched.c linux-2.6.29.6/kernel/sched.c }; static struct ctl_table *sd_alloc_ctl_entry(int n) -diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c ---- linux-2.6.29.6/kernel/signal.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/signal.c 2009-07-23 17:34:32.213855277 -0400 -@@ -198,6 +198,9 @@ static struct sigqueue *__sigqueue_alloc +diff -urNp linux-2.6.30.4/kernel/signal.c linux-2.6.30.4/kernel/signal.c +--- linux-2.6.30.4/kernel/signal.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/signal.c 2009-07-30 11:10:49.687338803 -0400 +@@ -209,6 +209,9 @@ static struct sigqueue *__sigqueue_alloc */ user = get_uid(__task_cred(t)->user); atomic_inc(&user->sigpending); @@ -40088,7 +39255,7 @@ diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c if (override_rlimit || atomic_read(&user->sigpending) <= t->signal->rlim[RLIMIT_SIGPENDING].rlim_cur) -@@ -611,6 +614,9 @@ static int check_kill_permission(int sig +@@ -622,6 +625,9 @@ static int check_kill_permission(int sig } } @@ -40098,7 +39265,7 @@ diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c return security_task_kill(t, info, sig, 0); } -@@ -903,8 +909,8 @@ static void print_fatal_signal(struct pt +@@ -931,8 +937,8 @@ static void print_fatal_signal(struct pt for (i = 0; i < 16; i++) { unsigned char insn; @@ -40109,7 +39276,7 @@ diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c } } #endif -@@ -929,7 +935,7 @@ __group_send_sig_info(int sig, struct si +@@ -957,7 +963,7 @@ __group_send_sig_info(int sig, struct si return send_signal(sig, info, p, 1); } @@ -40118,7 +39285,7 @@ diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c specific_send_sig_info(int sig, struct siginfo *info, struct task_struct *t) { return send_signal(sig, info, t, 0); -@@ -969,6 +975,9 @@ force_sig_info(int sig, struct siginfo * +@@ -997,6 +1003,9 @@ force_sig_info(int sig, struct siginfo * ret = specific_send_sig_info(sig, info, t); spin_unlock_irqrestore(&t->sighand->siglock, flags); @@ -40128,7 +39295,7 @@ diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c return ret; } -@@ -1043,6 +1052,8 @@ int group_send_sig_info(int sig, struct +@@ -1071,6 +1080,8 @@ int group_send_sig_info(int sig, struct ret = __group_send_sig_info(sig, info, p); unlock_task_sighand(p, &flags); } @@ -40137,25 +39304,10 @@ diff -urNp linux-2.6.29.6/kernel/signal.c linux-2.6.29.6/kernel/signal.c } return ret; -diff -urNp linux-2.6.29.6/kernel/softirq.c linux-2.6.29.6/kernel/softirq.c ---- linux-2.6.29.6/kernel/softirq.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/softirq.c 2009-07-23 17:34:32.213855277 -0400 -@@ -450,9 +450,9 @@ void tasklet_kill(struct tasklet_struct - printk("Attempt to kill tasklet from interrupt\n"); - - while (test_and_set_bit(TASKLET_STATE_SCHED, &t->state)) { -- do -+ do { - yield(); -- while (test_bit(TASKLET_STATE_SCHED, &t->state)); -+ } while (test_bit(TASKLET_STATE_SCHED, &t->state)); - } - tasklet_unlock_wait(t); - clear_bit(TASKLET_STATE_SCHED, &t->state); -diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c ---- linux-2.6.29.6/kernel/sys.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/sys.c 2009-07-23 17:34:32.214754476 -0400 -@@ -131,6 +131,12 @@ static int set_one_prio(struct task_stru +diff -urNp linux-2.6.30.4/kernel/sys.c linux-2.6.30.4/kernel/sys.c +--- linux-2.6.30.4/kernel/sys.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/sys.c 2009-07-30 11:10:49.695716903 -0400 +@@ -132,6 +132,12 @@ static int set_one_prio(struct task_stru error = -EACCES; goto out; } @@ -40168,15 +39320,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c no_nice = security_task_setnice(p, niceval); if (no_nice) { error = no_nice; -@@ -503,6 +509,7 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g - else - goto error; - } -+ - if (egid != (gid_t) -1) { - if (old->gid == egid || - old->egid == egid || -@@ -513,6 +520,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g +@@ -508,6 +514,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g goto error; } @@ -40186,7 +39330,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (rgid != (gid_t) -1 || (egid != (gid_t) -1 && egid != old->gid)) new->sgid = new->egid; -@@ -546,6 +556,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid) +@@ -541,6 +550,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid) goto error; retval = -EPERM; @@ -40197,7 +39341,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (capable(CAP_SETGID)) new->gid = new->egid = new->sgid = new->fsgid = gid; else if (gid == old->gid || gid == old->sgid) -@@ -636,6 +650,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u +@@ -631,6 +644,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u goto error; } @@ -40207,7 +39351,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (new->uid != old->uid) { retval = set_user(new); if (retval < 0) -@@ -684,6 +701,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid) +@@ -679,6 +695,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid) goto error; retval = -EPERM; @@ -40220,7 +39364,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (capable(CAP_SETUID)) { new->suid = new->uid = uid; if (uid != old->uid) { -@@ -741,6 +764,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, +@@ -736,6 +758,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, goto error; } @@ -40230,7 +39374,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (ruid != (uid_t) -1) { new->uid = ruid; if (ruid != old->uid) { -@@ -809,6 +835,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, +@@ -804,6 +829,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, goto error; } @@ -40240,7 +39384,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (rgid != (gid_t) -1) new->gid = rgid; if (egid != (gid_t) -1) -@@ -858,6 +887,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid) +@@ -853,6 +881,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid) if (security_task_setuid(uid, (uid_t)-1, (uid_t)-1, LSM_SETID_FS) < 0) goto error; @@ -40250,7 +39394,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (uid == old->uid || uid == old->euid || uid == old->suid || uid == old->fsuid || capable(CAP_SETUID)) { -@@ -898,6 +930,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid) +@@ -893,6 +924,9 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid) if (gid == old->gid || gid == old->egid || gid == old->sgid || gid == old->fsgid || capable(CAP_SETGID)) { @@ -40260,19 +39404,7 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c if (gid != old_fsgid) { new->fsgid = gid; goto change_okay; -@@ -974,7 +1009,10 @@ SYSCALL_DEFINE2(setpgid, pid_t, pid, pid - write_lock_irq(&tasklist_lock); - - err = -ESRCH; -- p = find_task_by_vpid(pid); -+ /* grsec: replaced find_task_by_vpid with equivalent call which -+ lacks the chroot restriction -+ */ -+ p = pid_task(find_pid_ns(pid, current->nsproxy->pid_ns), PIDTYPE_PID); - if (!p) - goto out; - -@@ -1732,7 +1770,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi +@@ -1725,7 +1759,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi error = get_dumpable(me->mm); break; case PR_SET_DUMPABLE: @@ -40281,10 +39413,10 @@ diff -urNp linux-2.6.29.6/kernel/sys.c linux-2.6.29.6/kernel/sys.c error = -EINVAL; break; } -diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c ---- linux-2.6.29.6/kernel/sysctl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/sysctl.c 2009-07-23 17:34:32.215815558 -0400 -@@ -61,6 +61,13 @@ +diff -urNp linux-2.6.30.4/kernel/sysctl.c linux-2.6.30.4/kernel/sysctl.c +--- linux-2.6.30.4/kernel/sysctl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/sysctl.c 2009-08-04 17:52:34.402065998 -0400 +@@ -62,6 +62,13 @@ static int deprecated_sysctl_warning(struct __sysctl_args *args); #if defined(CONFIG_SYSCTL) @@ -40298,7 +39430,7 @@ diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c /* External variables not in a header file. */ extern int C_A_D; -@@ -155,6 +162,7 @@ static int proc_do_cad_pid(struct ctl_ta +@@ -159,6 +166,7 @@ static int proc_do_cad_pid(struct ctl_ta static int proc_taint(struct ctl_table *table, int write, struct file *filp, void __user *buffer, size_t *lenp, loff_t *ppos); #endif @@ -40306,7 +39438,7 @@ diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c static struct ctl_table root_table[]; static struct ctl_table_root sysctl_table_root; -@@ -187,6 +195,21 @@ extern struct ctl_table epoll_table[]; +@@ -191,6 +199,21 @@ extern struct ctl_table epoll_table[]; int sysctl_legacy_va_layout; #endif @@ -40328,11 +39460,10 @@ diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c extern int prove_locking; extern int lock_stat; -@@ -897,6 +920,25 @@ static struct ctl_table kern_table[] = { - .proc_handler = &scan_unevictable_handler, - }, +@@ -242,6 +265,24 @@ static int max_wakeup_granularity_ns = N #endif -+ + + static struct ctl_table kern_table[] = { +#if defined(CONFIG_GRKERNSEC_SYSCTL) || defined(CONFIG_GRKERNSEC_MODSTOP) + { + .ctl_name = CTL_UNNUMBERED, @@ -40351,10 +39482,10 @@ diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c + }, +#endif + - /* - * NOTE: do not add new entries to this table unless you have read - * Documentation/sysctl/ctl_unnumbered.txt -@@ -1634,6 +1676,8 @@ static int do_sysctl_strategy(struct ctl + #ifdef CONFIG_SCHED_DEBUG + { + .ctl_name = CTL_UNNUMBERED, +@@ -1657,6 +1698,8 @@ static int do_sysctl_strategy(struct ctl return 0; } @@ -40363,7 +39494,7 @@ diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c static int parse_table(int __user *name, int nlen, void __user *oldval, size_t __user *oldlenp, void __user *newval, size_t newlen, -@@ -1652,7 +1696,7 @@ repeat: +@@ -1675,7 +1718,7 @@ repeat: if (n == table->ctl_name) { int error; if (table->child) { @@ -40372,7 +39503,7 @@ diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c return -EPERM; name++; nlen--; -@@ -1737,6 +1781,33 @@ int sysctl_perm(struct ctl_table_root *r +@@ -1760,6 +1803,33 @@ int sysctl_perm(struct ctl_table_root *r int error; int mode; @@ -40406,9 +39537,9 @@ diff -urNp linux-2.6.29.6/kernel/sysctl.c linux-2.6.29.6/kernel/sysctl.c error = security_sysctl(table, op & (MAY_READ | MAY_WRITE | MAY_EXEC)); if (error) return error; -diff -urNp linux-2.6.29.6/kernel/taskstats.c linux-2.6.29.6/kernel/taskstats.c ---- linux-2.6.29.6/kernel/taskstats.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/taskstats.c 2009-07-23 17:34:32.215815558 -0400 +diff -urNp linux-2.6.30.4/kernel/taskstats.c linux-2.6.30.4/kernel/taskstats.c +--- linux-2.6.30.4/kernel/taskstats.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/taskstats.c 2009-07-30 11:10:49.711410081 -0400 @@ -26,9 +26,12 @@ #include <linux/cgroup.h> #include <linux/fs.h> @@ -40432,9 +39563,9 @@ diff -urNp linux-2.6.29.6/kernel/taskstats.c linux-2.6.29.6/kernel/taskstats.c if (!alloc_cpumask_var(&mask, GFP_KERNEL)) return -ENOMEM; -diff -urNp linux-2.6.29.6/kernel/time/tick-broadcast.c linux-2.6.29.6/kernel/time/tick-broadcast.c ---- linux-2.6.29.6/kernel/time/tick-broadcast.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/time/tick-broadcast.c 2009-07-23 17:34:32.216793372 -0400 +diff -urNp linux-2.6.30.4/kernel/time/tick-broadcast.c linux-2.6.30.4/kernel/time/tick-broadcast.c +--- linux-2.6.30.4/kernel/time/tick-broadcast.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/time/tick-broadcast.c 2009-07-30 09:48:10.137714626 -0400 @@ -116,7 +116,7 @@ int tick_device_uses_broadcast(struct cl * then clear the broadcast bit. */ @@ -40444,9 +39575,9 @@ diff -urNp linux-2.6.29.6/kernel/time/tick-broadcast.c linux-2.6.29.6/kernel/tim cpumask_clear_cpu(cpu, tick_get_broadcast_mask()); tick_broadcast_clear_oneshot(cpu); -diff -urNp linux-2.6.29.6/kernel/time/timer_list.c linux-2.6.29.6/kernel/time/timer_list.c ---- linux-2.6.29.6/kernel/time/timer_list.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/time/timer_list.c 2009-07-23 18:40:28.721271955 -0400 +diff -urNp linux-2.6.30.4/kernel/time/timer_list.c linux-2.6.30.4/kernel/time/timer_list.c +--- linux-2.6.30.4/kernel/time/timer_list.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/time/timer_list.c 2009-07-30 09:48:10.137714626 -0400 @@ -275,7 +275,7 @@ static int timer_list_open(struct inode return single_open(filp, timer_list_show, NULL); } @@ -40456,9 +39587,9 @@ diff -urNp linux-2.6.29.6/kernel/time/timer_list.c linux-2.6.29.6/kernel/time/ti .open = timer_list_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/kernel/time/timer_stats.c linux-2.6.29.6/kernel/time/timer_stats.c ---- linux-2.6.29.6/kernel/time/timer_stats.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/time/timer_stats.c 2009-07-23 18:40:28.722279043 -0400 +diff -urNp linux-2.6.30.4/kernel/time/timer_stats.c linux-2.6.30.4/kernel/time/timer_stats.c +--- linux-2.6.30.4/kernel/time/timer_stats.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/time/timer_stats.c 2009-07-30 09:48:10.138707979 -0400 @@ -395,7 +395,7 @@ static int tstats_open(struct inode *ino return single_open(filp, tstats_show, NULL); } @@ -40468,9 +39599,9 @@ diff -urNp linux-2.6.29.6/kernel/time/timer_stats.c linux-2.6.29.6/kernel/time/t .open = tstats_open, .read = seq_read, .write = tstats_write, -diff -urNp linux-2.6.29.6/kernel/time.c linux-2.6.29.6/kernel/time.c ---- linux-2.6.29.6/kernel/time.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/time.c 2009-07-23 17:34:32.216793372 -0400 +diff -urNp linux-2.6.30.4/kernel/time.c linux-2.6.30.4/kernel/time.c +--- linux-2.6.30.4/kernel/time.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/time.c 2009-07-30 11:10:49.712371224 -0400 @@ -94,6 +94,9 @@ SYSCALL_DEFINE1(stime, time_t __user *, return err; @@ -40508,10 +39639,10 @@ diff -urNp linux-2.6.29.6/kernel/time.c linux-2.6.29.6/kernel/time.c { #if HZ <= USEC_PER_SEC && !(USEC_PER_SEC % HZ) return (USEC_PER_SEC / HZ) * j; -diff -urNp linux-2.6.29.6/kernel/trace/ftrace.c linux-2.6.29.6/kernel/trace/ftrace.c ---- linux-2.6.29.6/kernel/trace/ftrace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/trace/ftrace.c 2009-07-23 18:40:28.722279043 -0400 -@@ -873,7 +873,7 @@ static int t_show(struct seq_file *m, vo +diff -urNp linux-2.6.30.4/kernel/trace/ftrace.c linux-2.6.30.4/kernel/trace/ftrace.c +--- linux-2.6.30.4/kernel/trace/ftrace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/trace/ftrace.c 2009-07-30 09:48:10.139681175 -0400 +@@ -1001,7 +1001,7 @@ static int t_show(struct seq_file *m, vo return 0; } @@ -40520,41 +39651,7 @@ diff -urNp linux-2.6.29.6/kernel/trace/ftrace.c linux-2.6.29.6/kernel/trace/ftra .start = t_start, .next = t_next, .stop = t_stop, -@@ -1303,21 +1303,21 @@ ftrace_notrace_release(struct inode *ino - return ftrace_regex_release(inode, file, 0); - } - --static struct file_operations ftrace_avail_fops = { -+static const struct file_operations ftrace_avail_fops = { - .open = ftrace_avail_open, - .read = seq_read, - .llseek = seq_lseek, - .release = ftrace_avail_release, - }; - --static struct file_operations ftrace_failures_fops = { -+static const struct file_operations ftrace_failures_fops = { - .open = ftrace_failures_open, - .read = seq_read, - .llseek = seq_lseek, - .release = ftrace_avail_release, - }; - --static struct file_operations ftrace_filter_fops = { -+static const struct file_operations ftrace_filter_fops = { - .open = ftrace_filter_open, - .read = ftrace_regex_read, - .write = ftrace_filter_write, -@@ -1325,7 +1325,7 @@ static struct file_operations ftrace_fil - .release = ftrace_filter_release, - }; - --static struct file_operations ftrace_notrace_fops = { -+static const struct file_operations ftrace_notrace_fops = { - .open = ftrace_notrace_open, - .read = ftrace_regex_read, - .write = ftrace_notrace_write, -@@ -1385,7 +1385,7 @@ static int g_show(struct seq_file *m, vo +@@ -1956,7 +1956,7 @@ static int g_show(struct seq_file *m, vo return 0; } @@ -40563,71 +39660,29 @@ diff -urNp linux-2.6.29.6/kernel/trace/ftrace.c linux-2.6.29.6/kernel/trace/ftra .start = g_start, .next = g_next, .stop = g_stop, -@@ -1840,7 +1840,7 @@ ftrace_pid_write(struct file *filp, cons - return cnt; - } - --static struct file_operations ftrace_pid_fops = { -+static const struct file_operations ftrace_pid_fops = { - .read = ftrace_pid_read, - .write = ftrace_pid_write, - }; -diff -urNp linux-2.6.29.6/kernel/trace/Kconfig linux-2.6.29.6/kernel/trace/Kconfig ---- linux-2.6.29.6/kernel/trace/Kconfig 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/trace/Kconfig 2009-07-23 18:43:34.850823161 -0400 -@@ -51,6 +51,7 @@ config FUNCTION_TRACER +diff -urNp linux-2.6.30.4/kernel/trace/Kconfig linux-2.6.30.4/kernel/trace/Kconfig +--- linux-2.6.30.4/kernel/trace/Kconfig 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/trace/Kconfig 2009-07-30 11:13:44.980492661 -0400 +@@ -78,6 +78,7 @@ menu "Tracers" + config FUNCTION_TRACER bool "Kernel Function Tracer" depends on HAVE_FUNCTION_TRACER - depends on DEBUG_KERNEL + depends on !PAX_KERNEXEC select FRAME_POINTER select KALLSYMS select TRACING -@@ -237,6 +238,7 @@ config STACK_TRACER +@@ -271,6 +272,7 @@ config POWER_TRACER + config STACK_TRACER bool "Trace max stack" depends on HAVE_FUNCTION_TRACER - depends on DEBUG_KERNEL + depends on !PAX_KERNEXEC select FUNCTION_TRACER select STACKTRACE select KALLSYMS -diff -urNp linux-2.6.29.6/kernel/trace/ring_buffer.c linux-2.6.29.6/kernel/trace/ring_buffer.c ---- linux-2.6.29.6/kernel/trace/ring_buffer.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/trace/ring_buffer.c 2009-07-23 18:40:28.723274997 -0400 -@@ -2509,7 +2509,7 @@ rb_simple_write(struct file *filp, const - return cnt; - } - --static struct file_operations rb_simple_fops = { -+static const struct file_operations rb_simple_fops = { - .open = tracing_open_generic, - .read = rb_simple_read, - .write = rb_simple_write, -diff -urNp linux-2.6.29.6/kernel/trace/trace_branch.c linux-2.6.29.6/kernel/trace/trace_branch.c ---- linux-2.6.29.6/kernel/trace/trace_branch.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/trace/trace_branch.c 2009-07-23 18:40:28.724260937 -0400 -@@ -267,7 +267,7 @@ static int t_show(struct seq_file *m, vo - return 0; - } - --static struct seq_operations tracing_likely_seq_ops = { -+static const struct seq_operations tracing_likely_seq_ops = { - .start = t_start, - .next = t_next, - .stop = t_stop, -diff -urNp linux-2.6.29.6/kernel/trace/trace.c linux-2.6.29.6/kernel/trace/trace.c ---- linux-2.6.29.6/kernel/trace/trace.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/trace/trace.c 2009-07-23 18:40:27.478286190 -0400 -@@ -442,7 +442,7 @@ trace_seq_path(struct trace_seq *s, stru - return 0; - p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); - if (!IS_ERR(p)) { -- p = mangle_path(s->buffer + s->len, p, "\n"); -+ p = mangle_path(s->buffer + s->len, p, "\n\\"); - if (p) { - s->len = p - s->buffer; - return 1; -@@ -2418,7 +2418,7 @@ static int s_show(struct seq_file *m, vo +diff -urNp linux-2.6.30.4/kernel/trace/trace.c linux-2.6.30.4/kernel/trace/trace.c +--- linux-2.6.30.4/kernel/trace/trace.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/trace/trace.c 2009-07-30 09:48:10.139681175 -0400 +@@ -1836,7 +1836,7 @@ static int s_show(struct seq_file *m, vo return 0; } @@ -40636,7 +39691,7 @@ diff -urNp linux-2.6.29.6/kernel/trace/trace.c linux-2.6.29.6/kernel/trace/trace .start = s_start, .next = s_next, .stop = s_stop, -@@ -2600,7 +2600,7 @@ static int t_show(struct seq_file *m, vo +@@ -2050,7 +2050,7 @@ static int t_show(struct seq_file *m, vo return 0; } @@ -40645,127 +39700,21 @@ diff -urNp linux-2.6.29.6/kernel/trace/trace.c linux-2.6.29.6/kernel/trace/trace .start = t_start, .next = t_next, .stop = t_stop, -@@ -2623,21 +2623,21 @@ static int show_traces_open(struct inode - return ret; - } - --static struct file_operations tracing_fops = { -+static const struct file_operations tracing_fops = { - .open = tracing_open, - .read = seq_read, - .llseek = seq_lseek, - .release = tracing_release, - }; - --static struct file_operations tracing_lt_fops = { -+static const struct file_operations tracing_lt_fops = { - .open = tracing_lt_open, - .read = seq_read, - .llseek = seq_lseek, - .release = tracing_release, - }; - --static struct file_operations show_traces_fops = { -+static const struct file_operations show_traces_fops = { - .open = show_traces_open, - .read = seq_read, - .release = seq_release, -@@ -2730,7 +2730,7 @@ err_unlock: - return err; - } - --static struct file_operations tracing_cpumask_fops = { -+static const struct file_operations tracing_cpumask_fops = { - .open = tracing_open_generic, - .read = tracing_cpumask_read, - .write = tracing_cpumask_write, -@@ -2875,7 +2875,7 @@ tracing_trace_options_write(struct file - return cnt; - } - --static struct file_operations tracing_iter_fops = { -+static const struct file_operations tracing_iter_fops = { - .open = tracing_open_generic, - .read = tracing_trace_options_read, - .write = tracing_trace_options_write, -@@ -2908,7 +2908,7 @@ tracing_readme_read(struct file *filp, c - readme_msg, strlen(readme_msg)); - } - --static struct file_operations tracing_readme_fops = { -+static const struct file_operations tracing_readme_fops = { - .open = tracing_open_generic, - .read = tracing_readme_read, - }; -@@ -3433,38 +3433,38 @@ tracing_mark_write(struct file *filp, co - return cnt; - } - --static struct file_operations tracing_max_lat_fops = { -+static const struct file_operations tracing_max_lat_fops = { - .open = tracing_open_generic, - .read = tracing_max_lat_read, - .write = tracing_max_lat_write, - }; - --static struct file_operations tracing_ctrl_fops = { -+static const struct file_operations tracing_ctrl_fops = { - .open = tracing_open_generic, - .read = tracing_ctrl_read, - .write = tracing_ctrl_write, - }; - --static struct file_operations set_tracer_fops = { -+static const struct file_operations set_tracer_fops = { - .open = tracing_open_generic, - .read = tracing_set_trace_read, - .write = tracing_set_trace_write, - }; - --static struct file_operations tracing_pipe_fops = { -+static const struct file_operations tracing_pipe_fops = { - .open = tracing_open_pipe, - .poll = tracing_poll_pipe, - .read = tracing_read_pipe, - .release = tracing_release_pipe, - }; - --static struct file_operations tracing_entries_fops = { -+static const struct file_operations tracing_entries_fops = { - .open = tracing_open_generic, - .read = tracing_entries_read, - .write = tracing_entries_write, - }; - --static struct file_operations tracing_mark_fops = { -+static const struct file_operations tracing_mark_fops = { - .open = tracing_open_generic, - .write = tracing_mark_write, - }; -@@ -3500,7 +3500,7 @@ tracing_read_dyn_info(struct file *filp, - return r; - } - --static struct file_operations tracing_dyn_info_fops = { -+static const struct file_operations tracing_dyn_info_fops = { - .open = tracing_open_generic, - .read = tracing_read_dyn_info, - }; -diff -urNp linux-2.6.29.6/kernel/trace/trace_sysprof.c linux-2.6.29.6/kernel/trace/trace_sysprof.c ---- linux-2.6.29.6/kernel/trace/trace_sysprof.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/trace/trace_sysprof.c 2009-07-23 18:40:28.724260937 -0400 -@@ -317,7 +317,7 @@ sysprof_sample_write(struct file *filp, - return cnt; - } - --static struct file_operations sysprof_sample_fops = { -+static const struct file_operations sysprof_sample_fops = { - .read = sysprof_sample_read, - .write = sysprof_sample_write, - }; -diff -urNp linux-2.6.29.6/kernel/utsname_sysctl.c linux-2.6.29.6/kernel/utsname_sysctl.c ---- linux-2.6.29.6/kernel/utsname_sysctl.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/kernel/utsname_sysctl.c 2009-07-23 17:34:32.217711177 -0400 +diff -urNp linux-2.6.30.4/kernel/trace/trace_output.c linux-2.6.30.4/kernel/trace/trace_output.c +--- linux-2.6.30.4/kernel/trace/trace_output.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/trace/trace_output.c 2009-07-30 09:48:10.140750846 -0400 +@@ -188,7 +188,7 @@ int trace_seq_path(struct trace_seq *s, + return 0; + p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len); + if (!IS_ERR(p)) { +- p = mangle_path(s->buffer + s->len, p, "\n"); ++ p = mangle_path(s->buffer + s->len, p, "\n\\"); + if (p) { + s->len = p - s->buffer; + return 1; +diff -urNp linux-2.6.30.4/kernel/utsname_sysctl.c linux-2.6.30.4/kernel/utsname_sysctl.c +--- linux-2.6.30.4/kernel/utsname_sysctl.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/kernel/utsname_sysctl.c 2009-07-30 09:48:10.140750846 -0400 @@ -123,7 +123,7 @@ static struct ctl_table uts_kern_table[] .proc_handler = proc_do_uts_string, .strategy = sysctl_uts_string, @@ -40784,22 +39733,10 @@ diff -urNp linux-2.6.29.6/kernel/utsname_sysctl.c linux-2.6.29.6/kernel/utsname_ }; static int __init utsname_sysctl_init(void) -diff -urNp linux-2.6.29.6/lib/dynamic_printk.c linux-2.6.29.6/lib/dynamic_printk.c ---- linux-2.6.29.6/lib/dynamic_printk.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/lib/dynamic_printk.c 2009-07-23 18:40:28.724260937 -0400 -@@ -352,7 +352,7 @@ static int pr_debug_seq_show(struct seq_ - return 0; - } - --static struct seq_operations pr_debug_seq_ops = { -+static const struct seq_operations pr_debug_seq_ops = { - .start = pr_debug_seq_start, - .next = pr_debug_seq_next, - .stop = pr_debug_seq_stop, -diff -urNp linux-2.6.29.6/lib/Kconfig.debug linux-2.6.29.6/lib/Kconfig.debug ---- linux-2.6.29.6/lib/Kconfig.debug 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/lib/Kconfig.debug 2009-07-23 17:34:32.218743017 -0400 -@@ -783,7 +783,7 @@ config LATENCYTOP +diff -urNp linux-2.6.30.4/lib/Kconfig.debug linux-2.6.30.4/lib/Kconfig.debug +--- linux-2.6.30.4/lib/Kconfig.debug 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/lib/Kconfig.debug 2009-07-30 11:10:49.747708160 -0400 +@@ -821,7 +821,7 @@ config LATENCYTOP select STACKTRACE select SCHEDSTATS select SCHED_DEBUG @@ -40808,9 +39745,9 @@ diff -urNp linux-2.6.29.6/lib/Kconfig.debug linux-2.6.29.6/lib/Kconfig.debug help Enable this option if you want to use the LatencyTOP tool to find out which userspace is blocking on what kernel operations. -diff -urNp linux-2.6.29.6/lib/parser.c linux-2.6.29.6/lib/parser.c ---- linux-2.6.29.6/lib/parser.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/lib/parser.c 2009-07-23 17:34:32.218743017 -0400 +diff -urNp linux-2.6.30.4/lib/parser.c linux-2.6.30.4/lib/parser.c +--- linux-2.6.30.4/lib/parser.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/lib/parser.c 2009-07-30 09:48:10.140750846 -0400 @@ -126,7 +126,7 @@ static int match_number(substring_t *s, char *buf; int ret; @@ -40820,9 +39757,9 @@ diff -urNp linux-2.6.29.6/lib/parser.c linux-2.6.29.6/lib/parser.c if (!buf) return -ENOMEM; memcpy(buf, s->from, s->to - s->from); -diff -urNp linux-2.6.29.6/lib/radix-tree.c linux-2.6.29.6/lib/radix-tree.c ---- linux-2.6.29.6/lib/radix-tree.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/lib/radix-tree.c 2009-07-23 17:34:32.218743017 -0400 +diff -urNp linux-2.6.30.4/lib/radix-tree.c linux-2.6.30.4/lib/radix-tree.c +--- linux-2.6.30.4/lib/radix-tree.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/lib/radix-tree.c 2009-07-30 09:48:10.140750846 -0400 @@ -81,7 +81,7 @@ struct radix_tree_preload { int nr; struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH]; @@ -40832,9 +39769,9 @@ diff -urNp linux-2.6.29.6/lib/radix-tree.c linux-2.6.29.6/lib/radix-tree.c static inline gfp_t root_gfp_mask(struct radix_tree_root *root) { -diff -urNp linux-2.6.29.6/lib/random32.c linux-2.6.29.6/lib/random32.c ---- linux-2.6.29.6/lib/random32.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/lib/random32.c 2009-07-23 17:34:32.219722211 -0400 +diff -urNp linux-2.6.30.4/lib/random32.c linux-2.6.30.4/lib/random32.c +--- linux-2.6.30.4/lib/random32.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/lib/random32.c 2009-07-30 09:48:10.141806319 -0400 @@ -61,7 +61,7 @@ static u32 __random32(struct rnd_state * */ static inline u32 __seed(u32 x, u32 m) @@ -40844,33 +39781,26 @@ diff -urNp linux-2.6.29.6/lib/random32.c linux-2.6.29.6/lib/random32.c } /** -diff -urNp linux-2.6.29.6/localversion-grsec linux-2.6.29.6/localversion-grsec ---- linux-2.6.29.6/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 -+++ linux-2.6.29.6/localversion-grsec 2009-07-23 17:34:32.219722211 -0400 +diff -urNp linux-2.6.30.4/localversion-grsec linux-2.6.30.4/localversion-grsec +--- linux-2.6.30.4/localversion-grsec 1969-12-31 19:00:00.000000000 -0500 ++++ linux-2.6.30.4/localversion-grsec 2009-07-30 11:10:49.747708160 -0400 @@ -0,0 +1 @@ +-grsec -diff -urNp linux-2.6.29.6/Makefile linux-2.6.29.6/Makefile ---- linux-2.6.29.6/Makefile 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/Makefile 2009-07-23 17:34:37.457730203 -0400 -@@ -226,7 +226,7 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" +diff -urNp linux-2.6.30.4/Makefile linux-2.6.30.4/Makefile +--- linux-2.6.30.4/Makefile 2009-07-30 20:32:40.332701013 -0400 ++++ linux-2.6.30.4/Makefile 2009-07-30 20:32:47.921679729 -0400 +@@ -231,8 +231,8 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" HOSTCC = gcc HOSTCXX = g++ -HOSTCFLAGS = -Wall -Wstrict-prototypes -O2 -fomit-frame-pointer +-HOSTCXXFLAGS = -O2 +HOSTCFLAGS = -Wall -W -Wno-unused -Wno-sign-compare -Wstrict-prototypes -O2 -fomit-frame-pointer -fno-delete-null-pointer-checks - HOSTCXXFLAGS = -O2 ++HOSTCXXFLAGS = -O2 -fno-delete-null-pointer-checks # Decide whether to build built-in, modular, or both. -@@ -567,7 +567,7 @@ KBUILD_CFLAGS += $(call cc-option,-Wdecl - KBUILD_CFLAGS += $(call cc-option,-Wno-pointer-sign,) - - # disable invalid "can't wrap" optimzations for signed / pointers --KBUILD_CFLAGS += $(call cc-option,-fwrapv) -+KBUILD_CFLAGS += $(call cc-option,-fno-strict-overflow) - - # revert to pre-gcc-4.4 behaviour of .eh_frame - KBUILD_CFLAGS += $(call cc-option,-fno-dwarf2-cfi-asm) -@@ -636,7 +636,7 @@ export mod_strip_cmd + # Normally, just do built-in. +@@ -647,7 +647,7 @@ export mod_strip_cmd ifeq ($(KBUILD_EXTMOD),) @@ -40879,10 +39809,10 @@ diff -urNp linux-2.6.29.6/Makefile linux-2.6.29.6/Makefile vmlinux-dirs := $(patsubst %/,%,$(filter %/, $(init-y) $(init-m) \ $(core-y) $(core-m) $(drivers-y) $(drivers-m) \ -diff -urNp linux-2.6.29.6/mm/filemap.c linux-2.6.29.6/mm/filemap.c ---- linux-2.6.29.6/mm/filemap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/filemap.c 2009-07-23 18:40:27.479596094 -0400 -@@ -1604,7 +1604,7 @@ page_not_uptodate: +diff -urNp linux-2.6.30.4/mm/filemap.c linux-2.6.30.4/mm/filemap.c +--- linux-2.6.30.4/mm/filemap.c 2009-07-30 20:32:40.553577478 -0400 ++++ linux-2.6.30.4/mm/filemap.c 2009-07-30 20:32:48.096612667 -0400 +@@ -1625,7 +1625,7 @@ page_not_uptodate: } EXPORT_SYMBOL(filemap_fault); @@ -40891,7 +39821,7 @@ diff -urNp linux-2.6.29.6/mm/filemap.c linux-2.6.29.6/mm/filemap.c .fault = filemap_fault, }; -@@ -1615,7 +1615,7 @@ int generic_file_mmap(struct file * file +@@ -1636,7 +1636,7 @@ int generic_file_mmap(struct file * file struct address_space *mapping = file->f_mapping; if (!mapping->a_ops->readpage) @@ -40900,7 +39830,7 @@ diff -urNp linux-2.6.29.6/mm/filemap.c linux-2.6.29.6/mm/filemap.c file_accessed(file); vma->vm_ops = &generic_file_vm_ops; vma->vm_flags |= VM_CAN_NONLINEAR; -@@ -1976,6 +1976,7 @@ inline int generic_write_checks(struct f +@@ -1996,6 +1996,7 @@ inline int generic_write_checks(struct f *pos = i_size_read(inode); if (limit != RLIM_INFINITY) { @@ -40908,9 +39838,9 @@ diff -urNp linux-2.6.29.6/mm/filemap.c linux-2.6.29.6/mm/filemap.c if (*pos >= limit) { send_sig(SIGXFSZ, current, 0); return -EFBIG; -diff -urNp linux-2.6.29.6/mm/filemap_xip.c linux-2.6.29.6/mm/filemap_xip.c ---- linux-2.6.29.6/mm/filemap_xip.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/filemap_xip.c 2009-07-23 18:40:28.737571137 -0400 +diff -urNp linux-2.6.30.4/mm/filemap_xip.c linux-2.6.30.4/mm/filemap_xip.c +--- linux-2.6.30.4/mm/filemap_xip.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/filemap_xip.c 2009-07-30 09:48:10.142775471 -0400 @@ -296,7 +296,7 @@ out: } } @@ -40920,9 +39850,9 @@ diff -urNp linux-2.6.29.6/mm/filemap_xip.c linux-2.6.29.6/mm/filemap_xip.c .fault = xip_file_fault, }; -diff -urNp linux-2.6.29.6/mm/fremap.c linux-2.6.29.6/mm/fremap.c ---- linux-2.6.29.6/mm/fremap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/fremap.c 2009-07-23 17:34:32.221026931 -0400 +diff -urNp linux-2.6.30.4/mm/fremap.c linux-2.6.30.4/mm/fremap.c +--- linux-2.6.30.4/mm/fremap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/fremap.c 2009-07-30 09:48:10.142775471 -0400 @@ -153,6 +153,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign retry: vma = find_vma(mm, start); @@ -40935,9 +39865,66 @@ diff -urNp linux-2.6.29.6/mm/fremap.c linux-2.6.29.6/mm/fremap.c /* * Make sure the vma is shared, that it supports prefaulting, * and that the remapped range is valid and fully within -diff -urNp linux-2.6.29.6/mm/hugetlb.c linux-2.6.29.6/mm/hugetlb.c ---- linux-2.6.29.6/mm/hugetlb.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/hugetlb.c 2009-07-23 18:40:27.480266950 -0400 +diff -urNp linux-2.6.30.4/mm/highmem.c linux-2.6.30.4/mm/highmem.c +--- linux-2.6.30.4/mm/highmem.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/highmem.c 2009-08-02 11:24:41.617453261 -0400 +@@ -95,6 +95,9 @@ static void flush_all_zero_pkmaps(void) + + for (i = 0; i < LAST_PKMAP; i++) { + struct page *page; ++#ifdef CONFIG_PAX_KERNEXEC ++ unsigned long cr0; ++#endif + + /* + * zero means we don't have anything to do, +@@ -117,9 +120,18 @@ static void flush_all_zero_pkmaps(void) + * So no dangers, even with speculative execution. + */ + page = pte_page(pkmap_page_table[i]); ++ ++#ifdef CONFIG_PAX_KERNEXEC ++ pax_open_kernel(cr0); ++#endif ++ + pte_clear(&init_mm, (unsigned long)page_address(page), + &pkmap_page_table[i]); + ++#ifdef CONFIG_PAX_KERNEXEC ++ pax_close_kernel(cr0); ++#endif ++ + set_page_address(page, NULL); + need_flush = 1; + } +@@ -141,6 +153,9 @@ static inline unsigned long map_new_virt + { + unsigned long vaddr; + int count; ++#ifdef CONFIG_PAX_KERNEXEC ++ unsigned long cr0; ++#endif + + start: + count = LAST_PKMAP; +@@ -178,8 +193,14 @@ start: + } + } + vaddr = PKMAP_ADDR(last_pkmap_nr); ++#ifdef CONFIG_PAX_KERNEXEC ++ pax_open_kernel(cr0); ++#endif + set_pte_at(&init_mm, vaddr, + &(pkmap_page_table[last_pkmap_nr]), mk_pte(page, kmap_prot)); ++#ifdef CONFIG_PAX_KERNEXEC ++ pax_close_kernel(cr0); ++#endif + + pkmap_count[last_pkmap_nr] = 1; + set_page_address(page, (void *)vaddr); +diff -urNp linux-2.6.30.4/mm/hugetlb.c linux-2.6.30.4/mm/hugetlb.c +--- linux-2.6.30.4/mm/hugetlb.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/hugetlb.c 2009-07-30 09:48:10.143720396 -0400 @@ -1661,7 +1661,7 @@ static int hugetlb_vm_op_fault(struct vm return 0; } @@ -41026,9 +40013,9 @@ diff -urNp linux-2.6.29.6/mm/hugetlb.c linux-2.6.29.6/mm/hugetlb.c ptep = huge_pte_alloc(mm, address, huge_page_size(h)); if (!ptep) return VM_FAULT_OOM; -diff -urNp linux-2.6.29.6/mm/madvise.c linux-2.6.29.6/mm/madvise.c ---- linux-2.6.29.6/mm/madvise.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/madvise.c 2009-07-23 17:34:32.221732895 -0400 +diff -urNp linux-2.6.30.4/mm/madvise.c linux-2.6.30.4/mm/madvise.c +--- linux-2.6.30.4/mm/madvise.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/madvise.c 2009-07-30 09:48:10.143720396 -0400 @@ -43,6 +43,10 @@ static long madvise_behavior(struct vm_a pgoff_t pgoff; int new_flags = vma->vm_flags; @@ -41054,7 +40041,7 @@ diff -urNp linux-2.6.29.6/mm/madvise.c linux-2.6.29.6/mm/madvise.c vma->vm_flags = new_flags; out: -@@ -244,6 +255,17 @@ madvise_vma(struct vm_area_struct *vma, +@@ -236,6 +247,17 @@ madvise_vma(struct vm_area_struct *vma, case MADV_DONTNEED: error = madvise_dontneed(vma, prev, start, end); @@ -41072,7 +40059,7 @@ diff -urNp linux-2.6.29.6/mm/madvise.c linux-2.6.29.6/mm/madvise.c break; default: -@@ -316,6 +338,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, +@@ -308,6 +330,16 @@ SYSCALL_DEFINE3(madvise, unsigned long, if (end < start) goto out; @@ -41089,9 +40076,9 @@ diff -urNp linux-2.6.29.6/mm/madvise.c linux-2.6.29.6/mm/madvise.c error = 0; if (end == start) goto out; -diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c ---- linux-2.6.29.6/mm/memory.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/memory.c 2009-07-23 17:34:32.222717577 -0400 +diff -urNp linux-2.6.30.4/mm/memory.c linux-2.6.30.4/mm/memory.c +--- linux-2.6.30.4/mm/memory.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/memory.c 2009-07-30 11:10:49.792655285 -0400 @@ -47,6 +47,7 @@ #include <linux/pagemap.h> #include <linux/rmap.h> @@ -41100,7 +40087,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c #include <linux/delayacct.h> #include <linux/init.h> #include <linux/writeback.h> -@@ -1222,11 +1223,11 @@ int __get_user_pages(struct task_struct +@@ -1227,11 +1228,11 @@ int __get_user_pages(struct task_struct vm_flags &= force ? (VM_MAYREAD | VM_MAYWRITE) : (VM_READ | VM_WRITE); i = 0; @@ -41114,7 +40101,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c if (!vma && in_gate_area(tsk, start)) { unsigned long pg = start & PAGE_MASK; struct vm_area_struct *gate_vma = get_gate_vma(tsk); -@@ -1268,7 +1269,7 @@ int __get_user_pages(struct task_struct +@@ -1273,7 +1274,7 @@ int __get_user_pages(struct task_struct continue; } @@ -41123,7 +40110,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c (vma->vm_flags & (VM_IO | VM_PFNMAP)) || (!ignore && !(vm_flags & vma->vm_flags))) return i ? : -EFAULT; -@@ -1351,7 +1352,7 @@ int __get_user_pages(struct task_struct +@@ -1356,7 +1357,7 @@ int __get_user_pages(struct task_struct start += PAGE_SIZE; len--; } while (len && start < vma->vm_end); @@ -41132,7 +40119,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c return i; } -@@ -1869,6 +1870,186 @@ static inline void cow_user_page(struct +@@ -1874,6 +1875,186 @@ static inline void cow_user_page(struct copy_user_highpage(dst, src, va, vma); } @@ -41319,7 +40306,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c /* * This routine handles present pages, when users try to write * to a shared page. It is done by copying the page to a new address -@@ -2041,6 +2222,12 @@ gotten: +@@ -2046,6 +2227,12 @@ gotten: */ page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (likely(pte_same(*page_table, orig_pte))) { @@ -41332,7 +40319,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c if (old_page) { if (!PageAnon(old_page)) { dec_mm_counter(mm, file_rss); -@@ -2087,6 +2274,10 @@ gotten: +@@ -2092,6 +2279,10 @@ gotten: page_remove_rmap(old_page); } @@ -41343,7 +40330,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c /* Free the old page.. */ new_page = old_page; ret |= VM_FAULT_WRITE; -@@ -2368,6 +2559,7 @@ int vmtruncate(struct inode * inode, lof +@@ -2373,6 +2564,7 @@ int vmtruncate(struct inode * inode, lof unsigned long limit; limit = current->signal->rlim[RLIMIT_FSIZE].rlim_cur; @@ -41351,7 +40338,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c if (limit != RLIM_INFINITY && offset > limit) goto out_sig; if (offset > inode->i_sb->s_maxbytes) -@@ -2533,6 +2725,11 @@ static int do_swap_page(struct mm_struct +@@ -2535,6 +2727,11 @@ static int do_swap_page(struct mm_struct swap_free(entry); if (vm_swap_full() || (vma->vm_flags & VM_LOCKED) || PageMlocked(page)) try_to_free_swap(page); @@ -41363,7 +40350,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c unlock_page(page); if (write_access) { -@@ -2544,6 +2741,11 @@ static int do_swap_page(struct mm_struct +@@ -2546,6 +2743,11 @@ static int do_swap_page(struct mm_struct /* No need to invalidate - it was non-present before */ update_mmu_cache(vma, address, pte); @@ -41375,7 +40362,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); out: -@@ -2588,12 +2790,23 @@ static int do_anonymous_page(struct mm_s +@@ -2591,12 +2793,23 @@ static int do_anonymous_page(struct mm_s page_table = pte_offset_map_lock(mm, pmd, address, &ptl); if (!pte_none(*page_table)) goto release; @@ -41399,7 +40386,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c unlock: pte_unmap_unlock(page_table, ptl); return 0; -@@ -2730,6 +2943,12 @@ static int __do_fault(struct mm_struct * +@@ -2733,6 +2946,12 @@ static int __do_fault(struct mm_struct * */ /* Only go through if we didn't race with anybody else... */ if (likely(pte_same(*page_table, orig_pte))) { @@ -41412,7 +40399,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c flush_icache_page(vma, page); entry = mk_pte(page, vma->vm_page_prot); if (flags & FAULT_FLAG_WRITE) -@@ -2749,6 +2968,14 @@ static int __do_fault(struct mm_struct * +@@ -2752,6 +2971,14 @@ static int __do_fault(struct mm_struct * /* no need to invalidate: a not-present page won't be cached */ update_mmu_cache(vma, address, entry); @@ -41427,7 +40414,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c } else { if (charged) mem_cgroup_uncharge_page(page); -@@ -2897,6 +3124,12 @@ static inline int handle_pte_fault(struc +@@ -2900,6 +3127,12 @@ static inline int handle_pte_fault(struc if (write_access) flush_tlb_page(vma, address); } @@ -41440,7 +40427,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -2913,6 +3146,10 @@ int handle_mm_fault(struct mm_struct *mm +@@ -2916,6 +3149,10 @@ int handle_mm_fault(struct mm_struct *mm pmd_t *pmd; pte_t *pte; @@ -41451,7 +40438,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c __set_current_state(TASK_RUNNING); count_vm_event(PGFAULT); -@@ -2920,6 +3157,34 @@ int handle_mm_fault(struct mm_struct *mm +@@ -2923,6 +3160,34 @@ int handle_mm_fault(struct mm_struct *mm if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, write_access); @@ -41486,7 +40473,7 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); if (!pud) -@@ -3017,7 +3282,7 @@ static int __init gate_vma_init(void) +@@ -3020,7 +3285,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; @@ -41495,9 +40482,9 @@ diff -urNp linux-2.6.29.6/mm/memory.c linux-2.6.29.6/mm/memory.c /* * Make sure the vDSO gets into every core dump. * Dumping its contents makes post-mortem fully interpretable later -diff -urNp linux-2.6.29.6/mm/mempolicy.c linux-2.6.29.6/mm/mempolicy.c ---- linux-2.6.29.6/mm/mempolicy.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/mempolicy.c 2009-07-23 17:34:32.224099604 -0400 +diff -urNp linux-2.6.30.4/mm/mempolicy.c linux-2.6.30.4/mm/mempolicy.c +--- linux-2.6.30.4/mm/mempolicy.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/mempolicy.c 2009-07-30 09:48:10.145161384 -0400 @@ -551,6 +551,10 @@ static int mbind_range(struct vm_area_st struct vm_area_struct *next; int err; @@ -41553,9 +40540,9 @@ diff -urNp linux-2.6.29.6/mm/mempolicy.c linux-2.6.29.6/mm/mempolicy.c } else if (vma->vm_start <= mm->brk && vma->vm_end >= mm->start_brk) { seq_printf(m, " heap"); } else if (vma->vm_start <= mm->start_stack && -diff -urNp linux-2.6.29.6/mm/mlock.c linux-2.6.29.6/mm/mlock.c ---- linux-2.6.29.6/mm/mlock.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/mlock.c 2009-07-23 17:34:32.224099604 -0400 +diff -urNp linux-2.6.30.4/mm/mlock.c linux-2.6.30.4/mm/mlock.c +--- linux-2.6.30.4/mm/mlock.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/mlock.c 2009-07-30 11:10:49.799565380 -0400 @@ -13,6 +13,7 @@ #include <linux/pagemap.h> #include <linux/mempolicy.h> @@ -41624,10 +40611,10 @@ diff -urNp linux-2.6.29.6/mm/mlock.c linux-2.6.29.6/mm/mlock.c if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) || capable(CAP_IPC_LOCK)) ret = do_mlockall(flags); -diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c ---- linux-2.6.29.6/mm/mmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/mmap.c 2009-07-23 19:29:10.716514097 -0400 -@@ -43,6 +43,16 @@ +diff -urNp linux-2.6.30.4/mm/mmap.c linux-2.6.30.4/mm/mmap.c +--- linux-2.6.30.4/mm/mmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/mmap.c 2009-07-30 11:10:49.813589536 -0400 +@@ -44,6 +44,16 @@ #define arch_rebalance_pgtables(addr, len) (addr) #endif @@ -41644,7 +40631,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c static void unmap_region(struct mm_struct *mm, struct vm_area_struct *vma, struct vm_area_struct *prev, unsigned long start, unsigned long end); -@@ -68,16 +78,25 @@ static void unmap_region(struct mm_struc +@@ -69,16 +79,25 @@ static void unmap_region(struct mm_struc * x: (no) no x: (no) yes x: (no) yes x: (yes) yes * */ @@ -41672,7 +40659,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c } EXPORT_SYMBOL(vm_get_page_prot); -@@ -229,6 +248,7 @@ static struct vm_area_struct *remove_vma +@@ -233,6 +252,7 @@ static struct vm_area_struct *remove_vma struct vm_area_struct *next = vma->vm_next; might_sleep(); @@ -41680,7 +40667,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (vma->vm_ops && vma->vm_ops->close) vma->vm_ops->close(vma); if (vma->vm_file) { -@@ -265,6 +285,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) +@@ -269,6 +289,7 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) * not page aligned -Ram Gupta */ rlim = current->signal->rlim[RLIMIT_DATA].rlim_cur; @@ -41688,7 +40675,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (rlim < RLIM_INFINITY && (brk - mm->start_brk) + (mm->end_data - mm->start_data) > rlim) goto out; -@@ -694,6 +715,12 @@ static int +@@ -698,6 +719,12 @@ static int can_vma_merge_before(struct vm_area_struct *vma, unsigned long vm_flags, struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff) { @@ -41701,7 +40688,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (is_mergeable_vma(vma, file, vm_flags) && is_mergeable_anon_vma(anon_vma, vma->anon_vma)) { if (vma->vm_pgoff == vm_pgoff) -@@ -713,6 +740,12 @@ static int +@@ -717,6 +744,12 @@ static int can_vma_merge_after(struct vm_area_struct *vma, unsigned long vm_flags, struct anon_vma *anon_vma, struct file *file, pgoff_t vm_pgoff) { @@ -41714,7 +40701,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (is_mergeable_vma(vma, file, vm_flags) && is_mergeable_anon_vma(anon_vma, vma->anon_vma)) { pgoff_t vm_pglen; -@@ -755,12 +788,19 @@ can_vma_merge_after(struct vm_area_struc +@@ -759,12 +792,19 @@ can_vma_merge_after(struct vm_area_struc struct vm_area_struct *vma_merge(struct mm_struct *mm, struct vm_area_struct *prev, unsigned long addr, unsigned long end, unsigned long vm_flags, @@ -41735,7 +40722,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * We later require that vma->vm_flags == vm_flags, * so this tests vma->vm_flags & VM_SPECIAL, too. -@@ -776,6 +816,15 @@ struct vm_area_struct *vma_merge(struct +@@ -780,6 +820,15 @@ struct vm_area_struct *vma_merge(struct if (next && next->vm_end == end) /* cases 6, 7, 8 */ next = next->vm_next; @@ -41751,7 +40738,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * Can it merge with the predecessor? */ -@@ -795,9 +844,24 @@ struct vm_area_struct *vma_merge(struct +@@ -799,9 +848,24 @@ struct vm_area_struct *vma_merge(struct /* cases 1, 6 */ vma_adjust(prev, prev->vm_start, next->vm_end, prev->vm_pgoff, NULL); @@ -41777,7 +40764,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return prev; } -@@ -808,12 +872,27 @@ struct vm_area_struct *vma_merge(struct +@@ -812,12 +876,27 @@ struct vm_area_struct *vma_merge(struct mpol_equal(policy, vma_policy(next)) && can_vma_merge_before(next, vm_flags, anon_vma, file, pgoff+pglen)) { @@ -41807,7 +40794,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return area; } -@@ -888,14 +967,11 @@ none: +@@ -892,14 +971,11 @@ none: void vm_stat_account(struct mm_struct *mm, unsigned long flags, struct file *file, long pages) { @@ -41823,7 +40810,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c mm->stack_vm += pages; if (flags & (VM_RESERVED|VM_IO)) mm->reserved_vm += pages; -@@ -922,7 +998,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -926,7 +1002,7 @@ unsigned long do_mmap_pgoff(struct file * (the exception is when the underlying filesystem is noexec * mounted, in which case we dont add PROT_EXEC.) */ @@ -41832,7 +40819,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (!(file && (file->f_path.mnt->mnt_flags & MNT_NOEXEC))) prot |= PROT_EXEC; -@@ -932,15 +1008,15 @@ unsigned long do_mmap_pgoff(struct file +@@ -936,15 +1012,15 @@ unsigned long do_mmap_pgoff(struct file if (!(flags & MAP_FIXED)) addr = round_hint_to_min(addr); @@ -41852,7 +40839,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* offset overflow? */ if ((pgoff + (len >> PAGE_SHIFT)) < pgoff) return -EOVERFLOW; -@@ -952,7 +1028,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -956,7 +1032,7 @@ unsigned long do_mmap_pgoff(struct file /* Obtain the address to map to. we verify (or select) it and ensure * that it represents a valid section of the address space. */ @@ -41861,7 +40848,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (addr & ~PAGE_MASK) return addr; -@@ -963,6 +1039,26 @@ unsigned long do_mmap_pgoff(struct file +@@ -967,6 +1043,26 @@ unsigned long do_mmap_pgoff(struct file vm_flags = calc_vm_prot_bits(prot) | calc_vm_flag_bits(flags) | mm->def_flags | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC; @@ -41888,7 +40875,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (flags & MAP_LOCKED) { if (!can_do_mlock()) return -EPERM; -@@ -976,6 +1072,7 @@ unsigned long do_mmap_pgoff(struct file +@@ -980,6 +1076,7 @@ unsigned long do_mmap_pgoff(struct file locked += mm->locked_vm; lock_limit = current->signal->rlim[RLIMIT_MEMLOCK].rlim_cur; lock_limit >>= PAGE_SHIFT; @@ -41896,7 +40883,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (locked > lock_limit && !capable(CAP_IPC_LOCK)) return -EAGAIN; } -@@ -1046,6 +1143,9 @@ unsigned long do_mmap_pgoff(struct file +@@ -1053,6 +1150,9 @@ unsigned long do_mmap_pgoff(struct file if (error) return error; @@ -41906,7 +40893,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return mmap_region(file, addr, len, flags, vm_flags, pgoff); } EXPORT_SYMBOL(do_mmap_pgoff); -@@ -1058,10 +1158,10 @@ EXPORT_SYMBOL(do_mmap_pgoff); +@@ -1065,10 +1165,10 @@ EXPORT_SYMBOL(do_mmap_pgoff); */ int vma_wants_writenotify(struct vm_area_struct *vma) { @@ -41919,7 +40906,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return 0; /* The backer wishes to know when pages are first written to? */ -@@ -1110,14 +1210,24 @@ unsigned long mmap_region(struct file *f +@@ -1117,14 +1217,24 @@ unsigned long mmap_region(struct file *f unsigned long charged = 0; struct inode *inode = file ? file->f_path.dentry->d_inode : NULL; @@ -41946,7 +40933,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c } /* Check against address space limit. */ -@@ -1166,6 +1276,16 @@ munmap_back: +@@ -1173,6 +1283,16 @@ munmap_back: goto unacct_error; } @@ -41963,7 +40950,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -1188,6 +1308,19 @@ munmap_back: +@@ -1195,6 +1315,19 @@ munmap_back: error = file->f_op->mmap(file, vma); if (error) goto unmap_and_free_vma; @@ -41983,7 +40970,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (vm_flags & VM_EXECUTABLE) added_exe_file_vma(mm); } else if (vm_flags & VM_SHARED) { -@@ -1211,12 +1344,18 @@ munmap_back: +@@ -1218,12 +1351,18 @@ munmap_back: vma_link(mm, vma, prev, rb_link, rb_parent); file = vma->vm_file; @@ -42002,7 +40989,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (vm_flags & VM_LOCKED) { /* * makes pages present; downgrades, drops, reacquires mmap_sem -@@ -1239,6 +1378,12 @@ unmap_and_free_vma: +@@ -1246,6 +1385,12 @@ unmap_and_free_vma: unmap_region(mm, vma, prev, vma->vm_start, vma->vm_end); charged = 0; free_vma: @@ -42015,7 +41002,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c kmem_cache_free(vm_area_cachep, vma); unacct_error: if (charged) -@@ -1272,6 +1417,10 @@ arch_get_unmapped_area(struct file *filp +@@ -1279,6 +1424,10 @@ arch_get_unmapped_area(struct file *filp if (flags & MAP_FIXED) return addr; @@ -42026,7 +41013,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (addr) { addr = PAGE_ALIGN(addr); vma = find_vma(mm, addr); -@@ -1280,10 +1429,10 @@ arch_get_unmapped_area(struct file *filp +@@ -1287,10 +1436,10 @@ arch_get_unmapped_area(struct file *filp return addr; } if (len > mm->cached_hole_size) { @@ -42040,7 +41027,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c } full_search: -@@ -1294,9 +1443,8 @@ full_search: +@@ -1301,9 +1450,8 @@ full_search: * Start a new search - just in case we missed * some holes. */ @@ -42052,7 +41039,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c mm->cached_hole_size = 0; goto full_search; } -@@ -1318,10 +1466,16 @@ full_search: +@@ -1325,10 +1473,16 @@ full_search: void arch_unmap_area(struct mm_struct *mm, unsigned long addr) { @@ -42070,7 +41057,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c mm->free_area_cache = addr; mm->cached_hole_size = ~0UL; } -@@ -1339,7 +1493,7 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1346,7 +1500,7 @@ arch_get_unmapped_area_topdown(struct fi { struct vm_area_struct *vma; struct mm_struct *mm = current->mm; @@ -42079,7 +41066,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* requested length too big for entire address space */ if (len > TASK_SIZE) -@@ -1348,6 +1502,10 @@ arch_get_unmapped_area_topdown(struct fi +@@ -1355,6 +1509,10 @@ arch_get_unmapped_area_topdown(struct fi if (flags & MAP_FIXED) return addr; @@ -42090,7 +41077,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* requesting a specific address */ if (addr) { addr = PAGE_ALIGN(addr); -@@ -1405,13 +1563,21 @@ bottomup: +@@ -1412,13 +1570,21 @@ bottomup: * can happen with large stack limits and large mmap() * allocations. */ @@ -42114,7 +41101,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c mm->cached_hole_size = ~0UL; return addr; -@@ -1420,6 +1586,12 @@ bottomup: +@@ -1427,6 +1593,12 @@ bottomup: void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr) { @@ -42127,7 +41114,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * Is this a new hole at the highest possible address? */ -@@ -1427,8 +1599,10 @@ void arch_unmap_area_topdown(struct mm_s +@@ -1434,8 +1606,10 @@ void arch_unmap_area_topdown(struct mm_s mm->free_area_cache = addr; /* dont allow allocations above current base */ @@ -42139,7 +41126,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c } unsigned long -@@ -1528,6 +1702,27 @@ out: +@@ -1535,6 +1709,27 @@ out: return prev ? prev->vm_next : vma; } @@ -42167,7 +41154,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * Verify that the stack growth is acceptable and * update accounting. This is shared with both the -@@ -1544,6 +1739,7 @@ static int acct_stack_growth(struct vm_a +@@ -1551,6 +1746,7 @@ static int acct_stack_growth(struct vm_a return -ENOMEM; /* Stack limit test */ @@ -42175,7 +41162,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (size > rlim[RLIMIT_STACK].rlim_cur) return -ENOMEM; -@@ -1553,6 +1749,7 @@ static int acct_stack_growth(struct vm_a +@@ -1560,6 +1756,7 @@ static int acct_stack_growth(struct vm_a unsigned long limit; locked = mm->locked_vm + grow; limit = rlim[RLIMIT_MEMLOCK].rlim_cur >> PAGE_SHIFT; @@ -42183,7 +41170,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (locked > limit && !capable(CAP_IPC_LOCK)) return -ENOMEM; } -@@ -1588,35 +1785,40 @@ static +@@ -1595,35 +1792,40 @@ static #endif int expand_upwards(struct vm_area_struct *vma, unsigned long address) { @@ -42234,7 +41221,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c unsigned long size, grow; size = address - vma->vm_start; -@@ -1626,6 +1828,8 @@ int expand_upwards(struct vm_area_struct +@@ -1633,6 +1835,8 @@ int expand_upwards(struct vm_area_struct if (!error) vma->vm_end = address; } @@ -42243,7 +41230,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c anon_vma_unlock(vma); return error; } -@@ -1637,7 +1841,8 @@ int expand_upwards(struct vm_area_struct +@@ -1644,7 +1848,8 @@ int expand_upwards(struct vm_area_struct static int expand_downwards(struct vm_area_struct *vma, unsigned long address) { @@ -42253,7 +41240,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * We must make sure the anon_vma is allocated -@@ -1651,6 +1856,15 @@ static int expand_downwards(struct vm_ar +@@ -1658,6 +1863,15 @@ static int expand_downwards(struct vm_ar if (error) return error; @@ -42269,7 +41256,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c anon_vma_lock(vma); /* -@@ -1660,9 +1874,15 @@ static int expand_downwards(struct vm_ar +@@ -1667,9 +1881,15 @@ static int expand_downwards(struct vm_ar */ /* Somebody else might have raced and expanded it already */ @@ -42286,7 +41273,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c size = vma->vm_end - address; grow = (vma->vm_start - address) >> PAGE_SHIFT; -@@ -1670,9 +1890,20 @@ static int expand_downwards(struct vm_ar +@@ -1677,9 +1897,20 @@ static int expand_downwards(struct vm_ar if (!error) { vma->vm_start = address; vma->vm_pgoff -= grow; @@ -42307,7 +41294,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return error; } -@@ -1748,6 +1979,13 @@ static void remove_vma_list(struct mm_st +@@ -1755,6 +1986,13 @@ static void remove_vma_list(struct mm_st do { long nrpages = vma_pages(vma); @@ -42321,7 +41308,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c mm->total_vm -= nrpages; vm_stat_account(mm, vma->vm_flags, vma->vm_file, -nrpages); vma = remove_vma(vma); -@@ -1792,6 +2030,16 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1799,6 +2037,16 @@ detach_vmas_to_be_unmapped(struct mm_str insertion_point = (prev ? &prev->vm_next : &mm->mmap); do { @@ -42338,7 +41325,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c rb_erase(&vma->vm_rb, &mm->mm_rb); mm->map_count--; tail_vma = vma; -@@ -1811,6 +2059,108 @@ detach_vmas_to_be_unmapped(struct mm_str +@@ -1818,6 +2066,108 @@ detach_vmas_to_be_unmapped(struct mm_str * Split a vma into two pieces at address 'addr', a new vma is allocated * either for the first part or the tail. */ @@ -42447,7 +41434,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c int split_vma(struct mm_struct * mm, struct vm_area_struct * vma, unsigned long addr, int new_below) { -@@ -1862,17 +2212,37 @@ int split_vma(struct mm_struct * mm, str +@@ -1869,17 +2219,37 @@ int split_vma(struct mm_struct * mm, str return 0; } @@ -42485,7 +41472,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if ((start & ~PAGE_MASK) || start > TASK_SIZE || len > TASK_SIZE-start) return -EINVAL; -@@ -1936,6 +2306,8 @@ int do_munmap(struct mm_struct *mm, unsi +@@ -1943,6 +2313,8 @@ int do_munmap(struct mm_struct *mm, unsi /* Fix up all other VM information */ remove_vma_list(mm, vma); @@ -42494,7 +41481,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return 0; } -@@ -1948,22 +2320,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a +@@ -1955,22 +2327,18 @@ SYSCALL_DEFINE2(munmap, unsigned long, a profile_munmap(addr); @@ -42523,7 +41510,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * this is really a simplified "do_mmap". it only handles * anonymous maps. eventually we may be able to do some -@@ -1977,6 +2345,11 @@ unsigned long do_brk(unsigned long addr, +@@ -1984,6 +2352,11 @@ unsigned long do_brk(unsigned long addr, struct rb_node ** rb_link, * rb_parent; pgoff_t pgoff = addr >> PAGE_SHIFT; int error; @@ -42535,7 +41522,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c len = PAGE_ALIGN(len); if (!len) -@@ -1994,19 +2367,34 @@ unsigned long do_brk(unsigned long addr, +@@ -2001,19 +2374,34 @@ unsigned long do_brk(unsigned long addr, flags = VM_DATA_DEFAULT_FLAGS | VM_ACCOUNT | mm->def_flags; @@ -42571,7 +41558,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (locked > lock_limit && !capable(CAP_IPC_LOCK)) return -EAGAIN; } -@@ -2020,22 +2408,22 @@ unsigned long do_brk(unsigned long addr, +@@ -2027,22 +2415,22 @@ unsigned long do_brk(unsigned long addr, /* * Clear old maps. this also does some error checking for us */ @@ -42598,7 +41585,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return -ENOMEM; /* Can we just expand an old private anonymous mapping? */ -@@ -2049,10 +2437,21 @@ unsigned long do_brk(unsigned long addr, +@@ -2056,10 +2444,21 @@ unsigned long do_brk(unsigned long addr, */ vma = kmem_cache_zalloc(vm_area_cachep, GFP_KERNEL); if (!vma) { @@ -42621,7 +41608,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c vma->vm_mm = mm; vma->vm_start = addr; vma->vm_end = addr + len; -@@ -2061,11 +2460,12 @@ unsigned long do_brk(unsigned long addr, +@@ -2068,11 +2467,12 @@ unsigned long do_brk(unsigned long addr, vma->vm_page_prot = vm_get_page_prot(flags); vma_link(mm, vma, prev, rb_link, rb_parent); out: @@ -42636,7 +41623,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return addr; } -@@ -2111,8 +2511,10 @@ void exit_mmap(struct mm_struct *mm) +@@ -2118,8 +2518,10 @@ void exit_mmap(struct mm_struct *mm) * Walk the list again, actually closing and freeing it, * with preemption enabled, without holding any MM locks. */ @@ -42648,7 +41635,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c BUG_ON(mm->nr_ptes > (FIRST_USER_ADDRESS+PMD_SIZE-1)>>PMD_SHIFT); } -@@ -2126,6 +2528,10 @@ int insert_vm_struct(struct mm_struct * +@@ -2133,6 +2535,10 @@ int insert_vm_struct(struct mm_struct * struct vm_area_struct * __vma, * prev; struct rb_node ** rb_link, * rb_parent; @@ -42659,7 +41646,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * The vm_pgoff of a purely anonymous vma should be irrelevant * until its first write fault, when page's anon_vma and index -@@ -2148,7 +2554,22 @@ int insert_vm_struct(struct mm_struct * +@@ -2155,7 +2561,22 @@ int insert_vm_struct(struct mm_struct * if ((vma->vm_flags & VM_ACCOUNT) && security_vm_enough_memory_mm(mm, vma_pages(vma))) return -ENOMEM; @@ -42682,7 +41669,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c return 0; } -@@ -2166,6 +2587,8 @@ struct vm_area_struct *copy_vma(struct v +@@ -2173,6 +2594,8 @@ struct vm_area_struct *copy_vma(struct v struct rb_node **rb_link, *rb_parent; struct mempolicy *pol; @@ -42691,7 +41678,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * If anonymous vma has not yet been faulted, update new pgoff * to match new location, to increase its chance of merging. -@@ -2209,6 +2632,35 @@ struct vm_area_struct *copy_vma(struct v +@@ -2216,6 +2639,35 @@ struct vm_area_struct *copy_vma(struct v return new_vma; } @@ -42727,7 +41714,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c /* * Return true if the calling process may expand its vm space by the passed * number of pages -@@ -2219,7 +2671,7 @@ int may_expand_vm(struct mm_struct *mm, +@@ -2226,7 +2678,7 @@ int may_expand_vm(struct mm_struct *mm, unsigned long lim; lim = current->signal->rlim[RLIMIT_AS].rlim_cur >> PAGE_SHIFT; @@ -42736,7 +41723,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c if (cur + npages > lim) return 0; return 1; -@@ -2260,7 +2712,7 @@ static void special_mapping_close(struct +@@ -2267,7 +2719,7 @@ static void special_mapping_close(struct { } @@ -42745,7 +41732,7 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c .close = special_mapping_close, .fault = special_mapping_fault, }; -@@ -2288,6 +2740,15 @@ int install_special_mapping(struct mm_st +@@ -2295,6 +2747,15 @@ int install_special_mapping(struct mm_st vma->vm_start = addr; vma->vm_end = addr + len; @@ -42761,9 +41748,9 @@ diff -urNp linux-2.6.29.6/mm/mmap.c linux-2.6.29.6/mm/mmap.c vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); -diff -urNp linux-2.6.29.6/mm/mprotect.c linux-2.6.29.6/mm/mprotect.c ---- linux-2.6.29.6/mm/mprotect.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/mprotect.c 2009-07-23 17:34:32.228714408 -0400 +diff -urNp linux-2.6.30.4/mm/mprotect.c linux-2.6.30.4/mm/mprotect.c +--- linux-2.6.30.4/mm/mprotect.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/mprotect.c 2009-07-30 11:10:49.815552001 -0400 @@ -23,10 +23,16 @@ #include <linux/swapops.h> #include <linux/mmu_notifier.h> @@ -42954,9 +41941,9 @@ diff -urNp linux-2.6.29.6/mm/mprotect.c linux-2.6.29.6/mm/mprotect.c nstart = tmp; if (nstart < prev->vm_end) -diff -urNp linux-2.6.29.6/mm/mremap.c linux-2.6.29.6/mm/mremap.c ---- linux-2.6.29.6/mm/mremap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/mremap.c 2009-07-23 17:34:32.228714408 -0400 +diff -urNp linux-2.6.30.4/mm/mremap.c linux-2.6.30.4/mm/mremap.c +--- linux-2.6.30.4/mm/mremap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/mremap.c 2009-07-30 09:48:10.147955205 -0400 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str continue; pte = ptep_clear_flush(vma, old_addr, old_pte); @@ -43068,10 +42055,10 @@ diff -urNp linux-2.6.29.6/mm/mremap.c linux-2.6.29.6/mm/mremap.c } out: if (ret & ~PAGE_MASK) -diff -urNp linux-2.6.29.6/mm/nommu.c linux-2.6.29.6/mm/nommu.c ---- linux-2.6.29.6/mm/nommu.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/nommu.c 2009-07-23 18:40:27.482433806 -0400 -@@ -79,7 +79,7 @@ static struct kmem_cache *vm_region_jar; +diff -urNp linux-2.6.30.4/mm/nommu.c linux-2.6.30.4/mm/nommu.c +--- linux-2.6.30.4/mm/nommu.c 2009-07-30 20:32:40.555603021 -0400 ++++ linux-2.6.30.4/mm/nommu.c 2009-07-30 20:32:48.097607328 -0400 +@@ -82,7 +82,7 @@ static struct kmem_cache *vm_region_jar; struct rb_root nommu_region_tree = RB_ROOT; DECLARE_RWSEM(nommu_region_sem); @@ -43080,7 +42067,7 @@ diff -urNp linux-2.6.29.6/mm/nommu.c linux-2.6.29.6/mm/nommu.c }; /* -@@ -770,15 +770,6 @@ struct vm_area_struct *find_vma(struct m +@@ -764,15 +764,6 @@ struct vm_area_struct *find_vma(struct m EXPORT_SYMBOL(find_vma); /* @@ -43096,9 +42083,9 @@ diff -urNp linux-2.6.29.6/mm/nommu.c linux-2.6.29.6/mm/nommu.c * expand a stack to a given address * - not supported under NOMMU conditions */ -diff -urNp linux-2.6.29.6/mm/page_alloc.c linux-2.6.29.6/mm/page_alloc.c ---- linux-2.6.29.6/mm/page_alloc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/page_alloc.c 2009-07-23 17:34:32.229702725 -0400 +diff -urNp linux-2.6.30.4/mm/page_alloc.c linux-2.6.30.4/mm/page_alloc.c +--- linux-2.6.30.4/mm/page_alloc.c 2009-07-30 20:32:40.556595558 -0400 ++++ linux-2.6.30.4/mm/page_alloc.c 2009-07-30 20:32:48.098681549 -0400 @@ -549,6 +549,10 @@ static void __free_pages_ok(struct page int i; int bad = 0; @@ -43134,7 +42121,7 @@ diff -urNp linux-2.6.29.6/mm/page_alloc.c linux-2.6.29.6/mm/page_alloc.c if (order && (gfp_flags & __GFP_COMP)) prep_compound_page(page, order); -@@ -1009,6 +1021,11 @@ static void free_hot_cold_page(struct pa +@@ -1006,6 +1018,11 @@ static void free_hot_cold_page(struct pa debug_check_no_locks_freed(page_address(page), PAGE_SIZE); debug_check_no_obj_freed(page_address(page), PAGE_SIZE); } @@ -43146,9 +42133,21 @@ diff -urNp linux-2.6.29.6/mm/page_alloc.c linux-2.6.29.6/mm/page_alloc.c arch_free_page(page, 0); kernel_map_pages(page, 1, 0); -diff -urNp linux-2.6.29.6/mm/rmap.c linux-2.6.29.6/mm/rmap.c ---- linux-2.6.29.6/mm/rmap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/rmap.c 2009-07-23 17:34:32.230802833 -0400 +diff -urNp linux-2.6.30.4/mm/percpu.c linux-2.6.30.4/mm/percpu.c +--- linux-2.6.30.4/mm/percpu.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/percpu.c 2009-07-30 09:48:10.149665939 -0400 +@@ -107,7 +107,7 @@ static int pcpu_nr_slots __read_mostly; + static size_t pcpu_chunk_struct_size __read_mostly; + + /* the address of the first chunk which starts with the kernel static area */ +-void *pcpu_base_addr __read_mostly; ++void *pcpu_base_addr __read_only; + EXPORT_SYMBOL_GPL(pcpu_base_addr); + + /* optional reserved chunk, only accessible for reserved allocations */ +diff -urNp linux-2.6.30.4/mm/rmap.c linux-2.6.30.4/mm/rmap.c +--- linux-2.6.30.4/mm/rmap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/rmap.c 2009-07-30 09:48:10.149665939 -0400 @@ -103,6 +103,10 @@ int anon_vma_prepare(struct vm_area_stru struct mm_struct *mm = vma->vm_mm; struct anon_vma *allocated; @@ -43176,19 +42175,19 @@ diff -urNp linux-2.6.29.6/mm/rmap.c linux-2.6.29.6/mm/rmap.c vma->anon_vma = anon_vma; list_add_tail(&vma->anon_vma_node, &anon_vma->head); allocated = NULL; -diff -urNp linux-2.6.29.6/mm/shmem.c linux-2.6.29.6/mm/shmem.c ---- linux-2.6.29.6/mm/shmem.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/shmem.c 2009-07-23 18:40:28.737571137 -0400 -@@ -29,7 +29,7 @@ - #include <linux/module.h> +diff -urNp linux-2.6.30.4/mm/shmem.c linux-2.6.30.4/mm/shmem.c +--- linux-2.6.30.4/mm/shmem.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/shmem.c 2009-07-30 11:10:49.822549311 -0400 +@@ -31,7 +31,7 @@ #include <linux/swap.h> + #include <linux/ima.h> -static struct vfsmount *shm_mnt; +struct vfsmount *shm_mnt; #ifdef CONFIG_SHMEM /* -@@ -203,7 +203,7 @@ static const struct file_operations shme +@@ -219,7 +219,7 @@ static const struct file_operations shme static const struct inode_operations shmem_inode_operations; static const struct inode_operations shmem_dir_inode_operations; static const struct inode_operations shmem_special_inode_operations; @@ -43197,7 +42196,7 @@ diff -urNp linux-2.6.29.6/mm/shmem.c linux-2.6.29.6/mm/shmem.c static struct backing_dev_info shmem_backing_dev_info __read_mostly = { .ra_pages = 0, /* No readahead */ -@@ -2482,7 +2482,7 @@ static const struct super_operations shm +@@ -2501,7 +2501,7 @@ static const struct super_operations shm .put_super = shmem_put_super, }; @@ -43206,10 +42205,10 @@ diff -urNp linux-2.6.29.6/mm/shmem.c linux-2.6.29.6/mm/shmem.c .fault = shmem_fault, #ifdef CONFIG_NUMA .set_policy = shmem_set_policy, -diff -urNp linux-2.6.29.6/mm/slab.c linux-2.6.29.6/mm/slab.c ---- linux-2.6.29.6/mm/slab.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/slab.c 2009-07-23 17:34:32.231924238 -0400 -@@ -305,7 +305,7 @@ struct kmem_list3 { +diff -urNp linux-2.6.30.4/mm/slab.c linux-2.6.30.4/mm/slab.c +--- linux-2.6.30.4/mm/slab.c 2009-07-30 20:32:40.559581250 -0400 ++++ linux-2.6.30.4/mm/slab.c 2009-07-30 20:32:48.099850445 -0400 +@@ -306,7 +306,7 @@ struct kmem_list3 { * Need this for bootstrapping a per node allocator. */ #define NUM_INIT_LISTS (3 * MAX_NUMNODES) @@ -43218,7 +42217,7 @@ diff -urNp linux-2.6.29.6/mm/slab.c linux-2.6.29.6/mm/slab.c #define CACHE_CACHE 0 #define SIZE_AC MAX_NUMNODES #define SIZE_L3 (2 * MAX_NUMNODES) -@@ -628,7 +628,7 @@ static inline void *index_to_obj(struct +@@ -637,7 +637,7 @@ static inline void *index_to_obj(struct * reciprocal_divide(offset, cache->reciprocal_buffer_size) */ static inline unsigned int obj_to_index(const struct kmem_cache *cache, @@ -43227,7 +42226,7 @@ diff -urNp linux-2.6.29.6/mm/slab.c linux-2.6.29.6/mm/slab.c { u32 offset = (obj - slab->s_mem); return reciprocal_divide(offset, cache->reciprocal_buffer_size); -@@ -654,14 +654,14 @@ struct cache_names { +@@ -663,14 +663,14 @@ struct cache_names { static struct cache_names __initdata cache_names[] = { #define CACHE(x) { .name = "size-" #x, .name_dma = "size-" #x "(DMA)" }, #include <linux/kmalloc_sizes.h> @@ -43245,7 +42244,7 @@ diff -urNp linux-2.6.29.6/mm/slab.c linux-2.6.29.6/mm/slab.c /* internal cache of cache description objs */ static struct kmem_cache cache_cache = { -@@ -4428,15 +4428,60 @@ static const struct file_operations proc +@@ -4486,15 +4486,64 @@ static const struct file_operations proc static int __init slab_proc_init(void) { @@ -43281,8 +42280,12 @@ diff -urNp linux-2.6.29.6/mm/slab.c linux-2.6.29.6/mm/slab.c + + page = virt_to_head_page(ptr); + -+ if (!PageSlab(page)) -+ /* TODO: check for stack based ptr */ ++ /* XXX: can get a little tighter with this stack check */ ++ if (!PageSlab(page) && object_is_on_stack(ptr) && ++ (n > ((unsigned long)task_stack_page(current) + THREAD_SIZE - ++ (unsigned long)ptr))) ++ goto report; ++ else + return; + + cachep = page_get_cache(page); @@ -43306,9 +42309,9 @@ diff -urNp linux-2.6.29.6/mm/slab.c linux-2.6.29.6/mm/slab.c /** * ksize - get the actual amount of memory allocated for a given object * @objp: Pointer to the object -diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c ---- linux-2.6.29.6/mm/slob.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/slob.c 2009-07-23 17:34:32.232713662 -0400 +diff -urNp linux-2.6.30.4/mm/slob.c linux-2.6.30.4/mm/slob.c +--- linux-2.6.30.4/mm/slob.c 2009-07-30 20:32:40.560667928 -0400 ++++ linux-2.6.30.4/mm/slob.c 2009-07-30 20:32:48.100694054 -0400 @@ -29,7 +29,7 @@ * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls * alloc_pages() directly, allocating compound pages so the page order @@ -43325,8 +42328,8 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c +#include <linux/sched.h> #include <linux/slab.h> #include <linux/mm.h> - #include <linux/cache.h> -@@ -97,7 +98,8 @@ struct slob_page { + #include <linux/swap.h> /* struct reclaim_state */ +@@ -99,7 +100,8 @@ struct slob_page { unsigned long flags; /* mandatory */ atomic_t _count; /* mandatory */ slobidx_t units; /* free units left in page */ @@ -43336,16 +42339,16 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c slob_t *free; /* first free slob_t in page */ struct list_head list; /* linked list of free pages */ }; -@@ -130,7 +132,7 @@ static LIST_HEAD(free_slob_large); +@@ -132,7 +134,7 @@ static LIST_HEAD(free_slob_large); */ - static inline int slob_page(struct slob_page *sp) + static inline int is_slob_page(struct slob_page *sp) { - return PageSlobPage((struct page *)sp); + return PageSlobPage((struct page *)sp) && !sp->size; } static inline void set_slob_page(struct slob_page *sp) -@@ -200,7 +202,7 @@ static void set_slob(slob_t *s, slobidx_ +@@ -207,7 +209,7 @@ static void set_slob(slob_t *s, slobidx_ /* * Return the size of a slob block. */ @@ -43354,7 +42357,7 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c { if (s->units > 0) return s->units; -@@ -210,7 +212,7 @@ static slobidx_t slob_units(slob_t *s) +@@ -217,7 +219,7 @@ static slobidx_t slob_units(slob_t *s) /* * Return the next free slob block pointer after this one. */ @@ -43363,7 +42366,7 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c { slob_t *base = (slob_t *)((unsigned long)s & PAGE_MASK); slobidx_t next; -@@ -225,7 +227,7 @@ static slob_t *slob_next(slob_t *s) +@@ -232,7 +234,7 @@ static slob_t *slob_next(slob_t *s) /* * Returns true if s is the last free block in its page. */ @@ -43372,7 +42375,7 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c { return !((unsigned long)slob_next(s) & ~PAGE_MASK); } -@@ -244,6 +246,7 @@ static void *slob_new_page(gfp_t gfp, in +@@ -251,6 +253,7 @@ static void *slob_new_pages(gfp_t gfp, i if (!page) return NULL; @@ -43380,10 +42383,10 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c return page_address(page); } -@@ -353,11 +356,11 @@ static void *slob_alloc(size_t size, gfp +@@ -367,11 +370,11 @@ static void *slob_alloc(size_t size, gfp if (!b) - return 0; - sp = (struct slob_page *)virt_to_page(b); + return NULL; + sp = slob_page(b); - set_slob_page(sp); spin_lock_irqsave(&slob_lock, flags); @@ -43393,7 +42396,7 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c INIT_LIST_HEAD(&sp->list); set_slob(b, SLOB_UNITS(PAGE_SIZE), b + SLOB_UNITS(PAGE_SIZE)); set_slob_page_free(sp, slob_list); -@@ -459,10 +462,9 @@ out: +@@ -474,10 +477,9 @@ out: #define ARCH_SLAB_MINALIGN __alignof__(unsigned long) #endif @@ -43403,11 +42406,11 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c - unsigned int *m; - int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); + slob_t *m; + void *ret; + + lockdep_trace_alloc(gfp); +@@ -490,7 +492,10 @@ void *__kmalloc_node(size_t size, gfp_t - if (size < PAGE_SIZE - align) { - if (!size) -@@ -471,20 +473,30 @@ void *__kmalloc_node(size_t size, gfp_t - m = slob_alloc(size + align, gfp, align, node); if (!m) return NULL; - *m = size; @@ -43415,11 +42418,12 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c + BUILD_BUG_ON(ARCH_SLAB_MINALIGN < 2 * SLOB_UNIT); + m[0].units = size; + m[1].units = align; - return (void *)m + align; - } else { - void *ret; + ret = (void *)m + align; - ret = slob_new_page(gfp | __GFP_COMP, get_order(size), node); + trace_kmalloc_node(_RET_IP_, ret, +@@ -500,9 +505,9 @@ void *__kmalloc_node(size_t size, gfp_t + + ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node); if (ret) { - struct page *page; - page = virt_to_page(ret); @@ -43428,8 +42432,11 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c + sp = (struct slob_page *)virt_to_head_page(ret); + sp->size = size; } - return ret; - } + + trace_kmalloc_node(_RET_IP_, ret, +@@ -511,6 +516,13 @@ void *__kmalloc_node(size_t size, gfp_t + + return ret; } + +void *__kmalloc_node(size_t size, gfp_t gfp, int node) @@ -43441,9 +42448,9 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c EXPORT_SYMBOL(__kmalloc_node); void kfree(const void *block) -@@ -497,13 +509,81 @@ void kfree(const void *block) - sp = (struct slob_page *)virt_to_page(block); - if (slob_page(sp)) { +@@ -525,13 +537,86 @@ void kfree(const void *block) + sp = slob_page(block); + if (is_slob_page(sp)) { int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); - unsigned int *m = (unsigned int *)(block - align); - slob_free(m, *m + align); @@ -43477,7 +42484,12 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c + return; + + sp = (struct slob_page *)virt_to_head_page(ptr); -+ if (!PageSlobPage((struct page*)sp)) ++ /* XXX: can get a little tighter with this stack check */ ++ if (!PageSlobPage((struct page*)sp) && object_is_on_stack(ptr) && ++ (n > ((unsigned long)task_stack_page(current) + THREAD_SIZE - ++ (unsigned long)ptr))) ++ goto report; ++ else + return; + + if (sp->size) { @@ -43526,9 +42538,9 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c /* can't use ksize for kmem_cache_alloc memory, only kmalloc */ size_t ksize(const void *block) { -@@ -516,10 +596,10 @@ size_t ksize(const void *block) - sp = (struct slob_page *)virt_to_page(block); - if (slob_page(sp)) { +@@ -544,10 +629,10 @@ size_t ksize(const void *block) + sp = slob_page(block); + if (is_slob_page(sp)) { int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN); - unsigned int *m = (unsigned int *)(block - align); - return SLOB_UNITS(*m) * SLOB_UNIT; @@ -43540,28 +42552,33 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c } EXPORT_SYMBOL(ksize); -@@ -570,10 +650,19 @@ void *kmem_cache_alloc_node(struct kmem_ +@@ -600,17 +685,25 @@ void *kmem_cache_alloc_node(struct kmem_ { void *b; +#ifdef CONFIG_PAX_USERCOPY + b = __kmalloc_node_align(c->size, flags, node, c->align); +#else - if (c->size < PAGE_SIZE) + if (c->size < PAGE_SIZE) { b = slob_alloc(c->size, flags, c->align, node); -- else -+ else { + trace_kmem_cache_alloc_node(_RET_IP_, b, c->size, + SLOB_UNITS(c->size) * SLOB_UNIT, + flags, node); + } else { + struct slob_page *sp; + - b = slob_new_page(flags, get_order(c->size), node); + b = slob_new_pages(flags, get_order(c->size), node); + sp = (struct slob_page *)virt_to_head_page(b); + sp->size = c->size; -+ } + trace_kmem_cache_alloc_node(_RET_IP_, b, c->size, + PAGE_SIZE << get_order(c->size), + flags, node); + } +#endif if (c->ctor) c->ctor(b); -@@ -584,10 +673,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); +@@ -621,10 +714,16 @@ EXPORT_SYMBOL(kmem_cache_alloc_node); static void __kmem_cache_free(void *b, int size) { @@ -43575,12 +42592,12 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c + clear_slob_page(sp); + free_slob_page(sp); + sp->size = 0; - free_pages((unsigned long)b, get_order(size)); + slob_free_pages(b, get_order(size)); + } } static void kmem_rcu_free(struct rcu_head *head) -@@ -600,14 +695,23 @@ static void kmem_rcu_free(struct rcu_hea +@@ -637,14 +736,23 @@ static void kmem_rcu_free(struct rcu_hea void kmem_cache_free(struct kmem_cache *c, void *b) { @@ -43605,12 +42622,12 @@ diff -urNp linux-2.6.29.6/mm/slob.c linux-2.6.29.6/mm/slob.c - __kmem_cache_free(b, c->size); + __kmem_cache_free(b, size); } - } - EXPORT_SYMBOL(kmem_cache_free); -diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c ---- linux-2.6.29.6/mm/slub.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/slub.c 2009-07-23 17:34:32.232713662 -0400 -@@ -1786,7 +1786,7 @@ static int slub_min_objects; + + trace_kmem_cache_free(_RET_IP_, b); +diff -urNp linux-2.6.30.4/mm/slub.c linux-2.6.30.4/mm/slub.c +--- linux-2.6.30.4/mm/slub.c 2009-07-30 20:32:40.563597140 -0400 ++++ linux-2.6.30.4/mm/slub.c 2009-07-30 20:32:48.102657318 -0400 +@@ -1811,7 +1811,7 @@ static int slub_min_objects; * Merge control. If this is set then no merging of slab caches will occur. * (Could be removed. This was introduced to pacify the merge skeptics.) */ @@ -43619,18 +42636,18 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c /* * Calculate the order of allocation given an slab object size. -@@ -2322,7 +2322,7 @@ static int kmem_cache_open(struct kmem_c - if (!calculate_sizes(s, -1)) - goto error; - +@@ -2354,7 +2354,7 @@ static int kmem_cache_open(struct kmem_c + * list to avoid pounding the page allocator excessively. + */ + set_min_partial(s, ilog2(s->size)); - s->refcount = 1; + atomic_set(&s->refcount, 1); #ifdef CONFIG_NUMA s->remote_node_defrag_ratio = 1000; #endif -@@ -2459,8 +2459,7 @@ static inline int kmem_cache_close(struc - void kmem_cache_destroy(struct kmem_cache *s) - { +@@ -2493,8 +2493,7 @@ void kmem_cache_destroy(struct kmem_cach + if (s->flags & SLAB_DESTROY_BY_RCU) + rcu_barrier(); down_write(&slub_lock); - s->refcount--; - if (!s->refcount) { @@ -43638,7 +42655,7 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c list_del(&s->list); up_write(&slub_lock); if (kmem_cache_close(s)) { -@@ -2702,6 +2701,44 @@ void *__kmalloc_node(size_t size, gfp_t +@@ -2754,6 +2753,48 @@ void *__kmalloc_node(size_t size, gfp_t EXPORT_SYMBOL(__kmalloc_node); #endif @@ -43661,8 +42678,12 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c + + page = get_object_page(ptr); + -+ if (!page) -+ /* TODO: check for stack based ptr */ ++ /* XXX: can get a little tighter with this stack check */ ++ if (!page && object_is_on_stack(ptr) && ++ (n > ((unsigned long)task_stack_page(current) + THREAD_SIZE - ++ (unsigned long)ptr))) ++ goto report; ++ else + return; + + s = page->slab; @@ -43683,7 +42704,7 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c size_t ksize(const void *object) { struct page *page; -@@ -2970,7 +3007,7 @@ void __init kmem_cache_init(void) +@@ -3024,7 +3065,7 @@ void __init kmem_cache_init(void) */ create_kmalloc_cache(&kmalloc_caches[0], "kmem_cache_node", sizeof(struct kmem_cache_node), GFP_KERNEL); @@ -43692,7 +42713,7 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c caches++; hotplug_memory_notifier(slab_memory_callback, SLAB_CALLBACK_PRI); -@@ -3060,7 +3097,7 @@ static int slab_unmergeable(struct kmem_ +@@ -3114,7 +3155,7 @@ static int slab_unmergeable(struct kmem_ /* * We may have set a slab to be unmergeable during bootstrap. */ @@ -43701,7 +42722,7 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c return 1; return 0; -@@ -3117,7 +3154,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3171,7 +3212,7 @@ struct kmem_cache *kmem_cache_create(con if (s) { int cpu; @@ -43710,7 +42731,7 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c /* * Adjust the object sizes so that we clear * the complete object on kzalloc. -@@ -3136,7 +3173,7 @@ struct kmem_cache *kmem_cache_create(con +@@ -3190,7 +3231,7 @@ struct kmem_cache *kmem_cache_create(con if (sysfs_slab_alias(s, name)) { down_write(&slub_lock); @@ -43719,7 +42740,7 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c up_write(&slub_lock); goto err; } -@@ -3852,7 +3889,7 @@ SLAB_ATTR_RO(ctor); +@@ -3938,7 +3979,7 @@ SLAB_ATTR_RO(ctor); static ssize_t aliases_show(struct kmem_cache *s, char *buf) { @@ -43728,7 +42749,7 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c } SLAB_ATTR_RO(aliases); -@@ -4530,7 +4567,9 @@ static const struct file_operations proc +@@ -4617,7 +4658,9 @@ static const struct file_operations proc static int __init slab_proc_init(void) { @@ -43738,10 +42759,10 @@ diff -urNp linux-2.6.29.6/mm/slub.c linux-2.6.29.6/mm/slub.c return 0; } module_init(slab_proc_init); -diff -urNp linux-2.6.29.6/mm/util.c linux-2.6.29.6/mm/util.c ---- linux-2.6.29.6/mm/util.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/util.c 2009-07-23 17:34:32.233880520 -0400 -@@ -187,6 +187,12 @@ EXPORT_SYMBOL(strndup_user); +diff -urNp linux-2.6.30.4/mm/util.c linux-2.6.30.4/mm/util.c +--- linux-2.6.30.4/mm/util.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/util.c 2009-07-30 09:48:10.152770641 -0400 +@@ -218,6 +218,12 @@ EXPORT_SYMBOL(strndup_user); void arch_pick_mmap_layout(struct mm_struct *mm) { mm->mmap_base = TASK_UNMAPPED_BASE; @@ -43754,10 +42775,10 @@ diff -urNp linux-2.6.29.6/mm/util.c linux-2.6.29.6/mm/util.c mm->get_unmapped_area = arch_get_unmapped_area; mm->unmap_area = arch_unmap_area; } -diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c ---- linux-2.6.29.6/mm/vmalloc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/mm/vmalloc.c 2009-07-23 17:34:32.233880520 -0400 -@@ -90,6 +90,11 @@ static int vmap_pte_range(pmd_t *pmd, un +diff -urNp linux-2.6.30.4/mm/vmalloc.c linux-2.6.30.4/mm/vmalloc.c +--- linux-2.6.30.4/mm/vmalloc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/mm/vmalloc.c 2009-07-30 09:48:10.153729053 -0400 +@@ -91,6 +91,11 @@ static int vmap_pte_range(pmd_t *pmd, un unsigned long end, pgprot_t prot, struct page **pages, int *nr) { pte_t *pte; @@ -43769,7 +42790,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c /* * nr is a running index into the array which helps higher level -@@ -99,17 +104,33 @@ static int vmap_pte_range(pmd_t *pmd, un +@@ -100,17 +105,33 @@ static int vmap_pte_range(pmd_t *pmd, un pte = pte_alloc_kernel(pmd, addr); if (!pte) return -ENOMEM; @@ -43808,7 +42829,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c } static int vmap_pmd_range(pud_t *pud, unsigned long addr, -@@ -1056,6 +1077,16 @@ static struct vm_struct *__get_vm_area_n +@@ -1132,6 +1153,16 @@ static struct vm_struct *__get_vm_area_n unsigned long align = 1; BUG_ON(in_interrupt()); @@ -43825,7 +42846,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c if (flags & VM_IOREMAP) { int bit = fls(size); -@@ -1289,6 +1320,11 @@ void *vmap(struct page **pages, unsigned +@@ -1368,6 +1399,11 @@ void *vmap(struct page **pages, unsigned if (count > num_physpages) return NULL; @@ -43837,7 +42858,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c area = get_vm_area_caller((count << PAGE_SHIFT), flags, __builtin_return_address(0)); if (!area) -@@ -1385,6 +1421,13 @@ static void *__vmalloc_node(unsigned lon +@@ -1464,6 +1500,13 @@ static void *__vmalloc_node(unsigned lon if (!size || (size >> PAGE_SHIFT) > num_physpages) return NULL; @@ -43851,7 +42872,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c area = __get_vm_area_node(size, VM_ALLOC, VMALLOC_START, VMALLOC_END, node, gfp_mask, caller); -@@ -1394,6 +1437,7 @@ static void *__vmalloc_node(unsigned lon +@@ -1473,6 +1516,7 @@ static void *__vmalloc_node(unsigned lon return __vmalloc_area_node(area, gfp_mask, prot, node, caller); } @@ -43859,7 +42880,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c void *__vmalloc(unsigned long size, gfp_t gfp_mask, pgprot_t prot) { return __vmalloc_node(size, gfp_mask, prot, -1, -@@ -1410,6 +1454,7 @@ EXPORT_SYMBOL(__vmalloc); +@@ -1489,6 +1533,7 @@ EXPORT_SYMBOL(__vmalloc); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -43867,7 +42888,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c void *vmalloc(unsigned long size) { return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1424,6 +1469,7 @@ EXPORT_SYMBOL(vmalloc); +@@ -1503,6 +1548,7 @@ EXPORT_SYMBOL(vmalloc); * The resulting memory area is zeroed so it can be mapped to userspace * without leaking data. */ @@ -43875,7 +42896,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c void *vmalloc_user(unsigned long size) { struct vm_struct *area; -@@ -1450,6 +1496,7 @@ EXPORT_SYMBOL(vmalloc_user); +@@ -1529,6 +1575,7 @@ EXPORT_SYMBOL(vmalloc_user); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -43883,7 +42904,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c void *vmalloc_node(unsigned long size, int node) { return __vmalloc_node(size, GFP_KERNEL | __GFP_HIGHMEM, PAGE_KERNEL, -@@ -1472,10 +1519,10 @@ EXPORT_SYMBOL(vmalloc_node); +@@ -1551,10 +1598,10 @@ EXPORT_SYMBOL(vmalloc_node); * For tight control over page level allocator and protection flags * use __vmalloc() instead. */ @@ -43896,7 +42917,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c -1, __builtin_return_address(0)); } -@@ -1494,6 +1541,7 @@ void *vmalloc_exec(unsigned long size) +@@ -1573,6 +1620,7 @@ void *vmalloc_exec(unsigned long size) * Allocate enough 32bit PA addressable pages to cover @size from the * page level allocator and map them into contiguous kernel virtual space. */ @@ -43904,7 +42925,7 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c void *vmalloc_32(unsigned long size) { return __vmalloc_node(size, GFP_VMALLOC32, PAGE_KERNEL, -@@ -1508,6 +1556,7 @@ EXPORT_SYMBOL(vmalloc_32); +@@ -1587,6 +1635,7 @@ EXPORT_SYMBOL(vmalloc_32); * The resulting memory area is 32bit addressable and zeroed so it can be * mapped to userspace without leaking data. */ @@ -43912,9 +42933,9 @@ diff -urNp linux-2.6.29.6/mm/vmalloc.c linux-2.6.29.6/mm/vmalloc.c void *vmalloc_32_user(unsigned long size) { struct vm_struct *area; -diff -urNp linux-2.6.29.6/net/atm/atm_misc.c linux-2.6.29.6/net/atm/atm_misc.c ---- linux-2.6.29.6/net/atm/atm_misc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/atm/atm_misc.c 2009-07-23 17:34:37.460011249 -0400 +diff -urNp linux-2.6.30.4/net/atm/atm_misc.c linux-2.6.30.4/net/atm/atm_misc.c +--- linux-2.6.30.4/net/atm/atm_misc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/atm/atm_misc.c 2009-07-30 09:48:10.153729053 -0400 @@ -19,7 +19,7 @@ int atm_charge(struct atm_vcc *vcc,int t if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf) return 1; @@ -43942,9 +42963,9 @@ diff -urNp linux-2.6.29.6/net/atm/atm_misc.c linux-2.6.29.6/net/atm/atm_misc.c __SONET_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.29.6/net/atm/resources.c linux-2.6.29.6/net/atm/resources.c ---- linux-2.6.29.6/net/atm/resources.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/atm/resources.c 2009-07-23 17:34:32.234796571 -0400 +diff -urNp linux-2.6.30.4/net/atm/resources.c linux-2.6.30.4/net/atm/resources.c +--- linux-2.6.30.4/net/atm/resources.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/atm/resources.c 2009-07-30 09:48:10.153729053 -0400 @@ -170,7 +170,7 @@ static void copy_aal_stats(struct k_atm_ static void subtract_aal_stats(struct k_atm_aal_stats *from, struct atm_aal_stats *to) @@ -43954,9 +42975,9 @@ diff -urNp linux-2.6.29.6/net/atm/resources.c linux-2.6.29.6/net/atm/resources.c __AAL_STAT_ITEMS #undef __HANDLE_ITEM } -diff -urNp linux-2.6.29.6/net/bridge/br_stp_if.c linux-2.6.29.6/net/bridge/br_stp_if.c ---- linux-2.6.29.6/net/bridge/br_stp_if.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/bridge/br_stp_if.c 2009-07-23 17:34:32.234796571 -0400 +diff -urNp linux-2.6.30.4/net/bridge/br_stp_if.c linux-2.6.30.4/net/bridge/br_stp_if.c +--- linux-2.6.30.4/net/bridge/br_stp_if.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/bridge/br_stp_if.c 2009-07-30 09:48:10.153729053 -0400 @@ -146,7 +146,7 @@ static void br_stp_stop(struct net_bridg char *envp[] = { NULL }; @@ -43966,9 +42987,9 @@ diff -urNp linux-2.6.29.6/net/bridge/br_stp_if.c linux-2.6.29.6/net/bridge/br_st printk(KERN_INFO "%s: userspace STP stopped, return code %d\n", br->dev->name, r); -diff -urNp linux-2.6.29.6/net/core/flow.c linux-2.6.29.6/net/core/flow.c ---- linux-2.6.29.6/net/core/flow.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/core/flow.c 2009-07-23 17:34:32.234796571 -0400 +diff -urNp linux-2.6.30.4/net/core/flow.c linux-2.6.30.4/net/core/flow.c +--- linux-2.6.30.4/net/core/flow.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/core/flow.c 2009-07-30 09:48:10.154837046 -0400 @@ -39,7 +39,7 @@ atomic_t flow_cache_genid = ATOMIC_INIT( static u32 flow_hash_shift; @@ -43996,9 +43017,9 @@ diff -urNp linux-2.6.29.6/net/core/flow.c linux-2.6.29.6/net/core/flow.c #define flow_flush_tasklet(cpu) (&per_cpu(flow_flush_tasklets, cpu)) -diff -urNp linux-2.6.29.6/net/dccp/ccids/ccid3.c linux-2.6.29.6/net/dccp/ccids/ccid3.c ---- linux-2.6.29.6/net/dccp/ccids/ccid3.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/dccp/ccids/ccid3.c 2009-07-23 17:34:32.234796571 -0400 +diff -urNp linux-2.6.30.4/net/dccp/ccids/ccid3.c linux-2.6.30.4/net/dccp/ccids/ccid3.c +--- linux-2.6.30.4/net/dccp/ccids/ccid3.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/dccp/ccids/ccid3.c 2009-07-30 09:48:10.154837046 -0400 @@ -43,7 +43,7 @@ static int ccid3_debug; #define ccid3_pr_debug(format, a...) DCCP_PR_DEBUG(ccid3_debug, format, ##a) @@ -44008,34 +43029,25 @@ diff -urNp linux-2.6.29.6/net/dccp/ccids/ccid3.c linux-2.6.29.6/net/dccp/ccids/c #endif /* -diff -urNp linux-2.6.29.6/net/dccp/dccp.h linux-2.6.29.6/net/dccp/dccp.h ---- linux-2.6.29.6/net/dccp/dccp.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/dccp/dccp.h 2009-07-23 17:34:32.235712173 -0400 -@@ -43,8 +43,8 @@ extern int dccp_debug; - #define dccp_pr_debug(format, a...) DCCP_PR_DEBUG(dccp_debug, format, ##a) +diff -urNp linux-2.6.30.4/net/dccp/dccp.h linux-2.6.30.4/net/dccp/dccp.h +--- linux-2.6.30.4/net/dccp/dccp.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/dccp/dccp.h 2009-07-30 09:48:10.154837046 -0400 +@@ -44,9 +44,9 @@ extern int dccp_debug; #define dccp_pr_debug_cat(format, a...) DCCP_PRINTK(dccp_debug, format, ##a) + #define dccp_debug(fmt, a...) dccp_pr_debug_cat(KERN_DEBUG fmt, ##a) #else -#define dccp_pr_debug(format, a...) -#define dccp_pr_debug_cat(format, a...) +-#define dccp_debug(format, a...) +#define dccp_pr_debug(format, a...) do {} while (0) +#define dccp_pr_debug_cat(format, a...) do {} while (0) ++#define dccp_debug(format, a...) do {} while (0) #endif extern struct inet_hashinfo dccp_hashinfo; -diff -urNp linux-2.6.29.6/net/ipv4/inet_connection_sock.c linux-2.6.29.6/net/ipv4/inet_connection_sock.c ---- linux-2.6.29.6/net/ipv4/inet_connection_sock.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv4/inet_connection_sock.c 2009-07-23 17:34:32.235712173 -0400 -@@ -15,6 +15,7 @@ - - #include <linux/module.h> - #include <linux/jhash.h> -+#include <linux/security.h> - - #include <net/inet_connection_sock.h> - #include <net/inet_hashtables.h> -diff -urNp linux-2.6.29.6/net/ipv4/inet_hashtables.c linux-2.6.29.6/net/ipv4/inet_hashtables.c ---- linux-2.6.29.6/net/ipv4/inet_hashtables.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv4/inet_hashtables.c 2009-07-23 17:34:32.235712173 -0400 +diff -urNp linux-2.6.30.4/net/ipv4/inet_hashtables.c linux-2.6.30.4/net/ipv4/inet_hashtables.c +--- linux-2.6.30.4/net/ipv4/inet_hashtables.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv4/inet_hashtables.c 2009-07-30 11:10:49.904544447 -0400 @@ -18,11 +18,14 @@ #include <linux/sched.h> #include <linux/slab.h> @@ -44051,7 +43063,7 @@ diff -urNp linux-2.6.29.6/net/ipv4/inet_hashtables.c linux-2.6.29.6/net/ipv4/ine /* * Allocate and initialize a new local port bind bucket. * The bindhash mutex for snum's hash chain must be held here. -@@ -481,6 +484,8 @@ ok: +@@ -490,6 +493,8 @@ ok: } spin_unlock(&head->lock); @@ -44060,9 +43072,9 @@ diff -urNp linux-2.6.29.6/net/ipv4/inet_hashtables.c linux-2.6.29.6/net/ipv4/ine if (tw) { inet_twsk_deschedule(tw, death_row); inet_twsk_put(tw); -diff -urNp linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c ---- linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-07-23 17:34:32.235712173 -0400 +diff -urNp linux-2.6.30.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.30.4/net/ipv4/netfilter/nf_nat_snmp_basic.c +--- linux-2.6.30.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2009-07-30 09:48:10.155784268 -0400 @@ -397,7 +397,7 @@ static unsigned char asn1_octets_decode( *len = 0; @@ -44072,10 +43084,10 @@ diff -urNp linux-2.6.29.6/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-2.6.29.6/ if (*octets == NULL) { if (net_ratelimit()) printk("OOM in bsalg (%d)\n", __LINE__); -diff -urNp linux-2.6.29.6/net/ipv4/tcp_ipv4.c linux-2.6.29.6/net/ipv4/tcp_ipv4.c ---- linux-2.6.29.6/net/ipv4/tcp_ipv4.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv4/tcp_ipv4.c 2009-07-23 17:34:32.236754222 -0400 -@@ -1512,6 +1512,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc +diff -urNp linux-2.6.30.4/net/ipv4/tcp_ipv4.c linux-2.6.30.4/net/ipv4/tcp_ipv4.c +--- linux-2.6.30.4/net/ipv4/tcp_ipv4.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv4/tcp_ipv4.c 2009-07-30 11:10:49.916766621 -0400 +@@ -1503,6 +1503,9 @@ int tcp_v4_do_rcv(struct sock *sk, struc return 0; reset: @@ -44085,7 +43097,7 @@ diff -urNp linux-2.6.29.6/net/ipv4/tcp_ipv4.c linux-2.6.29.6/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(rsk, skb); discard: kfree_skb(skb); -@@ -1620,6 +1623,9 @@ no_tcp_socket: +@@ -1611,6 +1614,9 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -44095,10 +43107,10 @@ diff -urNp linux-2.6.29.6/net/ipv4/tcp_ipv4.c linux-2.6.29.6/net/ipv4/tcp_ipv4.c tcp_v4_send_reset(NULL, skb); } -diff -urNp linux-2.6.29.6/net/ipv4/tcp_minisocks.c linux-2.6.29.6/net/ipv4/tcp_minisocks.c ---- linux-2.6.29.6/net/ipv4/tcp_minisocks.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv4/tcp_minisocks.c 2009-07-23 17:34:32.236754222 -0400 -@@ -695,8 +695,11 @@ listen_overflow: +diff -urNp linux-2.6.30.4/net/ipv4/tcp_minisocks.c linux-2.6.30.4/net/ipv4/tcp_minisocks.c +--- linux-2.6.30.4/net/ipv4/tcp_minisocks.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv4/tcp_minisocks.c 2009-07-30 11:10:49.922670152 -0400 +@@ -694,8 +694,11 @@ listen_overflow: embryonic_reset: NET_INC_STATS_BH(sock_net(sk), LINUX_MIB_EMBRYONICRSTS); @@ -44110,9 +43122,9 @@ diff -urNp linux-2.6.29.6/net/ipv4/tcp_minisocks.c linux-2.6.29.6/net/ipv4/tcp_m inet_csk_reqsk_queue_drop(sk, req, prev); return NULL; -diff -urNp linux-2.6.29.6/net/ipv4/udp.c linux-2.6.29.6/net/ipv4/udp.c ---- linux-2.6.29.6/net/ipv4/udp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv4/udp.c 2009-07-23 17:34:32.237793198 -0400 +diff -urNp linux-2.6.30.4/net/ipv4/udp.c linux-2.6.30.4/net/ipv4/udp.c +--- linux-2.6.30.4/net/ipv4/udp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv4/udp.c 2009-07-30 11:10:49.923319110 -0400 @@ -86,6 +86,7 @@ #include <linux/types.h> #include <linux/fcntl.h> @@ -44131,7 +43143,7 @@ diff -urNp linux-2.6.29.6/net/ipv4/udp.c linux-2.6.29.6/net/ipv4/udp.c /* * This routine is called by the ICMP module when it gets some * sort of error condition. If err < 0 then the socket should -@@ -630,9 +634,18 @@ int udp_sendmsg(struct kiocb *iocb, stru +@@ -631,9 +635,18 @@ int udp_sendmsg(struct kiocb *iocb, stru dport = usin->sin_port; if (dport == 0) return -EINVAL; @@ -44150,7 +43162,7 @@ diff -urNp linux-2.6.29.6/net/ipv4/udp.c linux-2.6.29.6/net/ipv4/udp.c daddr = inet->daddr; dport = inet->dport; /* Open fast path for connected socket. -@@ -898,6 +911,10 @@ try_again: +@@ -902,6 +915,10 @@ try_again: if (!skb) goto out; @@ -44161,7 +43173,7 @@ diff -urNp linux-2.6.29.6/net/ipv4/udp.c linux-2.6.29.6/net/ipv4/udp.c ulen = skb->len - sizeof(struct udphdr); copied = len; if (copied > ulen) -@@ -1288,6 +1305,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, +@@ -1292,6 +1309,9 @@ int __udp4_lib_rcv(struct sk_buff *skb, goto csum_error; UDP_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -44171,9 +43183,9 @@ diff -urNp linux-2.6.29.6/net/ipv4/udp.c linux-2.6.29.6/net/ipv4/udp.c icmp_send(skb, ICMP_DEST_UNREACH, ICMP_PORT_UNREACH, 0); /* -diff -urNp linux-2.6.29.6/net/ipv6/exthdrs.c linux-2.6.29.6/net/ipv6/exthdrs.c ---- linux-2.6.29.6/net/ipv6/exthdrs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv6/exthdrs.c 2009-07-23 17:34:32.237793198 -0400 +diff -urNp linux-2.6.30.4/net/ipv6/exthdrs.c linux-2.6.30.4/net/ipv6/exthdrs.c +--- linux-2.6.30.4/net/ipv6/exthdrs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv6/exthdrs.c 2009-07-30 09:48:10.155784268 -0400 @@ -630,7 +630,7 @@ static struct tlvtype_proc tlvprochopopt .type = IPV6_TLV_JUMBO, .func = ipv6_hop_jumbo, @@ -44183,9 +43195,9 @@ diff -urNp linux-2.6.29.6/net/ipv6/exthdrs.c linux-2.6.29.6/net/ipv6/exthdrs.c }; int ipv6_parse_hopopts(struct sk_buff *skb) -diff -urNp linux-2.6.29.6/net/ipv6/ip6mr.c linux-2.6.29.6/net/ipv6/ip6mr.c ---- linux-2.6.29.6/net/ipv6/ip6mr.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv6/ip6mr.c 2009-07-23 18:40:28.745511060 -0400 +diff -urNp linux-2.6.30.4/net/ipv6/ip6mr.c linux-2.6.30.4/net/ipv6/ip6mr.c +--- linux-2.6.30.4/net/ipv6/ip6mr.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv6/ip6mr.c 2009-07-30 09:48:10.156679415 -0400 @@ -204,7 +204,7 @@ static int ip6mr_vif_seq_show(struct seq return 0; } @@ -44222,9 +43234,9 @@ diff -urNp linux-2.6.29.6/net/ipv6/ip6mr.c linux-2.6.29.6/net/ipv6/ip6mr.c .owner = THIS_MODULE, .open = ipmr_mfc_open, .read = seq_read, -diff -urNp linux-2.6.29.6/net/ipv6/raw.c linux-2.6.29.6/net/ipv6/raw.c ---- linux-2.6.29.6/net/ipv6/raw.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv6/raw.c 2009-07-23 17:34:32.237793198 -0400 +diff -urNp linux-2.6.30.4/net/ipv6/raw.c linux-2.6.30.4/net/ipv6/raw.c +--- linux-2.6.30.4/net/ipv6/raw.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv6/raw.c 2009-07-30 09:48:10.156679415 -0400 @@ -600,7 +600,7 @@ out: return err; } @@ -44234,10 +43246,10 @@ diff -urNp linux-2.6.29.6/net/ipv6/raw.c linux-2.6.29.6/net/ipv6/raw.c struct flowi *fl, struct rt6_info *rt, unsigned int flags) { -diff -urNp linux-2.6.29.6/net/ipv6/tcp_ipv6.c linux-2.6.29.6/net/ipv6/tcp_ipv6.c ---- linux-2.6.29.6/net/ipv6/tcp_ipv6.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv6/tcp_ipv6.c 2009-07-23 17:34:32.238737195 -0400 -@@ -1576,6 +1576,9 @@ static int tcp_v6_do_rcv(struct sock *sk +diff -urNp linux-2.6.30.4/net/ipv6/tcp_ipv6.c linux-2.6.30.4/net/ipv6/tcp_ipv6.c +--- linux-2.6.30.4/net/ipv6/tcp_ipv6.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv6/tcp_ipv6.c 2009-07-30 11:10:49.952595469 -0400 +@@ -1575,6 +1575,9 @@ static int tcp_v6_do_rcv(struct sock *sk return 0; reset: @@ -44247,7 +43259,7 @@ diff -urNp linux-2.6.29.6/net/ipv6/tcp_ipv6.c linux-2.6.29.6/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(sk, skb); discard: if (opt_skb) -@@ -1699,6 +1702,9 @@ no_tcp_socket: +@@ -1697,6 +1700,9 @@ no_tcp_socket: bad_packet: TCP_INC_STATS_BH(net, TCP_MIB_INERRS); } else { @@ -44257,10 +43269,10 @@ diff -urNp linux-2.6.29.6/net/ipv6/tcp_ipv6.c linux-2.6.29.6/net/ipv6/tcp_ipv6.c tcp_v6_send_reset(NULL, skb); } -diff -urNp linux-2.6.29.6/net/ipv6/udp.c linux-2.6.29.6/net/ipv6/udp.c ---- linux-2.6.29.6/net/ipv6/udp.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/ipv6/udp.c 2009-07-23 17:34:32.238737195 -0400 -@@ -558,6 +558,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, +diff -urNp linux-2.6.30.4/net/ipv6/udp.c linux-2.6.30.4/net/ipv6/udp.c +--- linux-2.6.30.4/net/ipv6/udp.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/ipv6/udp.c 2009-07-30 11:10:49.959325956 -0400 +@@ -590,6 +590,9 @@ int __udp6_lib_rcv(struct sk_buff *skb, UDP6_INC_STATS_BH(net, UDP_MIB_NOPORTS, proto == IPPROTO_UDPLITE); @@ -44270,10 +43282,10 @@ diff -urNp linux-2.6.29.6/net/ipv6/udp.c linux-2.6.29.6/net/ipv6/udp.c icmpv6_send(skb, ICMPV6_DEST_UNREACH, ICMPV6_PORT_UNREACH, 0, dev); kfree_skb(skb); -diff -urNp linux-2.6.29.6/net/key/af_key.c linux-2.6.29.6/net/key/af_key.c ---- linux-2.6.29.6/net/key/af_key.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/key/af_key.c 2009-07-23 18:40:28.770272617 -0400 -@@ -3707,7 +3707,7 @@ static void pfkey_seq_stop(struct seq_fi +diff -urNp linux-2.6.30.4/net/key/af_key.c linux-2.6.30.4/net/key/af_key.c +--- linux-2.6.30.4/net/key/af_key.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/key/af_key.c 2009-07-30 09:48:10.157841054 -0400 +@@ -3705,7 +3705,7 @@ static void pfkey_seq_stop(struct seq_fi read_unlock(&pfkey_table_lock); } @@ -44282,7 +43294,7 @@ diff -urNp linux-2.6.29.6/net/key/af_key.c linux-2.6.29.6/net/key/af_key.c .start = pfkey_seq_start, .next = pfkey_seq_next, .stop = pfkey_seq_stop, -@@ -3720,7 +3720,7 @@ static int pfkey_seq_open(struct inode * +@@ -3718,7 +3718,7 @@ static int pfkey_seq_open(struct inode * sizeof(struct seq_net_private)); } @@ -44291,22 +43303,22 @@ diff -urNp linux-2.6.29.6/net/key/af_key.c linux-2.6.29.6/net/key/af_key.c .open = pfkey_seq_open, .read = seq_read, .llseek = seq_lseek, -diff -urNp linux-2.6.29.6/net/mac80211/ieee80211_i.h linux-2.6.29.6/net/mac80211/ieee80211_i.h ---- linux-2.6.29.6/net/mac80211/ieee80211_i.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/mac80211/ieee80211_i.h 2009-07-23 17:34:32.239733592 -0400 -@@ -562,7 +562,7 @@ struct ieee80211_local { - unsigned long queue_stop_reasons[IEEE80211_MAX_QUEUES]; +diff -urNp linux-2.6.30.4/net/mac80211/ieee80211_i.h linux-2.6.30.4/net/mac80211/ieee80211_i.h +--- linux-2.6.30.4/net/mac80211/ieee80211_i.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/mac80211/ieee80211_i.h 2009-07-30 09:48:10.157841054 -0400 +@@ -599,7 +599,7 @@ struct ieee80211_local { spinlock_t queue_stop_reason_lock; + struct net_device *mdev; /* wmaster# - "master" 802.11 device */ - int open_count; + atomic_t open_count; int monitors, cooked_mntrs; /* number of interfaces with corresponding FIF_ flags */ int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss; -diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface.c ---- linux-2.6.29.6/net/mac80211/iface.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/mac80211/iface.c 2009-07-23 17:34:32.239733592 -0400 -@@ -146,7 +146,7 @@ static int ieee80211_open(struct net_dev +diff -urNp linux-2.6.30.4/net/mac80211/iface.c linux-2.6.30.4/net/mac80211/iface.c +--- linux-2.6.30.4/net/mac80211/iface.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/mac80211/iface.c 2009-07-30 09:48:10.157841054 -0400 +@@ -163,7 +163,7 @@ static int ieee80211_open(struct net_dev break; } @@ -44315,7 +43327,7 @@ diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface res = 0; if (local->ops->start) res = local->ops->start(local_to_hw(local)); -@@ -182,7 +182,7 @@ static int ieee80211_open(struct net_dev +@@ -199,7 +199,7 @@ static int ieee80211_open(struct net_dev * Validate the MAC address for this device. */ if (!is_valid_ether_addr(dev->dev_addr)) { @@ -44324,7 +43336,7 @@ diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface local->ops->stop(local_to_hw(local)); return -EADDRNOTAVAIL; } -@@ -267,7 +267,7 @@ static int ieee80211_open(struct net_dev +@@ -286,7 +286,7 @@ static int ieee80211_open(struct net_dev } } @@ -44333,7 +43345,7 @@ diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface res = dev_open(local->mdev); WARN_ON(res); if (res) -@@ -287,7 +287,7 @@ static int ieee80211_open(struct net_dev +@@ -306,7 +306,7 @@ static int ieee80211_open(struct net_dev if (sdata->flags & IEEE80211_SDATA_PROMISC) atomic_inc(&local->iff_promiscs); @@ -44342,7 +43354,7 @@ diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface if (hw_reconf_flags) { ieee80211_hw_config(local, hw_reconf_flags); /* -@@ -316,7 +316,7 @@ static int ieee80211_open(struct net_dev +@@ -334,7 +334,7 @@ static int ieee80211_open(struct net_dev err_del_interface: local->ops->remove_interface(local_to_hw(local), &conf); err_stop: @@ -44351,7 +43363,7 @@ diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface local->ops->stop(local_to_hw(local)); err_del_bss: sdata->bss = NULL; -@@ -401,7 +401,7 @@ static int ieee80211_stop(struct net_dev +@@ -432,7 +432,7 @@ static int ieee80211_stop(struct net_dev WARN_ON(!list_empty(&sdata->u.ap.vlans)); } @@ -44360,7 +43372,7 @@ diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface switch (sdata->vif.type) { case NL80211_IFTYPE_AP_VLAN: -@@ -514,7 +514,7 @@ static int ieee80211_stop(struct net_dev +@@ -554,7 +554,7 @@ static int ieee80211_stop(struct net_dev sdata->bss = NULL; @@ -44369,10 +43381,10 @@ diff -urNp linux-2.6.29.6/net/mac80211/iface.c linux-2.6.29.6/net/mac80211/iface if (netif_running(local->mdev)) dev_close(local->mdev); -diff -urNp linux-2.6.29.6/net/mac80211/main.c linux-2.6.29.6/net/mac80211/main.c ---- linux-2.6.29.6/net/mac80211/main.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/mac80211/main.c 2009-07-23 17:34:32.239733592 -0400 -@@ -233,7 +233,7 @@ int ieee80211_hw_config(struct ieee80211 +diff -urNp linux-2.6.30.4/net/mac80211/main.c linux-2.6.30.4/net/mac80211/main.c +--- linux-2.6.30.4/net/mac80211/main.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/mac80211/main.c 2009-07-30 09:48:10.158959820 -0400 +@@ -266,7 +266,7 @@ int ieee80211_hw_config(struct ieee80211 local->hw.conf.power_level = power; } @@ -44381,10 +43393,31 @@ diff -urNp linux-2.6.29.6/net/mac80211/main.c linux-2.6.29.6/net/mac80211/main.c ret = local->ops->config(local_to_hw(local), changed); /* * Goal: -diff -urNp linux-2.6.29.6/net/mac80211/rate.c linux-2.6.29.6/net/mac80211/rate.c ---- linux-2.6.29.6/net/mac80211/rate.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/mac80211/rate.c 2009-07-23 17:34:32.240714874 -0400 -@@ -256,7 +256,7 @@ int ieee80211_init_rate_ctrl_alg(struct +diff -urNp linux-2.6.30.4/net/mac80211/pm.c linux-2.6.30.4/net/mac80211/pm.c +--- linux-2.6.30.4/net/mac80211/pm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/mac80211/pm.c 2009-07-30 09:48:10.158959820 -0400 +@@ -65,7 +65,7 @@ int __ieee80211_suspend(struct ieee80211 + flush_workqueue(local->hw.workqueue); + + /* stop hardware */ +- if (local->open_count) { ++ if (atomic_read(&local->open_count)) { + ieee80211_led_radio(local, false); + local->ops->stop(hw); + } +@@ -82,7 +82,7 @@ int __ieee80211_resume(struct ieee80211_ + int res; + + /* restart hardware */ +- if (local->open_count) { ++ if (atomic_read(&local->open_count)) { + res = local->ops->start(hw); + + ieee80211_led_radio(local, hw->conf.radio_enabled); +diff -urNp linux-2.6.30.4/net/mac80211/rate.c linux-2.6.30.4/net/mac80211/rate.c +--- linux-2.6.30.4/net/mac80211/rate.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/mac80211/rate.c 2009-07-30 09:48:10.158959820 -0400 +@@ -258,7 +258,7 @@ int ieee80211_init_rate_ctrl_alg(struct struct rate_control_ref *ref, *old; ASSERT_RTNL(); @@ -44393,9 +43426,9 @@ diff -urNp linux-2.6.29.6/net/mac80211/rate.c linux-2.6.29.6/net/mac80211/rate.c return -EBUSY; ref = rate_control_alloc(name, local); -diff -urNp linux-2.6.29.6/net/mac80211/rc80211_minstrel_debugfs.c linux-2.6.29.6/net/mac80211/rc80211_minstrel_debugfs.c ---- linux-2.6.29.6/net/mac80211/rc80211_minstrel_debugfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/mac80211/rc80211_minstrel_debugfs.c 2009-07-23 18:40:28.777436731 -0400 +diff -urNp linux-2.6.30.4/net/mac80211/rc80211_minstrel_debugfs.c linux-2.6.30.4/net/mac80211/rc80211_minstrel_debugfs.c +--- linux-2.6.30.4/net/mac80211/rc80211_minstrel_debugfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/mac80211/rc80211_minstrel_debugfs.c 2009-07-30 09:48:10.158959820 -0400 @@ -139,7 +139,7 @@ minstrel_stats_release(struct inode *ino return 0; } @@ -44405,9 +43438,9 @@ diff -urNp linux-2.6.29.6/net/mac80211/rc80211_minstrel_debugfs.c linux-2.6.29.6 .owner = THIS_MODULE, .open = minstrel_stats_open, .read = minstrel_stats_read, -diff -urNp linux-2.6.29.6/net/mac80211/rc80211_pid_debugfs.c linux-2.6.29.6/net/mac80211/rc80211_pid_debugfs.c ---- linux-2.6.29.6/net/mac80211/rc80211_pid_debugfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/mac80211/rc80211_pid_debugfs.c 2009-07-23 18:40:28.783149857 -0400 +diff -urNp linux-2.6.30.4/net/mac80211/rc80211_pid_debugfs.c linux-2.6.30.4/net/mac80211/rc80211_pid_debugfs.c +--- linux-2.6.30.4/net/mac80211/rc80211_pid_debugfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/mac80211/rc80211_pid_debugfs.c 2009-07-30 09:48:10.158959820 -0400 @@ -198,7 +198,7 @@ static ssize_t rate_control_pid_events_r #undef RC_PID_PRINT_BUF_SIZE @@ -44417,10 +43450,10 @@ diff -urNp linux-2.6.29.6/net/mac80211/rc80211_pid_debugfs.c linux-2.6.29.6/net/ .owner = THIS_MODULE, .read = rate_control_pid_events_read, .poll = rate_control_pid_events_poll, -diff -urNp linux-2.6.29.6/net/packet/af_packet.c linux-2.6.29.6/net/packet/af_packet.c ---- linux-2.6.29.6/net/packet/af_packet.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/packet/af_packet.c 2009-07-23 18:40:28.789919912 -0400 -@@ -1741,7 +1741,7 @@ static void packet_mm_close(struct vm_ar +diff -urNp linux-2.6.30.4/net/packet/af_packet.c linux-2.6.30.4/net/packet/af_packet.c +--- linux-2.6.30.4/net/packet/af_packet.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/packet/af_packet.c 2009-07-30 09:48:10.160018712 -0400 +@@ -1740,7 +1740,7 @@ static void packet_mm_close(struct vm_ar atomic_dec(&pkt_sk(sk)->mapped); } @@ -44429,9 +43462,9 @@ diff -urNp linux-2.6.29.6/net/packet/af_packet.c linux-2.6.29.6/net/packet/af_pa .open = packet_mm_open, .close =packet_mm_close, }; -diff -urNp linux-2.6.29.6/net/sctp/socket.c linux-2.6.29.6/net/sctp/socket.c ---- linux-2.6.29.6/net/sctp/socket.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/sctp/socket.c 2009-07-23 17:34:32.240714874 -0400 +diff -urNp linux-2.6.30.4/net/sctp/socket.c linux-2.6.30.4/net/sctp/socket.c +--- linux-2.6.30.4/net/sctp/socket.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/sctp/socket.c 2009-07-30 09:48:10.161030758 -0400 @@ -1434,7 +1434,7 @@ SCTP_STATIC int sctp_sendmsg(struct kioc struct sctp_sndrcvinfo *sinfo; struct sctp_initmsg *sinit; @@ -44441,7 +43474,7 @@ diff -urNp linux-2.6.29.6/net/sctp/socket.c linux-2.6.29.6/net/sctp/socket.c int err; sctp_scope_t scope; long timeo; -@@ -5756,7 +5756,6 @@ pp_found: +@@ -5750,7 +5750,6 @@ pp_found: */ int reuse = sk->sk_reuse; struct sock *sk2; @@ -44449,9 +43482,9 @@ diff -urNp linux-2.6.29.6/net/sctp/socket.c linux-2.6.29.6/net/sctp/socket.c SCTP_DEBUG_PRINTK("sctp_get_port() found a possible match\n"); if (pp->fastreuse && sk->sk_reuse && -diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c ---- linux-2.6.29.6/net/socket.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/socket.c 2009-07-23 19:30:30.968455360 -0400 +diff -urNp linux-2.6.30.4/net/socket.c linux-2.6.30.4/net/socket.c +--- linux-2.6.30.4/net/socket.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/socket.c 2009-07-30 11:29:24.032618401 -0400 @@ -86,6 +86,7 @@ #include <linux/audit.h> #include <linux/wireless.h> @@ -44500,16 +43533,7 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c static struct file_system_type sock_fs_type = { .name = "sockfs", -@@ -328,7 +344,7 @@ static char *sockfs_dname(struct dentry - dentry->d_inode->i_ino); - } - --static struct dentry_operations sockfs_dentry_operations = { -+static const struct dentry_operations sockfs_dentry_operations = { - .d_delete = sockfs_delete_dentry, - .d_dname = sockfs_dname, - }; -@@ -1234,6 +1250,16 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1283,6 +1299,16 @@ SYSCALL_DEFINE3(socket, int, family, int if (SOCK_NONBLOCK != O_NONBLOCK && (flags & SOCK_NONBLOCK)) flags = (flags & ~SOCK_NONBLOCK) | O_NONBLOCK; @@ -44526,7 +43550,7 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c retval = sock_create(family, type, protocol, &sock); if (retval < 0) goto out; -@@ -1366,6 +1392,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so +@@ -1415,6 +1441,14 @@ SYSCALL_DEFINE3(bind, int, fd, struct so if (sock) { err = move_addr_to_kernel(umyaddr, addrlen, (struct sockaddr *)&address); if (err >= 0) { @@ -44541,7 +43565,7 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c err = security_socket_bind(sock, (struct sockaddr *)&address, addrlen); -@@ -1374,6 +1408,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so +@@ -1423,6 +1457,7 @@ SYSCALL_DEFINE3(bind, int, fd, struct so (struct sockaddr *) &address, addrlen); } @@ -44549,7 +43573,7 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c fput_light(sock->file, fput_needed); } return err; -@@ -1397,10 +1432,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba +@@ -1446,10 +1481,20 @@ SYSCALL_DEFINE2(listen, int, fd, int, ba if ((unsigned)backlog > somaxconn) backlog = somaxconn; @@ -44570,7 +43594,7 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c fput_light(sock->file, fput_needed); } return err; -@@ -1443,6 +1488,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct +@@ -1492,6 +1537,18 @@ SYSCALL_DEFINE4(accept4, int, fd, struct newsock->type = sock->type; newsock->ops = sock->ops; @@ -44589,15 +43613,16 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c /* * We don't need try_module_get here, as the listening socket (sock) * has the protocol module (sock->ops->owner) held. -@@ -1486,6 +1543,7 @@ SYSCALL_DEFINE4(accept4, int, fd, struct +@@ -1534,6 +1591,8 @@ SYSCALL_DEFINE4(accept4, int, fd, struct + fd_install(newfd, newfile); err = newfd; - security_socket_post_accept(sock, newsock); + gr_attach_curr_ip(newsock->sk); - ++ out_put: fput_light(sock->file, fput_needed); -@@ -1524,6 +1582,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct + out: +@@ -1571,6 +1630,7 @@ SYSCALL_DEFINE3(connect, int, fd, struct int, addrlen) { struct socket *sock; @@ -44605,7 +43630,7 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c struct sockaddr_storage address; int err, fput_needed; -@@ -1534,6 +1593,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct +@@ -1581,6 +1641,17 @@ SYSCALL_DEFINE3(connect, int, fd, struct if (err < 0) goto out_put; @@ -44623,18 +43648,9 @@ diff -urNp linux-2.6.29.6/net/socket.c linux-2.6.29.6/net/socket.c err = security_socket_connect(sock, (struct sockaddr *)&address, addrlen); if (err) -diff -urNp linux-2.6.29.6/net/sunrpc/rpc_pipe.c linux-2.6.29.6/net/sunrpc/rpc_pipe.c ---- linux-2.6.29.6/net/sunrpc/rpc_pipe.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/sunrpc/rpc_pipe.c 2009-07-23 18:40:28.803536193 -0400 -@@ -480,7 +480,7 @@ static int rpc_delete_dentry(struct dent - return 1; - } - --static struct dentry_operations rpc_dentry_operations = { -+static const struct dentry_operations rpc_dentry_operations = { - .d_delete = rpc_delete_dentry, - }; - +diff -urNp linux-2.6.30.4/net/sunrpc/rpc_pipe.c linux-2.6.30.4/net/sunrpc/rpc_pipe.c +--- linux-2.6.30.4/net/sunrpc/rpc_pipe.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/sunrpc/rpc_pipe.c 2009-07-30 12:07:21.048974939 -0400 @@ -858,7 +858,7 @@ EXPORT_SYMBOL_GPL(rpc_unlink); /* * populate the filesystem @@ -44644,9 +43660,9 @@ diff -urNp linux-2.6.29.6/net/sunrpc/rpc_pipe.c linux-2.6.29.6/net/sunrpc/rpc_pi .alloc_inode = rpc_alloc_inode, .destroy_inode = rpc_destroy_inode, .statfs = simple_statfs, -diff -urNp linux-2.6.29.6/net/unix/af_unix.c linux-2.6.29.6/net/unix/af_unix.c ---- linux-2.6.29.6/net/unix/af_unix.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/unix/af_unix.c 2009-07-23 17:34:32.242831111 -0400 +diff -urNp linux-2.6.30.4/net/unix/af_unix.c linux-2.6.30.4/net/unix/af_unix.c +--- linux-2.6.30.4/net/unix/af_unix.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/unix/af_unix.c 2009-07-30 11:10:49.995552784 -0400 @@ -734,6 +734,12 @@ static struct sock *unix_find_other(stru err = -ECONNREFUSED; if (!S_ISSOCK(inode->i_mode)) @@ -44704,9 +43720,9 @@ diff -urNp linux-2.6.29.6/net/unix/af_unix.c linux-2.6.29.6/net/unix/af_unix.c list = &unix_socket_table[addr->hash]; } else { list = &unix_socket_table[dentry->d_inode->i_ino & (UNIX_HASH_SIZE-1)]; -diff -urNp linux-2.6.29.6/net/xfrm/xfrm_proc.c linux-2.6.29.6/net/xfrm/xfrm_proc.c ---- linux-2.6.29.6/net/xfrm/xfrm_proc.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/net/xfrm/xfrm_proc.c 2009-07-23 18:40:28.814555102 -0400 +diff -urNp linux-2.6.30.4/net/xfrm/xfrm_proc.c linux-2.6.30.4/net/xfrm/xfrm_proc.c +--- linux-2.6.30.4/net/xfrm/xfrm_proc.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/net/xfrm/xfrm_proc.c 2009-07-30 09:48:10.161962049 -0400 @@ -60,7 +60,7 @@ static int xfrm_statistics_seq_open(stru return single_open_net(inode, file, xfrm_statistics_seq_show); } @@ -44716,9 +43732,9 @@ diff -urNp linux-2.6.29.6/net/xfrm/xfrm_proc.c linux-2.6.29.6/net/xfrm/xfrm_proc .owner = THIS_MODULE, .open = xfrm_statistics_seq_open, .read = seq_read, -diff -urNp linux-2.6.29.6/samples/markers/marker-example.c linux-2.6.29.6/samples/markers/marker-example.c ---- linux-2.6.29.6/samples/markers/marker-example.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/samples/markers/marker-example.c 2009-07-23 18:40:28.823705055 -0400 +diff -urNp linux-2.6.30.4/samples/markers/marker-example.c linux-2.6.30.4/samples/markers/marker-example.c +--- linux-2.6.30.4/samples/markers/marker-example.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/samples/markers/marker-example.c 2009-07-30 09:48:10.161962049 -0400 @@ -26,7 +26,7 @@ static int my_open(struct inode *inode, return -EPERM; } @@ -44728,9 +43744,9 @@ diff -urNp linux-2.6.29.6/samples/markers/marker-example.c linux-2.6.29.6/sample .open = my_open, }; -diff -urNp linux-2.6.29.6/samples/tracepoints/tracepoint-sample.c linux-2.6.29.6/samples/tracepoints/tracepoint-sample.c ---- linux-2.6.29.6/samples/tracepoints/tracepoint-sample.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/samples/tracepoints/tracepoint-sample.c 2009-07-23 18:40:28.824321350 -0400 +diff -urNp linux-2.6.30.4/samples/tracepoints/tracepoint-sample.c linux-2.6.30.4/samples/tracepoints/tracepoint-sample.c +--- linux-2.6.30.4/samples/tracepoints/tracepoint-sample.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/samples/tracepoints/tracepoint-sample.c 2009-07-30 09:48:10.161962049 -0400 @@ -28,7 +28,7 @@ static int my_open(struct inode *inode, return -EPERM; } @@ -44740,10 +43756,10 @@ diff -urNp linux-2.6.29.6/samples/tracepoints/tracepoint-sample.c linux-2.6.29.6 .open = my_open, }; -diff -urNp linux-2.6.29.6/scripts/mod/modpost.c linux-2.6.29.6/scripts/mod/modpost.c ---- linux-2.6.29.6/scripts/mod/modpost.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/scripts/mod/modpost.c 2009-07-23 17:34:32.242831111 -0400 -@@ -830,6 +830,7 @@ enum mismatch { +diff -urNp linux-2.6.30.4/scripts/mod/modpost.c linux-2.6.30.4/scripts/mod/modpost.c +--- linux-2.6.30.4/scripts/mod/modpost.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/scripts/mod/modpost.c 2009-07-30 09:48:10.162851614 -0400 +@@ -831,6 +831,7 @@ enum mismatch { INIT_TO_EXIT, EXIT_TO_INIT, EXPORT_TO_INIT_EXIT, @@ -44751,7 +43767,7 @@ diff -urNp linux-2.6.29.6/scripts/mod/modpost.c linux-2.6.29.6/scripts/mod/modpo }; struct sectioncheck { -@@ -891,6 +892,12 @@ const struct sectioncheck sectioncheck[] +@@ -892,6 +893,12 @@ const struct sectioncheck sectioncheck[] .fromsec = { "__ksymtab*", NULL }, .tosec = { INIT_SECTIONS, EXIT_SECTIONS, NULL }, .mismatch = EXPORT_TO_INIT_EXIT @@ -44764,7 +43780,7 @@ diff -urNp linux-2.6.29.6/scripts/mod/modpost.c linux-2.6.29.6/scripts/mod/modpo } }; -@@ -1249,6 +1256,14 @@ static void report_sec_mismatch(const ch +@@ -1240,6 +1247,14 @@ static void report_sec_mismatch(const ch "Fix this by removing the %sannotation of %s " "or drop the export.\n", tosym, sec2annotation(tosec), sec2annotation(tosec), tosym); @@ -44779,9 +43795,9 @@ diff -urNp linux-2.6.29.6/scripts/mod/modpost.c linux-2.6.29.6/scripts/mod/modpo case NO_MISMATCH: /* To get warnings on missing members */ break; -diff -urNp linux-2.6.29.6/scripts/pnmtologo.c linux-2.6.29.6/scripts/pnmtologo.c ---- linux-2.6.29.6/scripts/pnmtologo.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/scripts/pnmtologo.c 2009-07-23 17:34:32.243888317 -0400 +diff -urNp linux-2.6.30.4/scripts/pnmtologo.c linux-2.6.30.4/scripts/pnmtologo.c +--- linux-2.6.30.4/scripts/pnmtologo.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/scripts/pnmtologo.c 2009-07-30 09:48:10.162851614 -0400 @@ -237,14 +237,14 @@ static void write_header(void) fprintf(out, " * Linux logo %s\n", logoname); fputs(" */\n\n", out); @@ -44808,9 +43824,9 @@ diff -urNp linux-2.6.29.6/scripts/pnmtologo.c linux-2.6.29.6/scripts/pnmtologo.c logoname); write_hex_cnt = 0; for (i = 0; i < logo_clutsize; i++) { -diff -urNp linux-2.6.29.6/security/commoncap.c linux-2.6.29.6/security/commoncap.c ---- linux-2.6.29.6/security/commoncap.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/security/commoncap.c 2009-07-23 17:34:32.243888317 -0400 +diff -urNp linux-2.6.30.4/security/commoncap.c linux-2.6.30.4/security/commoncap.c +--- linux-2.6.30.4/security/commoncap.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/security/commoncap.c 2009-07-30 11:10:50.017289381 -0400 @@ -28,9 +28,11 @@ #include <linux/prctl.h> #include <linux/securebits.h> @@ -44824,10 +43840,76 @@ diff -urNp linux-2.6.29.6/security/commoncap.c linux-2.6.29.6/security/commoncap return 0; } -diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig ---- linux-2.6.29.6/security/Kconfig 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/security/Kconfig 2009-07-23 17:35:37.439768706 -0400 -@@ -4,6 +4,465 @@ +diff -urNp linux-2.6.30.4/security/integrity/ima/ima_fs.c linux-2.6.30.4/security/integrity/ima/ima_fs.c +--- linux-2.6.30.4/security/integrity/ima/ima_fs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/security/integrity/ima/ima_fs.c 2009-07-30 12:06:52.190847656 -0400 +@@ -42,7 +42,7 @@ static ssize_t ima_show_htable_violation + return ima_show_htable_value(buf, count, ppos, &ima_htable.violations); + } + +-static struct file_operations ima_htable_violations_ops = { ++static const struct file_operations ima_htable_violations_ops = { + .read = ima_show_htable_violations + }; + +@@ -54,7 +54,7 @@ static ssize_t ima_show_measurements_cou + + } + +-static struct file_operations ima_measurements_count_ops = { ++static const struct file_operations ima_measurements_count_ops = { + .read = ima_show_measurements_count + }; + +@@ -145,7 +145,7 @@ static int ima_measurements_show(struct + return 0; + } + +-static struct seq_operations ima_measurments_seqops = { ++static const struct seq_operations ima_measurments_seqops = { + .start = ima_measurements_start, + .next = ima_measurements_next, + .stop = ima_measurements_stop, +@@ -157,7 +157,7 @@ static int ima_measurements_open(struct + return seq_open(file, &ima_measurments_seqops); + } + +-static struct file_operations ima_measurements_ops = { ++static const struct file_operations ima_measurements_ops = { + .open = ima_measurements_open, + .read = seq_read, + .llseek = seq_lseek, +@@ -220,7 +220,7 @@ static int ima_ascii_measurements_show(s + return 0; + } + +-static struct seq_operations ima_ascii_measurements_seqops = { ++static const struct seq_operations ima_ascii_measurements_seqops = { + .start = ima_measurements_start, + .next = ima_measurements_next, + .stop = ima_measurements_stop, +@@ -232,7 +232,7 @@ static int ima_ascii_measurements_open(s + return seq_open(file, &ima_ascii_measurements_seqops); + } + +-static struct file_operations ima_ascii_measurements_ops = { ++static const struct file_operations ima_ascii_measurements_ops = { + .open = ima_ascii_measurements_open, + .read = seq_read, + .llseek = seq_lseek, +@@ -309,7 +309,7 @@ static int ima_release_policy(struct ino + return 0; + } + +-static struct file_operations ima_measure_policy_ops = { ++static const struct file_operations ima_measure_policy_ops = { + .open = ima_open_policy, + .write = ima_write_policy, + .release = ima_release_policy +diff -urNp linux-2.6.30.4/security/Kconfig linux-2.6.30.4/security/Kconfig +--- linux-2.6.30.4/security/Kconfig 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/security/Kconfig 2009-07-30 11:10:50.021298651 -0400 +@@ -4,6 +4,467 @@ menu "Security options" @@ -44953,7 +44035,7 @@ diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig + +config PAX_PAGEEXEC + bool "Paging based non-executable pages" -+ depends on !COMPAT_VDSO && PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7) ++ depends on PAX_NOEXEC && (!X86_32 || M586 || M586TSC || M586MMX || M686 || MPENTIUMII || MPENTIUMIII || MPENTIUMM || MCORE2 || MPENTIUM4 || MPSC || MK7 || MK8 || MWINCHIPC6 || MWINCHIP2 || MWINCHIP3D || MVIAC3_2 || MVIAC7) + help + This implementation is based on the paging feature of the CPU. + On i386 without hardware non-executable bit support there is a @@ -44972,7 +44054,7 @@ diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig + +config PAX_SEGMEXEC + bool "Segmentation based non-executable pages" -+ depends on !COMPAT_VDSO && PAX_NOEXEC && X86_32 ++ depends on PAX_NOEXEC && X86_32 + help + This implementation is based on the segmentation feature of the + CPU and has a very small performance impact, however applications @@ -45118,7 +44200,7 @@ diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig + +config PAX_KERNEXEC + bool "Enforce non-executable kernel pages" -+ depends on PAX_NOEXEC && X86 && !EFI && !COMPAT_VDSO && (!X86_32 || X86_WP_WORKS_OK) && !PARAVIRT ++ depends on PAX_NOEXEC && X86 && (!X86_32 || X86_WP_WORKS_OK) + help + This is the kernel land equivalent of PAGEEXEC and MPROTECT, + that is, enabling this option will make it harder to inject @@ -45234,7 +44316,7 @@ diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig + +config PAX_MEMORY_UDEREF + bool "Prevent invalid userland pointer dereference" -+ depends on X86_32 && !COMPAT_VDSO && !UML_X86 ++ depends on X86_32 && !UML_X86 + help + By saying Y here the kernel will be prevented from dereferencing + userland pointers in contexts where the kernel expects only kernel @@ -45286,6 +44368,8 @@ diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig + Note that the current implementation provides the strictest checks + for the SLUB allocator. + ++ Since this has a negligible performance impact, you should enable ++ this feature. +endmenu + +endmenu @@ -45293,10 +44377,10 @@ diff -urNp linux-2.6.29.6/security/Kconfig linux-2.6.29.6/security/Kconfig config KEYS bool "Enable access key retention support" help -diff -urNp linux-2.6.29.6/security/smack/smackfs.c linux-2.6.29.6/security/smack/smackfs.c ---- linux-2.6.29.6/security/smack/smackfs.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/security/smack/smackfs.c 2009-07-23 18:40:28.832499629 -0400 -@@ -179,7 +179,7 @@ static void load_seq_stop(struct seq_fil +diff -urNp linux-2.6.30.4/security/smack/smackfs.c linux-2.6.30.4/security/smack/smackfs.c +--- linux-2.6.30.4/security/smack/smackfs.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/security/smack/smackfs.c 2009-07-30 09:48:10.163665437 -0400 +@@ -186,7 +186,7 @@ static void load_seq_stop(struct seq_fil /* No-op */ } @@ -45305,7 +44389,7 @@ diff -urNp linux-2.6.29.6/security/smack/smackfs.c linux-2.6.29.6/security/smack .start = load_seq_start, .next = load_seq_next, .show = load_seq_show, -@@ -491,7 +491,7 @@ static void cipso_seq_stop(struct seq_fi +@@ -502,7 +502,7 @@ static void cipso_seq_stop(struct seq_fi /* No-op */ } @@ -45314,7 +44398,7 @@ diff -urNp linux-2.6.29.6/security/smack/smackfs.c linux-2.6.29.6/security/smack .start = cipso_seq_start, .stop = cipso_seq_stop, .next = cipso_seq_next, -@@ -675,7 +675,7 @@ static void netlbladdr_seq_stop(struct s +@@ -696,7 +696,7 @@ static void netlbladdr_seq_stop(struct s /* No-op */ } @@ -45323,10 +44407,10 @@ diff -urNp linux-2.6.29.6/security/smack/smackfs.c linux-2.6.29.6/security/smack .start = netlbladdr_seq_start, .stop = netlbladdr_seq_stop, .next = netlbladdr_seq_next, -diff -urNp linux-2.6.29.6/sound/core/oss/pcm_oss.c linux-2.6.29.6/sound/core/oss/pcm_oss.c ---- linux-2.6.29.6/sound/core/oss/pcm_oss.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/core/oss/pcm_oss.c 2009-07-23 17:34:32.245757940 -0400 -@@ -2929,8 +2929,8 @@ static void snd_pcm_oss_proc_done(struct +diff -urNp linux-2.6.30.4/sound/core/oss/pcm_oss.c linux-2.6.30.4/sound/core/oss/pcm_oss.c +--- linux-2.6.30.4/sound/core/oss/pcm_oss.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/core/oss/pcm_oss.c 2009-07-30 09:48:10.164791187 -0400 +@@ -2944,8 +2944,8 @@ static void snd_pcm_oss_proc_done(struct } } #else /* !CONFIG_SND_VERBOSE_PROCFS */ @@ -45337,9 +44421,9 @@ diff -urNp linux-2.6.29.6/sound/core/oss/pcm_oss.c linux-2.6.29.6/sound/core/oss #endif /* CONFIG_SND_VERBOSE_PROCFS */ /* -diff -urNp linux-2.6.29.6/sound/core/seq/seq_lock.h linux-2.6.29.6/sound/core/seq/seq_lock.h ---- linux-2.6.29.6/sound/core/seq/seq_lock.h 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/core/seq/seq_lock.h 2009-07-23 17:34:32.245757940 -0400 +diff -urNp linux-2.6.30.4/sound/core/seq/seq_lock.h linux-2.6.30.4/sound/core/seq/seq_lock.h +--- linux-2.6.30.4/sound/core/seq/seq_lock.h 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/core/seq/seq_lock.h 2009-07-30 09:48:10.164791187 -0400 @@ -23,10 +23,10 @@ void snd_use_lock_sync_helper(snd_use_lo #else /* SMP || CONFIG_SND_DEBUG */ @@ -45355,10 +44439,10 @@ diff -urNp linux-2.6.29.6/sound/core/seq/seq_lock.h linux-2.6.29.6/sound/core/se #endif /* SMP || CONFIG_SND_DEBUG */ -diff -urNp linux-2.6.29.6/sound/pci/ac97/ac97_patch.c linux-2.6.29.6/sound/pci/ac97/ac97_patch.c ---- linux-2.6.29.6/sound/pci/ac97/ac97_patch.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/pci/ac97/ac97_patch.c 2009-07-23 17:34:32.246936980 -0400 -@@ -1498,7 +1498,7 @@ static const struct snd_ac97_res_table a +diff -urNp linux-2.6.30.4/sound/pci/ac97/ac97_patch.c linux-2.6.30.4/sound/pci/ac97/ac97_patch.c +--- linux-2.6.30.4/sound/pci/ac97/ac97_patch.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/pci/ac97/ac97_patch.c 2009-07-30 09:48:10.165681860 -0400 +@@ -1501,7 +1501,7 @@ static const struct snd_ac97_res_table a { AC97_VIDEO, 0x9f1f }, { AC97_AUX, 0x9f1f }, { AC97_PCM, 0x9f1f }, @@ -45367,7 +44451,7 @@ diff -urNp linux-2.6.29.6/sound/pci/ac97/ac97_patch.c linux-2.6.29.6/sound/pci/a }; static int patch_ad1819(struct snd_ac97 * ac97) -@@ -3873,7 +3873,7 @@ static struct snd_ac97_res_table lm4550_ +@@ -3876,7 +3876,7 @@ static struct snd_ac97_res_table lm4550_ { AC97_AUX, 0x1f1f }, { AC97_PCM, 0x1f1f }, { AC97_REC_GAIN, 0x0f0f }, @@ -45376,9 +44460,9 @@ diff -urNp linux-2.6.29.6/sound/pci/ac97/ac97_patch.c linux-2.6.29.6/sound/pci/a }; static int patch_lm4550(struct snd_ac97 *ac97) -diff -urNp linux-2.6.29.6/sound/pci/ens1370.c linux-2.6.29.6/sound/pci/ens1370.c ---- linux-2.6.29.6/sound/pci/ens1370.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/pci/ens1370.c 2009-07-23 17:34:32.247850956 -0400 +diff -urNp linux-2.6.30.4/sound/pci/ens1370.c linux-2.6.30.4/sound/pci/ens1370.c +--- linux-2.6.30.4/sound/pci/ens1370.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/pci/ens1370.c 2009-07-30 09:48:10.165681860 -0400 @@ -452,7 +452,7 @@ static struct pci_device_id snd_audiopci { 0x1274, 0x5880, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* ES1373 - CT5880 */ { 0x1102, 0x8938, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0, }, /* Ectiva EV1938 */ @@ -45388,10 +44472,10 @@ diff -urNp linux-2.6.29.6/sound/pci/ens1370.c linux-2.6.29.6/sound/pci/ens1370.c }; MODULE_DEVICE_TABLE(pci, snd_audiopci_ids); -diff -urNp linux-2.6.29.6/sound/pci/intel8x0.c linux-2.6.29.6/sound/pci/intel8x0.c ---- linux-2.6.29.6/sound/pci/intel8x0.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/pci/intel8x0.c 2009-07-23 17:34:32.247850956 -0400 -@@ -443,7 +443,7 @@ static struct pci_device_id snd_intel8x0 +diff -urNp linux-2.6.30.4/sound/pci/intel8x0.c linux-2.6.30.4/sound/pci/intel8x0.c +--- linux-2.6.30.4/sound/pci/intel8x0.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/pci/intel8x0.c 2009-07-30 09:48:10.166748224 -0400 +@@ -444,7 +444,7 @@ static struct pci_device_id snd_intel8x0 { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */ { 0x1022, 0x7445, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD768 */ { 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */ @@ -45400,7 +44484,7 @@ diff -urNp linux-2.6.29.6/sound/pci/intel8x0.c linux-2.6.29.6/sound/pci/intel8x0 }; MODULE_DEVICE_TABLE(pci, snd_intel8x0_ids); -@@ -2088,7 +2088,7 @@ static struct ac97_quirk ac97_quirks[] _ +@@ -2105,7 +2105,7 @@ static struct ac97_quirk ac97_quirks[] _ .type = AC97_TUNE_HP_ONLY }, #endif @@ -45409,9 +44493,9 @@ diff -urNp linux-2.6.29.6/sound/pci/intel8x0.c linux-2.6.29.6/sound/pci/intel8x0 }; static int __devinit snd_intel8x0_mixer(struct intel8x0 *chip, int ac97_clock, -diff -urNp linux-2.6.29.6/sound/pci/intel8x0m.c linux-2.6.29.6/sound/pci/intel8x0m.c ---- linux-2.6.29.6/sound/pci/intel8x0m.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/pci/intel8x0m.c 2009-07-23 17:34:32.249009543 -0400 +diff -urNp linux-2.6.30.4/sound/pci/intel8x0m.c linux-2.6.30.4/sound/pci/intel8x0m.c +--- linux-2.6.30.4/sound/pci/intel8x0m.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/pci/intel8x0m.c 2009-07-30 09:48:10.167822693 -0400 @@ -239,7 +239,7 @@ static struct pci_device_id snd_intel8x0 { 0x1022, 0x746d, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_INTEL }, /* AMD8111 */ { 0x10b9, 0x5455, PCI_ANY_ID, PCI_ANY_ID, 0, 0, DEVICE_ALI }, /* Ali5455 */ @@ -45421,7 +44505,7 @@ diff -urNp linux-2.6.29.6/sound/pci/intel8x0m.c linux-2.6.29.6/sound/pci/intel8x }; MODULE_DEVICE_TABLE(pci, snd_intel8x0m_ids); -@@ -1258,7 +1258,7 @@ static struct shortname_table { +@@ -1264,7 +1264,7 @@ static struct shortname_table { { 0x5455, "ALi M5455" }, { 0x746d, "AMD AMD8111" }, #endif @@ -45430,9 +44514,9 @@ diff -urNp linux-2.6.29.6/sound/pci/intel8x0m.c linux-2.6.29.6/sound/pci/intel8x }; static int __devinit snd_intel8x0m_probe(struct pci_dev *pci, -diff -urNp linux-2.6.29.6/sound/usb/usx2y/us122l.c linux-2.6.29.6/sound/usb/usx2y/us122l.c ---- linux-2.6.29.6/sound/usb/usx2y/us122l.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/usb/usx2y/us122l.c 2009-07-23 18:40:28.832499629 -0400 +diff -urNp linux-2.6.30.4/sound/usb/usx2y/us122l.c linux-2.6.30.4/sound/usb/usx2y/us122l.c +--- linux-2.6.30.4/sound/usb/usx2y/us122l.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/usb/usx2y/us122l.c 2009-07-30 09:48:10.167822693 -0400 @@ -154,7 +154,7 @@ static void usb_stream_hwdep_vm_close(st snd_printdd(KERN_DEBUG "%i\n", atomic_read(&us122l->mmap_count)); } @@ -45442,10 +44526,10 @@ diff -urNp linux-2.6.29.6/sound/usb/usx2y/us122l.c linux-2.6.29.6/sound/usb/usx2 .open = usb_stream_hwdep_vm_open, .fault = usb_stream_hwdep_vm_fault, .close = usb_stream_hwdep_vm_close, -diff -urNp linux-2.6.29.6/sound/usb/usx2y/usX2Yhwdep.c linux-2.6.29.6/sound/usb/usx2y/usX2Yhwdep.c ---- linux-2.6.29.6/sound/usb/usx2y/usX2Yhwdep.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/usb/usx2y/usX2Yhwdep.c 2009-07-23 18:40:28.833508615 -0400 -@@ -56,7 +56,7 @@ static int snd_us428ctls_vm_fault(struct +diff -urNp linux-2.6.30.4/sound/usb/usx2y/usX2Yhwdep.c linux-2.6.30.4/sound/usb/usx2y/usX2Yhwdep.c +--- linux-2.6.30.4/sound/usb/usx2y/usX2Yhwdep.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/usb/usx2y/usX2Yhwdep.c 2009-07-30 09:48:10.167822693 -0400 +@@ -53,7 +53,7 @@ static int snd_us428ctls_vm_fault(struct return 0; } @@ -45454,9 +44538,9 @@ diff -urNp linux-2.6.29.6/sound/usb/usx2y/usX2Yhwdep.c linux-2.6.29.6/sound/usb/ .fault = snd_us428ctls_vm_fault, }; -diff -urNp linux-2.6.29.6/sound/usb/usx2y/usx2yhwdeppcm.c linux-2.6.29.6/sound/usb/usx2y/usx2yhwdeppcm.c ---- linux-2.6.29.6/sound/usb/usx2y/usx2yhwdeppcm.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/sound/usb/usx2y/usx2yhwdeppcm.c 2009-07-23 18:40:28.833508615 -0400 +diff -urNp linux-2.6.30.4/sound/usb/usx2y/usx2yhwdeppcm.c linux-2.6.30.4/sound/usb/usx2y/usx2yhwdeppcm.c +--- linux-2.6.30.4/sound/usb/usx2y/usx2yhwdeppcm.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/sound/usb/usx2y/usx2yhwdeppcm.c 2009-07-30 09:48:10.168781015 -0400 @@ -697,7 +697,7 @@ static int snd_usX2Y_hwdep_pcm_vm_fault( } @@ -45466,10 +44550,10 @@ diff -urNp linux-2.6.29.6/sound/usb/usx2y/usx2yhwdeppcm.c linux-2.6.29.6/sound/u .open = snd_usX2Y_hwdep_pcm_vm_open, .close = snd_usX2Y_hwdep_pcm_vm_close, .fault = snd_usX2Y_hwdep_pcm_vm_fault, -diff -urNp linux-2.6.29.6/virt/kvm/kvm_main.c linux-2.6.29.6/virt/kvm/kvm_main.c ---- linux-2.6.29.6/virt/kvm/kvm_main.c 2009-07-02 19:41:20.000000000 -0400 -+++ linux-2.6.29.6/virt/kvm/kvm_main.c 2009-07-23 17:34:32.249724330 -0400 -@@ -2059,6 +2059,9 @@ static struct miscdevice kvm_dev = { +diff -urNp linux-2.6.30.4/virt/kvm/kvm_main.c linux-2.6.30.4/virt/kvm/kvm_main.c +--- linux-2.6.30.4/virt/kvm/kvm_main.c 2009-07-24 17:47:51.000000000 -0400 ++++ linux-2.6.30.4/virt/kvm/kvm_main.c 2009-07-30 12:42:02.581987537 -0400 +@@ -2061,6 +2061,9 @@ static struct miscdevice kvm_dev = { KVM_MINOR, "kvm", &kvm_chardev_ops, @@ -45479,7 +44563,16 @@ diff -urNp linux-2.6.29.6/virt/kvm/kvm_main.c linux-2.6.29.6/virt/kvm/kvm_main.c }; static void hardware_enable(void *junk) -@@ -2290,7 +2293,7 @@ static void kvm_sched_out(struct preempt +@@ -2220,7 +2223,7 @@ static int vcpu_stat_get(void *_offset, + + DEFINE_SIMPLE_ATTRIBUTE(vcpu_stat_fops, vcpu_stat_get, NULL, "%llu\n"); + +-static struct file_operations *stat_fops[] = { ++static const struct file_operations *stat_fops[] = { + [KVM_STAT_VCPU] = &vcpu_stat_fops, + [KVM_STAT_VM] = &vm_stat_fops, + }; +@@ -2292,7 +2295,7 @@ static void kvm_sched_out(struct preempt kvm_arch_vcpu_put(vcpu); } diff --git a/main/linux-grsec/kernelconfig b/main/linux-grsec/kernelconfig index 425e5cedae..71ee53486b 100644 --- a/main/linux-grsec/kernelconfig +++ b/main/linux-grsec/kernelconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit -# Linux kernel version: 2.6.29.5 -# Mon Jun 29 16:25:46 2009 +# Linux kernel version: 2.6.30.4 +# Mon Aug 3 08:50:09 2009 # # CONFIG_64BIT is not set CONFIG_X86_32=y @@ -34,6 +34,7 @@ CONFIG_ARCH_HAS_CPU_RELAX=y CONFIG_ARCH_HAS_DEFAULT_IDLE=y CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y CONFIG_HAVE_SETUP_PER_CPU_AREA=y +CONFIG_HAVE_DYNAMIC_PER_CPU_AREA=y # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set CONFIG_ARCH_HIBERNATION_POSSIBLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y @@ -41,15 +42,16 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_POPULATES_NODE_MAP=y # CONFIG_AUDIT_ARCH is not set CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y CONFIG_GENERIC_HARDIRQS=y +CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y CONFIG_GENERIC_IRQ_PROBE=y CONFIG_GENERIC_PENDING_IRQ=y -CONFIG_X86_SMP=y CONFIG_USE_GENERIC_SMP_HELPERS=y CONFIG_X86_32_SMP=y CONFIG_X86_HT=y -CONFIG_X86_BIOS_REBOOT=y CONFIG_X86_TRAMPOLINE=y +CONFIG_X86_32_LAZY_GS=y CONFIG_KTIME_SCALAR=y CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" @@ -61,6 +63,12 @@ CONFIG_LOCK_KERNEL=y CONFIG_INIT_ENV_ARG_LIMIT=32 CONFIG_LOCALVERSION="" # CONFIG_LOCALVERSION_AUTO is not set +CONFIG_HAVE_KERNEL_GZIP=y +CONFIG_HAVE_KERNEL_BZIP2=y +CONFIG_HAVE_KERNEL_LZMA=y +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_BZIP2 is not set +# CONFIG_KERNEL_LZMA is not set CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_SYSVIPC_SYSCTL=y @@ -93,6 +101,9 @@ CONFIG_USER_SCHED=y # CONFIG_NAMESPACES is not set CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" +CONFIG_RD_GZIP=y +CONFIG_RD_BZIP2=y +CONFIG_RD_LZMA=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y CONFIG_SYSCTL=y CONFIG_ANON_INODES=y @@ -100,6 +111,7 @@ CONFIG_EMBEDDED=y CONFIG_UID16=y CONFIG_SYSCTL_SYSCALL=y # CONFIG_KALLSYMS is not set +# CONFIG_STRIP_ASM_SYMS is not set CONFIG_HOTPLUG=y CONFIG_PRINTK=y CONFIG_BUG=y @@ -121,12 +133,15 @@ CONFIG_PCI_QUIRKS=y CONFIG_SLUB=y # CONFIG_SLOB is not set # CONFIG_PROFILING is not set +# CONFIG_MARKERS is not set CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y CONFIG_HAVE_IOREMAP_PROT=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_SLOW_WORK=y CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_RT_MUTEXES=y CONFIG_BASE_SMALL=0 @@ -139,7 +154,6 @@ CONFIG_MODVERSIONS=y CONFIG_STOP_MACHINE=y CONFIG_BLOCK=y CONFIG_LBD=y -# CONFIG_BLK_DEV_IO_TRACE is not set CONFIG_BLK_DEV_BSG=y # CONFIG_BLK_DEV_INTEGRITY is not set @@ -167,22 +181,15 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_GENERIC_CLOCKEVENTS_BUILD=y CONFIG_SMP=y # CONFIG_SPARSE_IRQ is not set -CONFIG_X86_FIND_SMP_CONFIG=y CONFIG_X86_MPPARSE=y -CONFIG_X86_PC=y +# CONFIG_X86_BIGSMP is not set +CONFIG_X86_EXTENDED_PLATFORM=y # CONFIG_X86_ELAN is not set -# CONFIG_X86_VOYAGER is not set -# CONFIG_X86_GENERICARCH is not set -# CONFIG_X86_VSMP is not set # CONFIG_X86_RDC321X is not set +# CONFIG_X86_32_NON_STANDARD is not set CONFIG_SCHED_OMIT_FRAME_POINTER=y CONFIG_PARAVIRT_GUEST=y -CONFIG_VMI=y -CONFIG_KVM_CLOCK=y -CONFIG_KVM_GUEST=y -CONFIG_LGUEST_GUEST=y -CONFIG_PARAVIRT=y -CONFIG_PARAVIRT_CLOCK=y +# CONFIG_PARAVIRT_CLOCK is not set # CONFIG_MEMTEST is not set # CONFIG_M386 is not set # CONFIG_M486 is not set @@ -211,11 +218,12 @@ CONFIG_M586=y # CONFIG_GENERIC_CPU is not set CONFIG_X86_GENERIC=y CONFIG_X86_CPU=y +CONFIG_X86_L1_CACHE_BYTES=64 +CONFIG_X86_INTERNODE_CACHE_BYTES=64 CONFIG_X86_CMPXCHG=y -CONFIG_X86_L1_CACHE_SHIFT=7 +CONFIG_X86_L1_CACHE_SHIFT=5 CONFIG_X86_XADD=y # CONFIG_X86_PPRO_FENCE is not set -CONFIG_X86_F00F_BUG=y CONFIG_X86_WP_WORKS_OK=y CONFIG_X86_INVLPG=y CONFIG_X86_BSWAP=y @@ -227,7 +235,7 @@ CONFIG_X86_MINIMUM_CPU_FAMILY=4 CONFIG_CPU_SUP_INTEL=y CONFIG_CPU_SUP_CYRIX_32=y CONFIG_CPU_SUP_AMD=y -CONFIG_CPU_SUP_CENTAUR_32=y +CONFIG_CPU_SUP_CENTAUR=y CONFIG_CPU_SUP_TRANSMETA_32=y CONFIG_CPU_SUP_UMC_32=y CONFIG_HPET_TIMER=y @@ -255,6 +263,7 @@ CONFIG_MICROCODE_AMD=y CONFIG_MICROCODE_OLD_INTERFACE=y CONFIG_X86_MSR=m CONFIG_X86_CPUID=m +CONFIG_X86_CPU_DEBUG=m # CONFIG_NOHIGHMEM is not set CONFIG_HIGHMEM4G=y # CONFIG_HIGHMEM64G is not set @@ -283,7 +292,10 @@ CONFIG_ZONE_DMA_FLAG=1 CONFIG_BOUNCE=y CONFIG_VIRT_TO_BUS=y CONFIG_UNEVICTABLE_LRU=y +CONFIG_HAVE_MLOCK=y +CONFIG_HAVE_MLOCKED_PAGE_BIT=y CONFIG_MMU_NOTIFIER=y +CONFIG_DEFAULT_MMAP_MIN_ADDR=4096 # CONFIG_HIGHPTE is not set # CONFIG_X86_CHECK_BIOS_CORRUPTION is not set CONFIG_X86_RESERVE_LOW_64K=y @@ -293,8 +305,8 @@ CONFIG_MTRR_SANITIZER=y CONFIG_MTRR_SANITIZER_ENABLE_DEFAULT=0 CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1 # CONFIG_X86_PAT is not set -# CONFIG_EFI is not set # CONFIG_SECCOMP is not set +# CONFIG_CC_STACKPROTECTOR is not set # CONFIG_HZ_100 is not set # CONFIG_HZ_250 is not set CONFIG_HZ_300=y @@ -371,7 +383,6 @@ CONFIG_X86_POWERNOW_K6=m CONFIG_X86_POWERNOW_K7=m CONFIG_X86_POWERNOW_K7_ACPI=y CONFIG_X86_POWERNOW_K8=m -CONFIG_X86_POWERNOW_K8_ACPI=y CONFIG_X86_GX_SUSPMOD=m CONFIG_X86_SPEEDSTEP_CENTRINO=m CONFIG_X86_SPEEDSTEP_CENTRINO_TABLE=y @@ -415,6 +426,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y CONFIG_PCI_LEGACY=y CONFIG_PCI_STUB=m CONFIG_HT_IRQ=y +# CONFIG_PCI_IOV is not set CONFIG_ISA_DMA_API=y CONFIG_ISA=y # CONFIG_EISA is not set @@ -471,7 +483,6 @@ CONFIG_NET=y # # Networking options # -CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_PACKET=m CONFIG_PACKET_MMAP=y CONFIG_UNIX=y @@ -512,7 +523,7 @@ CONFIG_INET_TUNNEL=m CONFIG_INET_XFRM_MODE_TRANSPORT=m CONFIG_INET_XFRM_MODE_TUNNEL=m CONFIG_INET_XFRM_MODE_BEET=m -CONFIG_INET_LRO=m +CONFIG_INET_LRO=y CONFIG_INET_DIAG=m CONFIG_INET_TCP_DIAG=m CONFIG_TCP_CONG_ADVANCED=y @@ -596,6 +607,8 @@ CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m CONFIG_NETFILTER_XT_TARGET_DSCP=m +CONFIG_NETFILTER_XT_TARGET_HL=m +CONFIG_NETFILTER_XT_TARGET_LED=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m @@ -606,6 +619,7 @@ CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_SECMARK=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m +CONFIG_NETFILTER_XT_MATCH_CLUSTER=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m @@ -616,6 +630,7 @@ CONFIG_NETFILTER_XT_MATCH_DSCP=m CONFIG_NETFILTER_XT_MATCH_ESP=m CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m CONFIG_NETFILTER_XT_MATCH_HELPER=m +CONFIG_NETFILTER_XT_MATCH_HL=m CONFIG_NETFILTER_XT_MATCH_IPRANGE=m CONFIG_NETFILTER_XT_MATCH_LENGTH=m CONFIG_NETFILTER_XT_MATCH_LIMIT=m @@ -729,11 +744,11 @@ CONFIG_IP6_NF_MATCH_HL=m CONFIG_IP6_NF_MATCH_IPV6HEADER=m CONFIG_IP6_NF_MATCH_MH=m CONFIG_IP6_NF_MATCH_RT=m +CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_TARGET_LOG=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_TARGET_REJECT=m CONFIG_IP6_NF_MANGLE=m -CONFIG_IP6_NF_TARGET_HL=m CONFIG_IP6_NF_RAW=m CONFIG_IP6_NF_SECURITY=m @@ -780,6 +795,8 @@ CONFIG_IP_SCTP=m # CONFIG_SCTP_HMAC_NONE is not set CONFIG_SCTP_HMAC_SHA1=y # CONFIG_SCTP_HMAC_MD5 is not set +CONFIG_RDS=m +# CONFIG_RDS_DEBUG is not set CONFIG_TIPC=m # CONFIG_TIPC_ADVANCED is not set # CONFIG_TIPC_DEBUG is not set @@ -816,6 +833,7 @@ CONFIG_ECONET=m CONFIG_ECONET_AUNUDP=y CONFIG_ECONET_NATIVE=y CONFIG_WAN_ROUTER=m +CONFIG_PHONET=m CONFIG_NET_SCHED=y # @@ -975,12 +993,10 @@ CONFIG_BT_HCIVHCI=m CONFIG_AF_RXRPC=m # CONFIG_AF_RXRPC_DEBUG is not set CONFIG_RXKAD=m -CONFIG_PHONET=m CONFIG_FIB_RULES=y CONFIG_WIRELESS=y CONFIG_CFG80211=m # CONFIG_CFG80211_REG_DEBUG is not set -CONFIG_NL80211=y CONFIG_WIRELESS_OLD_REGULATORY=y CONFIG_WIRELESS_EXT=y CONFIG_WIRELESS_EXT_SYSFS=y @@ -1226,6 +1242,7 @@ CONFIG_ICS932S401=m CONFIG_ENCLOSURE_SERVICES=m CONFIG_HP_ILO=m CONFIG_DELL_LAPTOP=m +CONFIG_ISL29003=m CONFIG_C2PORT=m CONFIG_C2PORT_DURAMAR_2150=m @@ -1242,6 +1259,7 @@ CONFIG_IDE=m # # Please see Documentation/ide/ide.txt for help/info on IDE drives # +CONFIG_IDE_XFER_MODE=y CONFIG_IDE_TIMINGS=y CONFIG_IDE_ATAPI=y CONFIG_IDE_LEGACY=y @@ -1401,11 +1419,16 @@ CONFIG_MEGARAID_MM=m CONFIG_MEGARAID_MAILBOX=m CONFIG_MEGARAID_LEGACY=m CONFIG_MEGARAID_SAS=m +CONFIG_SCSI_MPT2SAS=m +CONFIG_SCSI_MPT2SAS_MAX_SGE=128 +# CONFIG_SCSI_MPT2SAS_LOGGING is not set CONFIG_SCSI_HPTIOP=m CONFIG_SCSI_BUSLOGIC=m CONFIG_SCSI_FLASHPOINT=y CONFIG_LIBFC=m +CONFIG_LIBFCOE=m CONFIG_FCOE=m +CONFIG_FCOE_FNIC=m CONFIG_SCSI_DMX3191D=m CONFIG_SCSI_DTC3280=m CONFIG_SCSI_EATA=m @@ -1464,6 +1487,10 @@ CONFIG_SCSI_DH_RDAC=m CONFIG_SCSI_DH_HP_SW=m CONFIG_SCSI_DH_EMC=m CONFIG_SCSI_DH_ALUA=m +CONFIG_SCSI_OSD_INITIATOR=m +CONFIG_SCSI_OSD_ULD=m +CONFIG_SCSI_OSD_DPRINT_SENSE=1 +# CONFIG_SCSI_OSD_DEBUG is not set CONFIG_ATA=m # CONFIG_ATA_NONSTANDARD is not set CONFIG_ATA_ACPI=y @@ -1542,7 +1569,7 @@ CONFIG_MD_RAID0=m CONFIG_MD_RAID1=m CONFIG_MD_RAID10=m CONFIG_MD_RAID456=m -CONFIG_MD_RAID5_RESHAPE=y +CONFIG_MD_RAID6_PQ=m CONFIG_MD_MULTIPATH=m CONFIG_MD_FAULTY=m CONFIG_BLK_DEV_DM=m @@ -1595,6 +1622,7 @@ CONFIG_I2O_SCSI=m CONFIG_I2O_PROC=m # CONFIG_MACINTOSH_DRIVERS is not set CONFIG_NETDEVICES=y +CONFIG_COMPAT_NET_DEV_OPS=y CONFIG_IFB=m CONFIG_DUMMY=m CONFIG_BONDING=m @@ -1655,6 +1683,7 @@ CONFIG_ULTRA=m CONFIG_SMC9194=m CONFIG_ENC28J60=m # CONFIG_ENC28J60_WRITEVERIFY is not set +CONFIG_ETHOC=m CONFIG_NET_VENDOR_RACAL=y CONFIG_NI52=m CONFIG_NI65=m @@ -1738,7 +1767,7 @@ CONFIG_E1000=m CONFIG_E1000E=m CONFIG_IP1000=m CONFIG_IGB=m -CONFIG_IGB_LRO=y +CONFIG_IGBVF=m CONFIG_NS83820=m CONFIG_HAMACHI=m CONFIG_YELLOWFIN=m @@ -1764,6 +1793,8 @@ CONFIG_ENIC=m CONFIG_IXGBE=m CONFIG_IXGB=m CONFIG_S2IO=m +CONFIG_VXGE=m +# CONFIG_VXGE_DEBUG_TRACE_ALL is not set CONFIG_MYRI10GE=m CONFIG_NETXEN_NIC=m CONFIG_NIU=m @@ -1793,21 +1824,15 @@ CONFIG_LIBERTAS=m CONFIG_LIBERTAS_USB=m CONFIG_LIBERTAS_CS=m CONFIG_LIBERTAS_SDIO=m +CONFIG_LIBERTAS_SPI=m # CONFIG_LIBERTAS_DEBUG is not set CONFIG_LIBERTAS_THINFIRM=m CONFIG_LIBERTAS_THINFIRM_USB=m CONFIG_AIRO=m -CONFIG_HERMES=m -CONFIG_HERMES_CACHE_FW_ON_INIT=y -CONFIG_PLX_HERMES=m -CONFIG_TMD_HERMES=m -CONFIG_NORTEL_HERMES=m -CONFIG_PCI_HERMES=m -CONFIG_PCMCIA_HERMES=m -CONFIG_PCMCIA_SPECTRUM=m CONFIG_ATMEL=m CONFIG_PCI_ATMEL=m CONFIG_PCMCIA_ATMEL=m +CONFIG_AT76C50X_USB=m CONFIG_AIRO_CS=m CONFIG_PCMCIA_WL3501=m CONFIG_PRISM54=m @@ -1817,13 +1842,18 @@ CONFIG_RTL8180=m CONFIG_RTL8187=m CONFIG_ADM8211=m CONFIG_MAC80211_HWSIM=m +CONFIG_MWL8K=m CONFIG_P54_COMMON=m CONFIG_P54_USB=m CONFIG_P54_PCI=m +CONFIG_P54_SPI=m +CONFIG_P54_LEDS=y CONFIG_ATH5K=m # CONFIG_ATH5K_DEBUG is not set CONFIG_ATH9K=m # CONFIG_ATH9K_DEBUG is not set +CONFIG_AR9170_USB=m +CONFIG_AR9170_LEDS=y CONFIG_IPW2100=m CONFIG_IPW2100_MONITOR=y # CONFIG_IPW2100_DEBUG is not set @@ -1836,20 +1866,15 @@ CONFIG_IPW2200_QOS=y CONFIG_LIBIPW=m # CONFIG_LIBIPW_DEBUG is not set CONFIG_IWLWIFI=m -CONFIG_IWLCORE=m # CONFIG_IWLWIFI_LEDS is not set # CONFIG_IWLWIFI_RFKILL is not set +# CONFIG_IWLWIFI_SPECTRUM_MEASUREMENT is not set # CONFIG_IWLWIFI_DEBUG is not set CONFIG_IWLAGN=m -CONFIG_IWLAGN_SPECTRUM_MEASUREMENT=y -# CONFIG_IWLAGN_LEDS is not set CONFIG_IWL4965=y CONFIG_IWL5000=y CONFIG_IWL3945=m -CONFIG_IWL3945_RFKILL=y # CONFIG_IWL3945_SPECTRUM_MEASUREMENT is not set -CONFIG_IWL3945_LEDS=y -# CONFIG_IWL3945_DEBUG is not set CONFIG_HOSTAP=m CONFIG_HOSTAP_FIRMWARE=y CONFIG_HOSTAP_FIRMWARE_NVRAM=y @@ -1891,6 +1916,14 @@ CONFIG_RT2X00_LIB_CRYPTO=y CONFIG_RT2X00_LIB_RFKILL=y CONFIG_RT2X00_LIB_LEDS=y # CONFIG_RT2X00_DEBUG is not set +CONFIG_HERMES=m +CONFIG_HERMES_CACHE_FW_ON_INIT=y +CONFIG_PLX_HERMES=m +CONFIG_TMD_HERMES=m +CONFIG_NORTEL_HERMES=m +CONFIG_PCI_HERMES=m +CONFIG_PCMCIA_HERMES=m +CONFIG_PCMCIA_SPECTRUM=m # # WiMAX Wireless Broadband devices @@ -1910,6 +1943,7 @@ CONFIG_USB_RTL8150=m CONFIG_USB_USBNET=m CONFIG_USB_NET_AX8817X=m CONFIG_USB_NET_CDCETHER=m +CONFIG_USB_NET_CDC_EEM=m CONFIG_USB_NET_DM9601=m CONFIG_USB_NET_SMSC95XX=m CONFIG_USB_NET_GL620A=m @@ -2157,6 +2191,9 @@ CONFIG_TABLET_USB_KBTAB=m CONFIG_TABLET_USB_WACOM=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_ADS7846=m +CONFIG_TOUCHSCREEN_AD7877=m +CONFIG_TOUCHSCREEN_AD7879_I2C=m +CONFIG_TOUCHSCREEN_AD7879=m CONFIG_TOUCHSCREEN_FUJITSU=m CONFIG_TOUCHSCREEN_GUNZE=m CONFIG_TOUCHSCREEN_ELO=m @@ -2200,6 +2237,7 @@ CONFIG_INPUT_YEALINK=m CONFIG_INPUT_CM109=m CONFIG_INPUT_UINPUT=m CONFIG_INPUT_PCF50633_PMU=m +CONFIG_INPUT_GPIO_ROTARY_ENCODER=m # # Hardware I/O ports @@ -2266,6 +2304,7 @@ CONFIG_SERIAL_8250_RUNTIME_UARTS=4 # # Non-8250 serial port support # +CONFIG_SERIAL_MAX3100=m CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y CONFIG_SERIAL_JSM=m @@ -2276,7 +2315,7 @@ CONFIG_PRINTER=m # CONFIG_LP_CONSOLE is not set CONFIG_PPDEV=m CONFIG_HVC_DRIVER=y -CONFIG_VIRTIO_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=m CONFIG_IPMI_HANDLER=m # CONFIG_IPMI_PANIC_EVENT is not set CONFIG_IPMI_DEVICE_INTERFACE=m @@ -2284,6 +2323,7 @@ CONFIG_IPMI_SI=m CONFIG_IPMI_WATCHDOG=m CONFIG_IPMI_POWEROFF=m CONFIG_HW_RANDOM=m +CONFIG_HW_RANDOM_TIMERIOMEM=m CONFIG_HW_RANDOM_INTEL=m CONFIG_HW_RANDOM_AMD=m CONFIG_HW_RANDOM_GEODE=m @@ -2385,7 +2425,6 @@ CONFIG_SCx200_ACB=m # Miscellaneous I2C Chip support # CONFIG_DS1682=m -CONFIG_SENSORS_PCF8591=m CONFIG_SENSORS_MAX6875=m CONFIG_SENSORS_TSL2550=m # CONFIG_I2C_DEBUG_CORE is not set @@ -2479,6 +2518,7 @@ CONFIG_SENSORS_ADT7473=m CONFIG_SENSORS_ADT7475=m CONFIG_SENSORS_K8TEMP=m CONFIG_SENSORS_ASB100=m +CONFIG_SENSORS_ATK0110=m CONFIG_SENSORS_ATXP1=m CONFIG_SENSORS_DS1621=m CONFIG_SENSORS_I5K_AMB=m @@ -2488,6 +2528,7 @@ CONFIG_SENSORS_F75375S=m CONFIG_SENSORS_FSCHER=m CONFIG_SENSORS_FSCPOS=m CONFIG_SENSORS_FSCHMD=m +CONFIG_SENSORS_G760A=m CONFIG_SENSORS_GL518SM=m CONFIG_SENSORS_GL520SM=m CONFIG_SENSORS_CORETEMP=m @@ -2506,12 +2547,16 @@ CONFIG_SENSORS_LM87=m CONFIG_SENSORS_LM90=m CONFIG_SENSORS_LM92=m CONFIG_SENSORS_LM93=m +CONFIG_SENSORS_LTC4215=m CONFIG_SENSORS_LTC4245=m +CONFIG_SENSORS_LM95241=m CONFIG_SENSORS_MAX1111=m CONFIG_SENSORS_MAX1619=m CONFIG_SENSORS_MAX6650=m CONFIG_SENSORS_PC87360=m CONFIG_SENSORS_PC87427=m +CONFIG_SENSORS_PCF8591=m +CONFIG_SENSORS_SHT15=m CONFIG_SENSORS_SIS5595=m CONFIG_SENSORS_DME1737=m CONFIG_SENSORS_SMSC47M1=m @@ -2581,7 +2626,6 @@ CONFIG_SBC_EPX_C3_WATCHDOG=m CONFIG_PCWATCHDOG=m CONFIG_MIXCOMWD=m CONFIG_WDT=m -CONFIG_WDT_501=y # # PCI-based Watchdog Cards @@ -2658,7 +2702,7 @@ CONFIG_VIDEO_SAA7146=m CONFIG_VIDEO_SAA7146_VV=m # CONFIG_MEDIA_ATTACH is not set CONFIG_MEDIA_TUNER=m -# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set +# CONFIG_MEDIA_TUNER_CUSTOMISE is not set CONFIG_MEDIA_TUNER_SIMPLE=m CONFIG_MEDIA_TUNER_TDA8290=m CONFIG_MEDIA_TUNER_TDA827X=m @@ -2675,6 +2719,7 @@ CONFIG_MEDIA_TUNER_XC2028=m CONFIG_MEDIA_TUNER_XC5000=m CONFIG_MEDIA_TUNER_MXL5005S=m CONFIG_MEDIA_TUNER_MXL5007T=m +CONFIG_MEDIA_TUNER_MC44S803=m CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L1=m CONFIG_VIDEOBUF_GEN=m @@ -2714,6 +2759,11 @@ CONFIG_VIDEO_WM8739=m CONFIG_VIDEO_VP27SMPX=m # +# RDS decoders +# +CONFIG_VIDEO_SAA6588=m + +# # Video decoders # CONFIG_VIDEO_BT819=m @@ -2723,8 +2773,6 @@ CONFIG_VIDEO_KS0127=m CONFIG_VIDEO_OV7670=m CONFIG_VIDEO_TCM825X=m CONFIG_VIDEO_SAA7110=m -CONFIG_VIDEO_SAA7111=m -CONFIG_VIDEO_SAA7114=m CONFIG_VIDEO_SAA711X=m CONFIG_VIDEO_SAA717X=m CONFIG_VIDEO_SAA7191=m @@ -2758,7 +2806,6 @@ CONFIG_VIDEO_UPD64083=m CONFIG_VIDEO_VIVI=m CONFIG_VIDEO_BT848=m CONFIG_VIDEO_BT848_DVB=y -CONFIG_VIDEO_SAA6588=m CONFIG_VIDEO_PMS=m CONFIG_VIDEO_BWQCAM=m CONFIG_VIDEO_CQCAM=m @@ -2797,11 +2844,9 @@ CONFIG_VIDEO_CX18=m CONFIG_VIDEO_CAFE_CCIC=m CONFIG_SOC_CAMERA=m CONFIG_SOC_CAMERA_MT9M001=m -# CONFIG_MT9M001_PCA9536_SWITCH is not set CONFIG_SOC_CAMERA_MT9M111=m CONFIG_SOC_CAMERA_MT9T031=m CONFIG_SOC_CAMERA_MT9V022=m -# CONFIG_MT9V022_PCA9536_SWITCH is not set CONFIG_SOC_CAMERA_TW9910=m CONFIG_SOC_CAMERA_PLATFORM=m CONFIG_SOC_CAMERA_OV772X=m @@ -2815,6 +2860,7 @@ CONFIG_USB_GSPCA_CONEX=m CONFIG_USB_GSPCA_ETOMS=m CONFIG_USB_GSPCA_FINEPIX=m CONFIG_USB_GSPCA_MARS=m +CONFIG_USB_GSPCA_MR97310A=m CONFIG_USB_GSPCA_OV519=m CONFIG_USB_GSPCA_OV534=m CONFIG_USB_GSPCA_PAC207=m @@ -2827,6 +2873,8 @@ CONFIG_USB_GSPCA_SPCA505=m CONFIG_USB_GSPCA_SPCA506=m CONFIG_USB_GSPCA_SPCA508=m CONFIG_USB_GSPCA_SPCA561=m +CONFIG_USB_GSPCA_SQ905=m +CONFIG_USB_GSPCA_SQ905C=m CONFIG_USB_GSPCA_STK014=m CONFIG_USB_GSPCA_SUNPLUS=m CONFIG_USB_GSPCA_T613=m @@ -2837,9 +2885,13 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y # CONFIG_VIDEO_PVRUSB2_DEBUGIFC is not set +CONFIG_VIDEO_HDPVR=m CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m +CONFIG_VIDEO_CX231XX=m +CONFIG_VIDEO_CX231XX_ALSA=m +CONFIG_VIDEO_CX231XX_DVB=m CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_USBVIDEO=m CONFIG_USB_VICAM=m @@ -2856,6 +2908,7 @@ CONFIG_USB_STV680=m CONFIG_USB_ZC0301=m CONFIG_USB_PWC=m # CONFIG_USB_PWC_DEBUG is not set +CONFIG_USB_PWC_INPUT_EVDEV=y CONFIG_USB_ZR364XX=m CONFIG_USB_STKWEBCAM=m CONFIG_USB_S2255=m @@ -2924,6 +2977,7 @@ CONFIG_DVB_USB_CINERGY_T2=m CONFIG_DVB_USB_ANYSEE=m CONFIG_DVB_USB_DTV5100=m CONFIG_DVB_USB_AF9015=m +CONFIG_DVB_USB_CE6230=m CONFIG_DVB_TTUSB_BUDGET=m CONFIG_DVB_TTUSB_DEC=m CONFIG_DVB_SIANO_SMS1XXX=m @@ -2962,28 +3016,19 @@ CONFIG_DVB_FIREDTV_INPUT=y # # Supported DVB Frontends # - -# -# Customise DVB Frontends -# # CONFIG_DVB_FE_CUSTOMISE is not set - -# -# Multistandard (satellite) frontends -# CONFIG_DVB_STB0899=m CONFIG_DVB_STB6100=m - -# -# DVB-S (satellite) frontends -# CONFIG_DVB_CX24110=m CONFIG_DVB_CX24123=m CONFIG_DVB_MT312=m +CONFIG_DVB_ZL10036=m CONFIG_DVB_S5H1420=m CONFIG_DVB_STV0288=m CONFIG_DVB_STB6000=m CONFIG_DVB_STV0299=m +CONFIG_DVB_STV6110=m +CONFIG_DVB_STV0900=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m CONFIG_DVB_TDA8261=m @@ -2994,15 +3039,10 @@ CONFIG_DVB_TDA826X=m CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m - -# -# DVB-T (terrestrial) frontends -# CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m -CONFIG_DVB_DRX397XD=m CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m @@ -3013,52 +3053,26 @@ CONFIG_DVB_DIB3000MC=m CONFIG_DVB_DIB7000M=m CONFIG_DVB_DIB7000P=m CONFIG_DVB_TDA10048=m - -# -# DVB-C (cable) frontends -# +CONFIG_DVB_AF9013=m CONFIG_DVB_VES1820=m CONFIG_DVB_TDA10021=m CONFIG_DVB_TDA10023=m CONFIG_DVB_STV0297=m - -# -# ATSC (North American/Korean Terrestrial/Cable DTV) frontends -# CONFIG_DVB_NXT200X=m CONFIG_DVB_OR51211=m CONFIG_DVB_OR51132=m CONFIG_DVB_BCM3510=m CONFIG_DVB_LGDT330X=m -CONFIG_DVB_LGDT3304=m +CONFIG_DVB_LGDT3305=m CONFIG_DVB_S5H1409=m CONFIG_DVB_AU8522=m CONFIG_DVB_S5H1411=m - -# -# ISDB-T (terrestrial) frontends -# -CONFIG_DVB_S921=m - -# -# Digital terrestrial only tuners/PLL -# CONFIG_DVB_PLL=m CONFIG_DVB_TUNER_DIB0070=m - -# -# SEC control devices for DVB-S -# CONFIG_DVB_LNBP21=m CONFIG_DVB_ISL6405=m CONFIG_DVB_ISL6421=m CONFIG_DVB_LGS8GL5=m - -# -# Tools to develop new frontends -# -CONFIG_DVB_DUMMY_FE=m -CONFIG_DVB_AF9013=m CONFIG_DAB=y CONFIG_USB_DABUSB=m @@ -3171,11 +3185,10 @@ CONFIG_FB_NEOMAGIC=m CONFIG_FB_KYRO=m CONFIG_FB_3DFX=m CONFIG_FB_3DFX_ACCEL=y +CONFIG_FB_3DFX_I2C=y CONFIG_FB_VOODOO1=m CONFIG_FB_VT8623=m -CONFIG_FB_CYBLA=m CONFIG_FB_TRIDENT=m -CONFIG_FB_TRIDENT_ACCEL=y CONFIG_FB_ARK=m CONFIG_FB_PM3=m CONFIG_FB_CARMINE=m @@ -3192,6 +3205,7 @@ CONFIG_FB_SM501=m CONFIG_FB_METRONOME=m CONFIG_FB_MB862XX=m # CONFIG_FB_MB862XX_PCI_GDC is not set +CONFIG_FB_BROADSHEET=m CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=m CONFIG_LCD_LTV350QV=m @@ -3280,7 +3294,6 @@ CONFIG_SND_ALS100=m CONFIG_SND_AZT2320=m CONFIG_SND_CMI8330=m CONFIG_SND_CS4231=m -CONFIG_SND_CS4232=m CONFIG_SND_CS4236=m CONFIG_SND_DT019X=m CONFIG_SND_ES968=m @@ -3304,7 +3317,8 @@ CONFIG_SND_SB16_CSP=y CONFIG_SND_SGALAXY=m CONFIG_SND_SSCAPE=m CONFIG_SND_WAVEFRONT=m -CONFIG_SND_WAVEFRONT_FIRMWARE_IN_KERNEL=y +CONFIG_SND_MSND_PINNACLE=m +CONFIG_SND_MSND_CLASSIC=m CONFIG_SND_PCI=y CONFIG_SND_AD1889=m CONFIG_SND_ALS300=m @@ -3340,6 +3354,8 @@ CONFIG_SND_ECHO3G=m CONFIG_SND_INDIGO=m CONFIG_SND_INDIGOIO=m CONFIG_SND_INDIGODJ=m +CONFIG_SND_INDIGOIOX=m +CONFIG_SND_INDIGODJX=m CONFIG_SND_EMU10K1=m CONFIG_SND_EMU10K1X=m CONFIG_SND_ENS1370=m @@ -3403,6 +3419,7 @@ CONFIG_SND_SOC=m CONFIG_SND_SOC_I2C_AND_SPI=m CONFIG_SND_SOC_ALL_CODECS=m CONFIG_SND_SOC_AD73311=m +CONFIG_SND_SOC_AK4104=m CONFIG_SND_SOC_AK4535=m CONFIG_SND_SOC_CS4270=m CONFIG_SND_SOC_L3=m @@ -3414,6 +3431,7 @@ CONFIG_SND_SOC_TLV320AIC3X=m CONFIG_SND_SOC_UDA134X=m CONFIG_SND_SOC_UDA1380=m CONFIG_SND_SOC_WM8350=m +CONFIG_SND_SOC_WM8400=m CONFIG_SND_SOC_WM8510=m CONFIG_SND_SOC_WM8580=m CONFIG_SND_SOC_WM8728=m @@ -3447,15 +3465,17 @@ CONFIG_USB_MOUSE=m # # Special HID drivers # -# CONFIG_HID_COMPAT is not set CONFIG_HID_A4TECH=m CONFIG_HID_APPLE=m CONFIG_HID_BELKIN=m CONFIG_HID_CHERRY=m CONFIG_HID_CHICONY=m CONFIG_HID_CYPRESS=m +CONFIG_DRAGONRISE_FF=m CONFIG_HID_EZKEY=m +CONFIG_HID_KYE=m CONFIG_HID_GYRATION=m +CONFIG_HID_KENSINGTON=m CONFIG_HID_LOGITECH=m # CONFIG_LOGITECH_FF is not set # CONFIG_LOGIRUMBLEPAD2_FF is not set @@ -3531,25 +3551,25 @@ CONFIG_USB_WDM=m CONFIG_USB_TMC=m # -# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; +# NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may # # -# see USB_STORAGE Help for more information +# also be needed; see USB_STORAGE Help for more info # CONFIG_USB_STORAGE=m # CONFIG_USB_STORAGE_DEBUG is not set -CONFIG_USB_STORAGE_DATAFAB=y -CONFIG_USB_STORAGE_FREECOM=y -CONFIG_USB_STORAGE_ISD200=y -CONFIG_USB_STORAGE_USBAT=y -CONFIG_USB_STORAGE_SDDR09=y -CONFIG_USB_STORAGE_SDDR55=y -CONFIG_USB_STORAGE_JUMPSHOT=y -CONFIG_USB_STORAGE_ALAUDA=y -CONFIG_USB_STORAGE_ONETOUCH=y -CONFIG_USB_STORAGE_KARMA=y -CONFIG_USB_STORAGE_CYPRESS_ATACB=y +CONFIG_USB_STORAGE_DATAFAB=m +CONFIG_USB_STORAGE_FREECOM=m +CONFIG_USB_STORAGE_ISD200=m +CONFIG_USB_STORAGE_USBAT=m +CONFIG_USB_STORAGE_SDDR09=m +CONFIG_USB_STORAGE_SDDR55=m +CONFIG_USB_STORAGE_JUMPSHOT=m +CONFIG_USB_STORAGE_ALAUDA=m +CONFIG_USB_STORAGE_ONETOUCH=m +CONFIG_USB_STORAGE_KARMA=m +CONFIG_USB_STORAGE_CYPRESS_ATACB=m CONFIG_USB_LIBUSUAL=y # @@ -3571,7 +3591,7 @@ CONFIG_USB_SERIAL_BELKIN=m CONFIG_USB_SERIAL_CH341=m CONFIG_USB_SERIAL_WHITEHEAT=m CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m -CONFIG_USB_SERIAL_CP2101=m +CONFIG_USB_SERIAL_CP210X=m CONFIG_USB_SERIAL_CYPRESS_M8=m CONFIG_USB_SERIAL_EMPEG=m CONFIG_USB_SERIAL_FTDI_SIO=m @@ -3595,12 +3615,14 @@ CONFIG_USB_SERIAL_MOTOROLA=m CONFIG_USB_SERIAL_NAVMAN=m CONFIG_USB_SERIAL_PL2303=m CONFIG_USB_SERIAL_OTI6858=m +CONFIG_USB_SERIAL_QUALCOMM=m CONFIG_USB_SERIAL_SPCP8X5=m CONFIG_USB_SERIAL_HP4X=m CONFIG_USB_SERIAL_SAFE=m CONFIG_USB_SERIAL_SAFE_PADDED=y CONFIG_USB_SERIAL_SIEMENS_MPI=m CONFIG_USB_SERIAL_SIERRAWIRELESS=m +CONFIG_USB_SERIAL_SYMBOL=m CONFIG_USB_SERIAL_TI=m CONFIG_USB_SERIAL_CYBERJACK=m CONFIG_USB_SERIAL_XIRCOM=m @@ -3623,10 +3645,6 @@ CONFIG_USB_BERRY_CHARGE=m CONFIG_USB_LED=m CONFIG_USB_CYPRESS_CY7C63=m CONFIG_USB_CYTHERM=m -CONFIG_USB_PHIDGET=m -CONFIG_USB_PHIDGETKIT=m -CONFIG_USB_PHIDGETMOTORCONTROL=m -CONFIG_USB_PHIDGETSERVO=m CONFIG_USB_IDMOUSE=m CONFIG_USB_FTDI_ELAN=m CONFIG_USB_APPLEDISPLAY=m @@ -3650,6 +3668,7 @@ CONFIG_USB_XUSBATM=m # CONFIG_USB_OTG_UTILS=y CONFIG_USB_GPIO_VBUS=m +CONFIG_NOP_USB_XCEIV=m CONFIG_UWB=m CONFIG_UWB_HWA=m CONFIG_UWB_WHCI=m @@ -3702,9 +3721,13 @@ CONFIG_LEDS_WRAP=m CONFIG_LEDS_ALIX2=m CONFIG_LEDS_PCA9532=m CONFIG_LEDS_GPIO=m +CONFIG_LEDS_GPIO_PLATFORM=y +CONFIG_LEDS_LP5521=m CONFIG_LEDS_CLEVO_MAIL=m CONFIG_LEDS_PCA955X=m CONFIG_LEDS_WM8350=m +CONFIG_LEDS_DAC124S085=m +CONFIG_LEDS_BD2802=m # # LED Triggers @@ -3714,7 +3737,12 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_IDE_DISK=y CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_BACKLIGHT=m +CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m + +# +# iptables trigger is under Netfilter config (LED target) +# CONFIG_ACCESSIBILITY=y # CONFIG_A11Y_BRAILLE_CONSOLE is not set CONFIG_INFINIBAND=m @@ -3809,11 +3837,13 @@ CONFIG_UIO_CIF=m CONFIG_UIO_PDRV=m CONFIG_UIO_PDRV_GENIRQ=m CONFIG_UIO_SMX=m +CONFIG_UIO_AEC=m CONFIG_UIO_SERCOS3=m # CONFIG_STAGING is not set CONFIG_X86_PLATFORM_DEVICES=y CONFIG_ACER_WMI=m CONFIG_ASUS_LAPTOP=m +CONFIG_DELL_WMI=m CONFIG_FUJITSU_LAPTOP=m # CONFIG_FUJITSU_LAPTOP_DEBUG is not set CONFIG_TC1100_WMI=m @@ -3826,6 +3856,7 @@ CONFIG_SONY_LAPTOP=m CONFIG_THINKPAD_ACPI=m # CONFIG_THINKPAD_ACPI_DEBUGFACILITIES is not set # CONFIG_THINKPAD_ACPI_DEBUG is not set +# CONFIG_THINKPAD_ACPI_UNSAFE_LEDS is not set CONFIG_THINKPAD_ACPI_BAY=y CONFIG_THINKPAD_ACPI_VIDEO=y CONFIG_THINKPAD_ACPI_HOTKEY_POLL=y @@ -3855,6 +3886,7 @@ CONFIG_EXT2_FS_POSIX_ACL=y CONFIG_EXT2_FS_SECURITY=y CONFIG_EXT2_FS_XIP=y CONFIG_EXT3_FS=m +# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set CONFIG_EXT3_FS_XATTR=y CONFIG_EXT3_FS_POSIX_ACL=y CONFIG_EXT3_FS_SECURITY=y @@ -3879,14 +3911,13 @@ CONFIG_JFS_SECURITY=y # CONFIG_JFS_DEBUG is not set CONFIG_JFS_STATISTICS=y CONFIG_FS_POSIX_ACL=y -CONFIG_FILE_LOCKING=y CONFIG_XFS_FS=m CONFIG_XFS_QUOTA=y CONFIG_XFS_POSIX_ACL=y CONFIG_XFS_RT=y # CONFIG_XFS_DEBUG is not set CONFIG_GFS2_FS=m -CONFIG_GFS2_FS_LOCKING_DLM=m +CONFIG_GFS2_FS_LOCKING_DLM=y CONFIG_OCFS2_FS=m CONFIG_OCFS2_FS_O2CB=m CONFIG_OCFS2_FS_USERSPACE_CLUSTER=m @@ -3896,6 +3927,7 @@ CONFIG_OCFS2_DEBUG_MASKLOG=y CONFIG_OCFS2_FS_POSIX_ACL=y CONFIG_BTRFS_FS=m CONFIG_BTRFS_FS_POSIX_ACL=y +CONFIG_FILE_LOCKING=y # CONFIG_DNOTIFY is not set CONFIG_INOTIFY=y CONFIG_INOTIFY_USER=y @@ -3911,6 +3943,17 @@ CONFIG_AUTOFS4_FS=m CONFIG_FUSE_FS=m # +# Caches +# +CONFIG_FSCACHE=m +CONFIG_FSCACHE_STATS=y +CONFIG_FSCACHE_HISTOGRAM=y +# CONFIG_FSCACHE_DEBUG is not set +CONFIG_CACHEFILES=m +# CONFIG_CACHEFILES_DEBUG is not set +# CONFIG_CACHEFILES_HISTOGRAM is not set + +# # CD-ROM/DVD Filesystems # CONFIG_ISO9660_FS=m @@ -3986,15 +4029,23 @@ CONFIG_OMFS_FS=m CONFIG_HPFS_FS=m CONFIG_QNX4FS_FS=m CONFIG_ROMFS_FS=m +CONFIG_ROMFS_BACKED_BY_BLOCK=y +# CONFIG_ROMFS_BACKED_BY_MTD is not set +# CONFIG_ROMFS_BACKED_BY_BOTH is not set +CONFIG_ROMFS_ON_BLOCK=y CONFIG_SYSV_FS=m CONFIG_UFS_FS=m # CONFIG_UFS_FS_WRITE is not set # CONFIG_UFS_DEBUG is not set +CONFIG_EXOFS_FS=m +# CONFIG_EXOFS_DEBUG is not set +CONFIG_NILFS2_FS=m CONFIG_NETWORK_FILESYSTEMS=y CONFIG_NFS_FS=m CONFIG_NFS_V3=y # CONFIG_NFS_V3_ACL is not set CONFIG_NFS_V4=y +# CONFIG_NFS_FSCACHE is not set CONFIG_NFSD=m CONFIG_NFSD_V3=y # CONFIG_NFSD_V3_ACL is not set @@ -4006,7 +4057,6 @@ CONFIG_NFS_COMMON=y CONFIG_SUNRPC=m CONFIG_SUNRPC_GSS=m CONFIG_SUNRPC_XPRT_RDMA=m -# CONFIG_SUNRPC_REGISTER_V4 is not set CONFIG_RPCSEC_GSS_KRB5=m CONFIG_RPCSEC_GSS_SPKM3=m CONFIG_SMB_FS=m @@ -4018,8 +4068,8 @@ CONFIG_CIFS=m CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y # CONFIG_CIFS_DEBUG2 is not set -CONFIG_CIFS_EXPERIMENTAL=y # CONFIG_CIFS_DFS_UPCALL is not set +CONFIG_CIFS_EXPERIMENTAL=y CONFIG_NCP_FS=m # CONFIG_NCPFS_PACKET_SIGNING is not set # CONFIG_NCPFS_IOCTL_LOCKING is not set @@ -4032,6 +4082,7 @@ CONFIG_NCP_FS=m CONFIG_CODA_FS=m CONFIG_AFS_FS=m # CONFIG_AFS_DEBUG is not set +# CONFIG_AFS_FSCACHE is not set CONFIG_9P_FS=m # @@ -4108,14 +4159,28 @@ CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FTRACE_SYSCALLS=y +CONFIG_TRACING_SUPPORT=y # # Tracers # +# CONFIG_IRQSOFF_TRACER is not set # CONFIG_SYSPROF_TRACER is not set +# CONFIG_SCHED_TRACER is not set +# CONFIG_CONTEXT_SWITCH_TRACER is not set +# CONFIG_EVENT_TRACER is not set +# CONFIG_FTRACE_SYSCALLS is not set +# CONFIG_BOOT_TRACER is not set +# CONFIG_TRACE_BRANCH_PROFILING is not set +# CONFIG_POWER_TRACER is not set +# CONFIG_KMEMTRACE is not set +# CONFIG_WORKQUEUE_TRACER is not set +# CONFIG_BLK_DEV_IO_TRACE is not set +# CONFIG_MMIOTRACE is not set # CONFIG_PROVIDE_OHCI1394_DMA_INIT is not set # CONFIG_FIREWIRE_OHCI_REMOTE_DMA is not set -# CONFIG_DYNAMIC_PRINTK_DEBUG is not set +# CONFIG_DMA_API_DEBUG is not set # CONFIG_SAMPLES is not set CONFIG_HAVE_ARCH_KGDB=y CONFIG_STRICT_DEVMEM=y @@ -4255,6 +4320,7 @@ CONFIG_PAX_SEGMEXEC=y # CONFIG_PAX_EMUTRAMP is not set CONFIG_PAX_MPROTECT=y CONFIG_PAX_NOELFRELOCS=y +CONFIG_PAX_KERNEXEC=y # # Address Space Layout Randomization @@ -4277,7 +4343,8 @@ CONFIG_SECURITYFS=y # CONFIG_SECURITY_NETWORK is not set # CONFIG_SECURITY_PATH is not set CONFIG_SECURITY_FILE_CAPABILITIES=y -CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=0 +# CONFIG_SECURITY_TOMOYO is not set +# CONFIG_IMA is not set CONFIG_XOR_BLOCKS=m CONFIG_ASYNC_CORE=m CONFIG_ASYNC_MEMCPY=m @@ -4298,10 +4365,12 @@ CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_CRYPTO_RNG=m CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_PCOMP=y CONFIG_CRYPTO_MANAGER=m CONFIG_CRYPTO_MANAGER2=y CONFIG_CRYPTO_GF128MUL=m CONFIG_CRYPTO_NULL=m +CONFIG_CRYPTO_WORKQUEUE=y CONFIG_CRYPTO_CRYPTD=m CONFIG_CRYPTO_AUTHENC=m CONFIG_CRYPTO_TEST=m @@ -4375,6 +4444,7 @@ CONFIG_CRYPTO_TWOFISH_586=m # Compression # CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_ZLIB=m CONFIG_CRYPTO_LZO=m # @@ -4394,11 +4464,13 @@ CONFIG_VIRTUALIZATION=y CONFIG_KVM=m CONFIG_KVM_INTEL=m CONFIG_KVM_AMD=m +# CONFIG_KVM_TRACE is not set CONFIG_LGUEST=m -CONFIG_VIRTIO=y -CONFIG_VIRTIO_RING=y +CONFIG_VIRTIO=m +CONFIG_VIRTIO_RING=m CONFIG_VIRTIO_PCI=m CONFIG_VIRTIO_BALLOON=m +# CONFIG_BINARY_PRINTF is not set # # Library routines @@ -4414,10 +4486,13 @@ CONFIG_CRC_ITU_T=m CONFIG_CRC32=m CONFIG_CRC7=m CONFIG_LIBCRC32C=m -CONFIG_ZLIB_INFLATE=m +CONFIG_ZLIB_INFLATE=y CONFIG_ZLIB_DEFLATE=m CONFIG_LZO_COMPRESS=m CONFIG_LZO_DECOMPRESS=m +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_LZMA=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_REED_SOLOMON=m CONFIG_REED_SOLOMON_DEC16=y @@ -4425,8 +4500,8 @@ CONFIG_TEXTSEARCH=y CONFIG_TEXTSEARCH_KMP=m CONFIG_TEXTSEARCH_BM=m CONFIG_TEXTSEARCH_FSM=m -CONFIG_PLIST=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT=y CONFIG_HAS_DMA=y CONFIG_CHECK_SIGNATURE=y +CONFIG_NLATTR=y diff --git a/main/linux-grsec/linux-nbma-mroute-v4-2.6.30.diff b/main/linux-grsec/linux-nbma-mroute-v4-2.6.30.diff new file mode 100644 index 0000000000..636d807a53 --- /dev/null +++ b/main/linux-grsec/linux-nbma-mroute-v4-2.6.30.diff @@ -0,0 +1,258 @@ +diff --git a/include/linux/mroute.h b/include/linux/mroute.h +index 0d45b4e..406ef6f 100644 +--- a/include/linux/mroute.h ++++ b/include/linux/mroute.h +@@ -33,7 +33,7 @@ + #define SIOCGETSGCNT (SIOCPROTOPRIVATE+1) + #define SIOCGETRPF (SIOCPROTOPRIVATE+2) + +-#define MAXVIFS 32 ++#define MAXVIFS 256 + typedef unsigned long vifbitmap_t; /* User mode code depends on this lot */ + typedef unsigned short vifi_t; + #define ALL_VIFS ((vifi_t)(-1)) +@@ -66,6 +66,7 @@ struct vifctl { + #define VIFF_TUNNEL 0x1 /* IPIP tunnel */ + #define VIFF_SRCRT 0x2 /* NI */ + #define VIFF_REGISTER 0x4 /* register vif */ ++#define VIFF_NBMA 0x10 + + /* + * Cache manipulation structures for mrouted and PIMd +diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c +index 13e9dd3..43c988b 100644 +--- a/net/ipv4/ipmr.c ++++ b/net/ipv4/ipmr.c +@@ -105,6 +105,31 @@ static struct net_protocol pim_protocol; + + static struct timer_list ipmr_expire_timer; + ++static __be32 ipmr_get_skb_nbma(struct sk_buff *skb) ++{ ++ union { ++ char addr[MAX_ADDR_LEN]; ++ __be32 inaddr; ++ } u; ++ ++ if (dev_parse_header(skb, u.addr) != 4) ++ return INADDR_ANY; ++ ++ return u.inaddr; ++} ++ ++static int ip_mr_match_vif_skb(struct vif_device *vif, struct sk_buff *skb) ++{ ++ if (vif->dev != skb->dev) ++ return 0; ++ ++ if (vif->flags & VIFF_NBMA) ++ return ipmr_get_skb_nbma(skb) == vif->remote; ++ ++ return 1; ++} ++ ++ + /* Service routines creating virtual interfaces: DVMRP tunnels and PIMREG */ + + static void ipmr_del_tunnel(struct net_device *dev, struct vifctl *v) +@@ -470,6 +495,7 @@ static int vif_add(struct net *net, struct vifctl *vifc, int mrtsock) + return err; + } + break; ++ case VIFF_NBMA: + case 0: + dev = ip_dev_find(net, vifc->vifc_lcl_addr.s_addr); + if (!dev) +@@ -504,7 +530,7 @@ static int vif_add(struct net *net, struct vifctl *vifc, int mrtsock) + v->pkt_in = 0; + v->pkt_out = 0; + v->link = dev->ifindex; +- if (v->flags&(VIFF_TUNNEL|VIFF_REGISTER)) ++ if (v->flags&(VIFF_TUNNEL|VIFF_REGISTER|VIFF_NBMA)) + v->link = dev->iflink; + + /* And finish update writing critical data */ +@@ -1212,12 +1238,15 @@ static inline int ipmr_forward_finish(struct sk_buff *skb) + { + struct ip_options * opt = &(IPCB(skb)->opt); + +- IP_INC_STATS_BH(dev_net(skb->dst->dev), IPSTATS_MIB_OUTFORWDATAGRAMS); ++ IP_INC_STATS_BH(dev_net(skb->dev), IPSTATS_MIB_OUTFORWDATAGRAMS); + + if (unlikely(opt->optlen)) + ip_forward_options(skb); + +- return dst_output(skb); ++ if (skb->dst != NULL) ++ return dst_output(skb); ++ else ++ return dev_queue_xmit(skb); + } + + /* +@@ -1230,7 +1259,8 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi) + const struct iphdr *iph = ip_hdr(skb); + struct vif_device *vif = &net->ipv4.vif_table[vifi]; + struct net_device *dev; +- struct rtable *rt; ++ struct net_device *fromdev = skb->dev; ++ struct rtable *rt = NULL; + int encap = 0; + + if (vif->dev == NULL) +@@ -1257,6 +1287,19 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi) + if (ip_route_output_key(net, &rt, &fl)) + goto out_free; + encap = sizeof(struct iphdr); ++ dev = rt->u.dst.dev; ++ } else if (vif->flags&VIFF_NBMA) { ++ /* Fixme, we should take tunnel source address from the ++ * tunnel device binding if it exists */ ++ struct flowi fl = { .oif = vif->link, ++ .nl_u = { .ip4_u = ++ { .daddr = vif->remote, ++ .tos = RT_TOS(iph->tos) } }, ++ .proto = IPPROTO_GRE }; ++ if (ip_route_output_key(&init_net, &rt, &fl)) ++ goto out_free; ++ encap = LL_RESERVED_SPACE(rt->u.dst.dev); ++ dev = vif->dev; + } else { + struct flowi fl = { .oif = vif->link, + .nl_u = { .ip4_u = +@@ -1265,34 +1308,39 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi) + .proto = IPPROTO_IPIP }; + if (ip_route_output_key(net, &rt, &fl)) + goto out_free; ++ dev = rt->u.dst.dev; + } + +- dev = rt->u.dst.dev; ++ if (!(vif->flags & VIFF_NBMA)) { ++ if (skb->len+encap > dst_mtu(&rt->u.dst) && (ntohs(iph->frag_off) & IP_DF)) { ++ /* Do not fragment multicasts. Alas, IPv4 does not ++ allow to send ICMP, so that packets will disappear ++ to blackhole. ++ */ + +- if (skb->len+encap > dst_mtu(&rt->u.dst) && (ntohs(iph->frag_off) & IP_DF)) { +- /* Do not fragment multicasts. Alas, IPv4 does not +- allow to send ICMP, so that packets will disappear +- to blackhole. +- */ +- +- IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_FRAGFAILS); +- ip_rt_put(rt); +- goto out_free; ++ IP_INC_STATS_BH(dev_net(dev), IPSTATS_MIB_FRAGFAILS); ++ goto out_free_rt; ++ } + } + + encap += LL_RESERVED_SPACE(dev) + rt->u.dst.header_len; + +- if (skb_cow(skb, encap)) { +- ip_rt_put(rt); +- goto out_free; +- } ++ if (skb_cow(skb, encap)) ++ goto out_free_rt; + + vif->pkt_out++; + vif->bytes_out += skb->len; + + dst_release(skb->dst); +- skb->dst = &rt->u.dst; ++ if (vif->flags & VIFF_NBMA) { ++ ip_rt_put(rt); ++ skb->dst = NULL; ++ rt = NULL; ++ } else { ++ skb->dst = &rt->u.dst; ++ } + ip_decrease_ttl(ip_hdr(skb)); ++ skb->dev = dev; + + /* FIXME: forward and output firewalls used to be called here. + * What do we do with netfilter? -- RR */ +@@ -1301,6 +1349,10 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi) + /* FIXME: extra output firewall step used to be here. --RR */ + vif->dev->stats.tx_packets++; + vif->dev->stats.tx_bytes += skb->len; ++ } else if (vif->flags & VIFF_NBMA) { ++ if (dev_hard_header(skb, dev, ntohs(skb->protocol), ++ &vif->remote, NULL, 4) < 0) ++ goto out_free_rt; + } + + IPCB(skb)->flags |= IPSKB_FORWARDED; +@@ -1316,21 +1368,30 @@ static void ipmr_queue_xmit(struct sk_buff *skb, struct mfc_cache *c, int vifi) + * not mrouter) cannot join to more than one interface - it will + * result in receiving multiple packets. + */ +- NF_HOOK(PF_INET, NF_INET_FORWARD, skb, skb->dev, dev, ++ NF_HOOK(PF_INET, NF_INET_FORWARD, skb, fromdev, dev, + ipmr_forward_finish); + return; + ++out_free_rt: ++ if (rt != NULL) ++ ip_rt_put(rt); + out_free: + kfree_skb(skb); + return; + } + +-static int ipmr_find_vif(struct net_device *dev) ++static int ipmr_find_vif(struct net_device *dev, __be32 nbma_origin) + { + struct net *net = dev_net(dev); + int ct; + for (ct = net->ipv4.maxvif-1; ct >= 0; ct--) { +- if (net->ipv4.vif_table[ct].dev == dev) ++ if (net->ipv4.vif_table[ct].dev != dev) ++ continue; ++ ++ if (net->ipv4.vif_table[ct].flags & VIFF_NBMA) { ++ if (net->ipv4.vif_table[ct].remote == nbma_origin) ++ break; ++ } else if (nbma_origin == INADDR_ANY) + break; + } + return ct; +@@ -1351,7 +1412,7 @@ static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local + /* + * Wrong interface: drop packet and (maybe) send PIM assert. + */ +- if (net->ipv4.vif_table[vif].dev != skb->dev) { ++ if (!ip_mr_match_vif_skb(&net->ipv4.vif_table[vif], skb)) { + int true_vifi; + + if (skb->rtable->fl.iif == 0) { +@@ -1370,7 +1431,7 @@ static int ip_mr_forward(struct sk_buff *skb, struct mfc_cache *cache, int local + } + + cache->mfc_un.res.wrong_if++; +- true_vifi = ipmr_find_vif(skb->dev); ++ true_vifi = ipmr_find_vif(skb->dev, ipmr_get_skb_nbma(skb)); + + if (true_vifi >= 0 && net->ipv4.mroute_do_assert && + /* pimsm uses asserts, when switching from RPT to SPT, +@@ -1479,7 +1540,7 @@ int ip_mr_input(struct sk_buff *skb) + skb = skb2; + } + +- vif = ipmr_find_vif(skb->dev); ++ vif = ipmr_find_vif(skb->dev, ipmr_get_skb_nbma(skb)); + if (vif >= 0) { + int err = ipmr_cache_unresolved(net, vif, skb); + read_unlock(&mrt_lock); +@@ -1663,7 +1724,7 @@ int ipmr_get_route(struct net *net, + } + + dev = skb->dev; +- if (dev == NULL || (vif = ipmr_find_vif(dev)) < 0) { ++ if (dev == NULL || (vif = ipmr_find_vif(dev, INADDR_ANY)) < 0) { + read_unlock(&mrt_lock); + return -ENODEV; + } |