- vserver up to patch-3.0.3-vs2.3.1-pre10.diff; grsec up to grsecurity-2.2.2-3.0...

Changed files:
    grsec/3.0/grsec-2.2.2-3.0.4-201108300001-1.patch -> 1.1
    kernel-grsec_full.patch -> 1.78
    kernel-vserver-2.3.patch -> 1.80
    kernel.spec -> 1.967

diff --git a/grsec/3.0/grsec-2.2.2-3.0.4-201108300001-1.patch b/grsec/3.0/grsec-2.2.2-3.0.4-201108300001-1.patch
new file mode 100644 (file)
index 0000000..3b537c4
--- /dev/null
+++ b/grsec/3.0/grsec-2.2.2-3.0.4-201108300001-1.patch
@@ -0,0 +1,214 @@
+--- kernel-grsec_full.patch.org        2011-08-30 06:16:41.000000000 +0200
++++ kernel-grsec_full.patch    2011-08-30 08:43:12.634284463 +0200
+@@ -11172,9 +11172,9 @@
+ @@ -186,7 +186,7 @@ void dump_stack(void)
+  
+       bp = stack_frame(current, NULL);
+-      printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+--             current->pid, current->comm, print_tainted(),
+-+             task_pid_nr(current), current->comm, print_tainted(),
++      printk("Pid: %d, comm: %.20s xid: #%u %s %s %.*s\n",
++-             current->pid, current->comm, current->xid, print_tainted(),
+++             task_pid_nr(current), current->comm, current->xid, print_tainted(),
+               init_utsname()->release,
+               (int)strcspn(init_utsname()->version, " "),
+               init_utsname()->version);
+@@ -14226,9 +14226,9 @@
+ @@ -106,7 +123,7 @@ void show_regs_common(void)
+  
+       printk(KERN_CONT "\n");
+-      printk(KERN_DEFAULT "Pid: %d, comm: %.20s %s %s %.*s",
+--             current->pid, current->comm, print_tainted(),
+-+             task_pid_nr(current), current->comm, print_tainted(),
++      printk(KERN_DEFAULT "Pid: %d, xid: #%u, comm: %.20s %s %s %.*s",
++-             current->pid, current->xid, current->comm, print_tainted(),
+++             task_pid_nr(current), current->xid, current->comm, print_tainted(),
+               init_utsname()->release,
+               (int)strcspn(init_utsname()->version, " "),
+               init_utsname()->version);
+@@ -40599,9 +40599,9 @@
+  #include <linux/slab.h>
+  #include <linux/fs_struct.h>
+ +#include <linux/grsecurity.h>
++ #include <linux/vserver/global.h>
+  #include "internal.h"
+  
+- static inline void path_get_longterm(struct path *path)
+ @@ -31,6 +32,7 @@ void set_fs_root(struct fs_struct *fs, s
+       old_root = fs->root;
+       fs->root = *path;
+@@ -42690,9 +42690,9 @@
+  #endif
+  #ifdef CONFIG_SCHEDSTATS
+ @@ -2857,6 +2972,9 @@ static const struct pid_entry tgid_base_
+- #ifdef CONFIG_HARDWALL
+       INF("hardwall",   S_IRUGO, proc_pid_hardwall),
+  #endif
++      ONE("nsproxy",  S_IRUGO, proc_pid_nsproxy),
+ +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
+ +     INF("ipaddr",     S_IRUSR, proc_pid_ipaddr),
+ +#endif
+@@ -42762,11 +42762,11 @@
+ +     rcu_read_unlock();
+ +#endif
+               filp->f_pos = iter.tgid + TGID_OFFSET;
++              if (!vx_proc_task_visible(iter.task))
++                      continue;
+ -             if (proc_pid_fill_cache(filp, dirent, filldir, iter) < 0) {
+ +             if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) {
+                       put_task_struct(iter.task);
+-                      goto out;
+-              }
+ @@ -3141,7 +3294,7 @@ static const struct pid_entry tid_base_s
+       REG("sched",     S_IRUGO|S_IWUSR, proc_pid_sched_operations),
+  #endif
+@@ -42844,9 +42844,9 @@
+ +#ifdef CONFIG_GRKERNSEC_PROC_IPADDR
+ +extern int proc_pid_ipaddr(struct task_struct *task, char *buffer);
+ +#endif
+- extern loff_t mem_lseek(struct file *file, loff_t offset, int orig);
++ extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
++                              struct pid *pid, struct task_struct *task);
+  
+- extern const struct file_operations proc_maps_operations;
+ diff -urNp linux-3.0.4/fs/proc/Kconfig linux-3.0.4/fs/proc/Kconfig
+ --- linux-3.0.4/fs/proc/Kconfig       2011-07-21 22:17:23.000000000 -0400
+ +++ linux-3.0.4/fs/proc/Kconfig       2011-08-23 21:48:14.000000000 -0400
+@@ -56614,10 +56614,10 @@
+  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)
+-@@ -258,7 +271,7 @@ union proc_op {
+-      int (*proc_show)(struct seq_file *m,
+-              struct pid_namespace *ns, struct pid *pid,
+-              struct task_struct *task);
++@@ -278,7 +278,7 @@ union proc_op {
++      int (*proc_vs_read)(char *page);
++      int (*proc_vxi_read)(struct vx_info *vxi, char *page);
++      int (*proc_nxi_read)(struct nx_info *nxi, char *page);
+ -};
+ +} __no_const;
+  
+@@ -58951,15 +58951,15 @@
+       new = kmem_cache_zalloc(cred_jar, GFP_KERNEL);
+       if (!new)
+               return NULL;
+-@@ -287,6 +295,8 @@ struct cred *prepare_creds(void)
+-      const struct cred *old;
++@@ -268,6 +268,8 @@ struct cred *__prepare_creds(const struc
++ {
+       struct cred *new;
+  
+ +     pax_track_stack();
+ +
+-      validate_process_creds();
+- 
+       new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
++      if (!new)
++              return NULL;
+ @@ -333,6 +343,8 @@ struct cred *prepare_exec_creds(void)
+       struct thread_group_cred *tgcred = NULL;
+       struct cred *new;
+@@ -59581,13 +59581,15 @@
+       return 0;
+  }
+  
+-@@ -1104,12 +1142,16 @@ static struct task_struct *copy_process(
+-      DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
+- #endif
+-      retval = -EAGAIN;
+-+
++@@ -1156,15 +1156,18 @@ static struct task_struct *copy_process(
++      init_vx_info(&p->vx_info, current_vx_info());
++      init_nx_info(&p->nx_info, current_nx_info());
++ 
+ +     gr_learn_resource(p, RLIMIT_NPROC, atomic_read(&p->real_cred->user->processes), 0);
+ +
++      retval = -EAGAIN;
++      if (!vx_nproc_avail(1))
++              goto bad_fork_free;
+       if (atomic_read(&p->real_cred->user->processes) >=
+                       task_rlimit(p, RLIMIT_NPROC)) {
+ -             if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) &&
+@@ -61009,8 +61011,8 @@
+ +     struct task_struct *task;
+ +
+       rcu_lockdep_assert(rcu_read_lock_held());
+--     return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
+-+     task = pid_task(find_pid_ns(nr, ns), PIDTYPE_PID);
++-     return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
+++     task = pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID);
+ +
+ +     if (gr_pid_is_chrooted(task))
+ +             return NULL;
+@@ -61236,7 +61238,7 @@
+ +#endif
+ +
+       if (syslog_action_restricted(type)) {
+-              if (capable(CAP_SYSLOG))
++              if (vx_capable(CAP_SYSLOG, VXC_SYSLOG))
+                       return 0;
+               /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */
+               if (capable(CAP_SYS_ADMIN)) {
+@@ -61895,7 +61897,7 @@
+ -     if (increment < 0 && !can_nice(current, nice))
+ +     if (increment < 0 && (!can_nice(current, nice) ||
+ +                           gr_handle_chroot_nice()))
+-              return -EPERM;
++              return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM;
+  
+       retval = security_task_setnice(current, nice);
+ @@ -5111,6 +5116,7 @@ recheck:
+@@ -61964,10 +61966,11 @@
+       if (is_global_init(tsk))
+               return 1;
+       if (handler != SIG_IGN && handler != SIG_DFL)
+-@@ -770,6 +773,13 @@ static int check_kill_permission(int sig
+-              }
++@@ -797,6 +797,14 @@
++                      sig, info, t, vx_task_xid(t), t->pid, current->xid);
++              return error;
+       }
+- 
+++
+ +     /* allow glibc communication via tgkill to other threads in our
+ +        thread group */
+ +     if ((info == SEND_SIG_NOINFO || info->si_code != SI_TKILL ||
+@@ -61975,9 +61978,9 @@
+ +         && gr_handle_signal(t, sig))
+ +             return -EPERM;
+ +
++ /* skip: */
+       return security_task_kill(t, info, sig, 0);
+  }
+- 
+ @@ -1092,7 +1102,7 @@ __group_send_sig_info(int sig, struct si
+       return send_signal(sig, info, p, 1);
+  }
+@@ -68124,13 +68127,13 @@
+  #include <net/inet_connection_sock.h>
+  #include <net/inet_hashtables.h>
+  #include <net/secure_seq.h>
++ #include <net/route.h>
+  #include <net/ip.h>
+  
+ +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
+ +
+  /*
+   * Allocate and initialize a new local port bind bucket.
+-  * The bindhash mutex for snum's hash chain must be held here.
+ @@ -530,6 +533,8 @@ ok:
+                       twrefcnt += inet_twsk_bind_unhash(tw, hinfo);
+               spin_unlock(&head->lock);
+@@ -68876,9 +68879,9 @@
+ +extern int grsec_enable_blackhole;
+ +#endif
+ +
+- int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2)
++ int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2)
+  {
+-      const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr;
++      const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr;
+ @@ -548,7 +552,7 @@ int udpv6_queue_rcv_skb(struct sock * sk
+  
+       return 0;

diff --git a/kernel-grsec_full.patch b/kernel-grsec_full.patch
index 7821afb149caf21cc9929d0fb9c15d39ef75b0e5..2d725f5820596c04e09562f37bf63944850524cc 100644 (file)
--- a/kernel-grsec_full.patch
+++ b/kernel-grsec_full.patch
@@ -1,6 +1,6 @@
-diff -urNp linux-3.0.3/arch/alpha/include/asm/elf.h linux-3.0.3/arch/alpha/include/asm/elf.h
---- linux-3.0.3/arch/alpha/include/asm/elf.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/include/asm/elf.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/include/asm/elf.h linux-3.0.4/arch/alpha/include/asm/elf.h
+--- linux-3.0.4/arch/alpha/include/asm/elf.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/include/asm/elf.h   2011-08-23 21:47:55.000000000 -0400
 @@ -90,6 +90,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x1000000)
@@ -15,9 +15,9 @@ diff -urNp linux-3.0.3/arch/alpha/include/asm/elf.h linux-3.0.3/arch/alpha/inclu
  /* $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-3.0.3/arch/alpha/include/asm/pgtable.h linux-3.0.3/arch/alpha/include/asm/pgtable.h
---- linux-3.0.3/arch/alpha/include/asm/pgtable.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/include/asm/pgtable.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/include/asm/pgtable.h linux-3.0.4/arch/alpha/include/asm/pgtable.h
+--- linux-3.0.4/arch/alpha/include/asm/pgtable.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/include/asm/pgtable.h       2011-08-23 21:47:55.000000000 -0400
 @@ -101,6 +101,17 @@ struct vm_area_struct;
  #define PAGE_SHARED   __pgprot(_PAGE_VALID | __ACCESS_BITS)
  #define PAGE_COPY     __pgprot(_PAGE_VALID | __ACCESS_BITS | _PAGE_FOW)
@@ -36,9 +36,9 @@ diff -urNp linux-3.0.3/arch/alpha/include/asm/pgtable.h linux-3.0.3/arch/alpha/i
  #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-3.0.3/arch/alpha/kernel/module.c linux-3.0.3/arch/alpha/kernel/module.c
---- linux-3.0.3/arch/alpha/kernel/module.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/kernel/module.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/kernel/module.c linux-3.0.4/arch/alpha/kernel/module.c
+--- linux-3.0.4/arch/alpha/kernel/module.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/kernel/module.c     2011-08-23 21:47:55.000000000 -0400
 @@ -182,7 +182,7 @@ apply_relocate_add(Elf64_Shdr *sechdrs, 
  
        /* The small sections were sorted to the end of the segment.
@@ -48,9 +48,9 @@ diff -urNp linux-3.0.3/arch/alpha/kernel/module.c linux-3.0.3/arch/alpha/kernel/
        got = sechdrs[me->arch.gotsecindex].sh_addr;
  
        for (i = 0; i < n; i++) {
-diff -urNp linux-3.0.3/arch/alpha/kernel/osf_sys.c linux-3.0.3/arch/alpha/kernel/osf_sys.c
---- linux-3.0.3/arch/alpha/kernel/osf_sys.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/kernel/osf_sys.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/kernel/osf_sys.c linux-3.0.4/arch/alpha/kernel/osf_sys.c
+--- linux-3.0.4/arch/alpha/kernel/osf_sys.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/kernel/osf_sys.c    2011-08-23 21:47:55.000000000 -0400
 @@ -1145,7 +1145,7 @@ arch_get_unmapped_area_1(unsigned long a
                /* At this point:  (!vma || addr < vma->vm_end). */
                if (limit - len < addr)
@@ -82,9 +82,9 @@ diff -urNp linux-3.0.3/arch/alpha/kernel/osf_sys.c linux-3.0.3/arch/alpha/kernel
        if (addr != (unsigned long) -ENOMEM)
                return addr;
  
-diff -urNp linux-3.0.3/arch/alpha/mm/fault.c linux-3.0.3/arch/alpha/mm/fault.c
---- linux-3.0.3/arch/alpha/mm/fault.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/alpha/mm/fault.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/alpha/mm/fault.c linux-3.0.4/arch/alpha/mm/fault.c
+--- linux-3.0.4/arch/alpha/mm/fault.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/alpha/mm/fault.c  2011-08-23 21:47:55.000000000 -0400
 @@ -54,6 +54,124 @@ __load_new_mm_context(struct mm_struct *
        __reload_thread(pcb);
  }
@@ -241,9 +241,9 @@ diff -urNp linux-3.0.3/arch/alpha/mm/fault.c linux-3.0.3/arch/alpha/mm/fault.c
        } else if (!cause) {
                /* Allow reads even for write-only mappings */
                if (!(vma->vm_flags & (VM_READ | VM_WRITE)))
-diff -urNp linux-3.0.3/arch/arm/include/asm/elf.h linux-3.0.3/arch/arm/include/asm/elf.h
---- linux-3.0.3/arch/arm/include/asm/elf.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/include/asm/elf.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/include/asm/elf.h linux-3.0.4/arch/arm/include/asm/elf.h
+--- linux-3.0.4/arch/arm/include/asm/elf.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/include/asm/elf.h     2011-08-23 21:47:55.000000000 -0400
 @@ -116,7 +116,14 @@ int dump_task_regs(struct task_struct *t
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -271,9 +271,9 @@ diff -urNp linux-3.0.3/arch/arm/include/asm/elf.h linux-3.0.3/arch/arm/include/a
  extern int vectors_user_mapping(void);
  #define arch_setup_additional_pages(bprm, uses_interp) vectors_user_mapping()
  #define ARCH_HAS_SETUP_ADDITIONAL_PAGES
-diff -urNp linux-3.0.3/arch/arm/include/asm/kmap_types.h linux-3.0.3/arch/arm/include/asm/kmap_types.h
---- linux-3.0.3/arch/arm/include/asm/kmap_types.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/include/asm/kmap_types.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/include/asm/kmap_types.h linux-3.0.4/arch/arm/include/asm/kmap_types.h
+--- linux-3.0.4/arch/arm/include/asm/kmap_types.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/include/asm/kmap_types.h      2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,7 @@ enum km_type {
        KM_L1_CACHE,
        KM_L2_CACHE,
@@ -282,9 +282,9 @@ diff -urNp linux-3.0.3/arch/arm/include/asm/kmap_types.h linux-3.0.3/arch/arm/in
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/arm/include/asm/uaccess.h linux-3.0.3/arch/arm/include/asm/uaccess.h
---- linux-3.0.3/arch/arm/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/include/asm/uaccess.h linux-3.0.4/arch/arm/include/asm/uaccess.h
+--- linux-3.0.4/arch/arm/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400
 @@ -22,6 +22,8 @@
  #define VERIFY_READ 0
  #define VERIFY_WRITE 1
@@ -340,9 +340,9 @@ diff -urNp linux-3.0.3/arch/arm/include/asm/uaccess.h linux-3.0.3/arch/arm/inclu
        if (access_ok(VERIFY_WRITE, to, n))
                n = __copy_to_user(to, from, n);
        return n;
-diff -urNp linux-3.0.3/arch/arm/kernel/armksyms.c linux-3.0.3/arch/arm/kernel/armksyms.c
---- linux-3.0.3/arch/arm/kernel/armksyms.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/kernel/armksyms.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/kernel/armksyms.c linux-3.0.4/arch/arm/kernel/armksyms.c
+--- linux-3.0.4/arch/arm/kernel/armksyms.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/kernel/armksyms.c     2011-08-23 21:47:55.000000000 -0400
 @@ -98,8 +98,8 @@ EXPORT_SYMBOL(__strncpy_from_user);
  #ifdef CONFIG_MMU
  EXPORT_SYMBOL(copy_page);
@@ -354,9 +354,9 @@ diff -urNp linux-3.0.3/arch/arm/kernel/armksyms.c linux-3.0.3/arch/arm/kernel/ar
  EXPORT_SYMBOL(__clear_user);
  
  EXPORT_SYMBOL(__get_user_1);
-diff -urNp linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3/arch/arm/kernel/process.c
---- linux-3.0.3/arch/arm/kernel/process.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/kernel/process.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/kernel/process.c linux-3.0.4/arch/arm/kernel/process.c
+--- linux-3.0.4/arch/arm/kernel/process.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/kernel/process.c      2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,6 @@
  #include <linux/tick.h>
  #include <linux/utsname.h>
@@ -378,9 +378,9 @@ diff -urNp linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3/arch/arm/kernel/pro
  #ifdef CONFIG_MMU
  /*
   * The vectors page is always readable from user space for the
-diff -urNp linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3/arch/arm/kernel/traps.c
---- linux-3.0.3/arch/arm/kernel/traps.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/kernel/traps.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/kernel/traps.c linux-3.0.4/arch/arm/kernel/traps.c
+--- linux-3.0.4/arch/arm/kernel/traps.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/kernel/traps.c        2011-08-23 21:48:14.000000000 -0400
 @@ -257,6 +257,8 @@ static int __die(const char *str, int er
  
  static DEFINE_SPINLOCK(die_lock);
@@ -400,9 +400,9 @@ diff -urNp linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3/arch/arm/kernel/traps
        if (ret != NOTIFY_STOP)
                do_exit(SIGSEGV);
  }
-diff -urNp linux-3.0.3/arch/arm/lib/copy_from_user.S linux-3.0.3/arch/arm/lib/copy_from_user.S
---- linux-3.0.3/arch/arm/lib/copy_from_user.S  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/copy_from_user.S  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/copy_from_user.S linux-3.0.4/arch/arm/lib/copy_from_user.S
+--- linux-3.0.4/arch/arm/lib/copy_from_user.S  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/copy_from_user.S  2011-08-23 21:47:55.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -426,9 +426,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/copy_from_user.S linux-3.0.3/arch/arm/lib/co
  
        .pushsection .fixup,"ax"
        .align 0
-diff -urNp linux-3.0.3/arch/arm/lib/copy_to_user.S linux-3.0.3/arch/arm/lib/copy_to_user.S
---- linux-3.0.3/arch/arm/lib/copy_to_user.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/copy_to_user.S    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/copy_to_user.S linux-3.0.4/arch/arm/lib/copy_to_user.S
+--- linux-3.0.4/arch/arm/lib/copy_to_user.S    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/copy_to_user.S    2011-08-23 21:47:55.000000000 -0400
 @@ -16,7 +16,7 @@
  /*
   * Prototype:
@@ -452,9 +452,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/copy_to_user.S linux-3.0.3/arch/arm/lib/copy
  ENDPROC(__copy_to_user_std)
  
        .pushsection .fixup,"ax"
-diff -urNp linux-3.0.3/arch/arm/lib/uaccess.S linux-3.0.3/arch/arm/lib/uaccess.S
---- linux-3.0.3/arch/arm/lib/uaccess.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/uaccess.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/uaccess.S linux-3.0.4/arch/arm/lib/uaccess.S
+--- linux-3.0.4/arch/arm/lib/uaccess.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/uaccess.S 2011-08-23 21:47:55.000000000 -0400
 @@ -20,7 +20,7 @@
  
  #define PAGE_SHIFT 12
@@ -508,9 +508,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/uaccess.S linux-3.0.3/arch/arm/lib/uaccess.S
  
                .pushsection .fixup,"ax"
                .align  0
-diff -urNp linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c
---- linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c
+--- linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/lib/uaccess_with_memcpy.c     2011-08-23 21:47:55.000000000 -0400
 @@ -103,7 +103,7 @@ out:
  }
  
@@ -520,9 +520,9 @@ diff -urNp linux-3.0.3/arch/arm/lib/uaccess_with_memcpy.c linux-3.0.3/arch/arm/l
  {
        /*
         * This test is stubbed out of the main function above to keep
-diff -urNp linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c
---- linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c
+--- linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/mach-ux500/mbox-db5500.c      2011-08-23 21:48:14.000000000 -0400
 @@ -168,7 +168,7 @@ static ssize_t mbox_read_fifo(struct dev
        return sprintf(buf, "0x%X\n", mbox_value);
  }
@@ -532,9 +532,9 @@ diff -urNp linux-3.0.3/arch/arm/mach-ux500/mbox-db5500.c linux-3.0.3/arch/arm/ma
  
  static int mbox_show(struct seq_file *s, void *data)
  {
-diff -urNp linux-3.0.3/arch/arm/mm/fault.c linux-3.0.3/arch/arm/mm/fault.c
---- linux-3.0.3/arch/arm/mm/fault.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/mm/fault.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/mm/fault.c linux-3.0.4/arch/arm/mm/fault.c
+--- linux-3.0.4/arch/arm/mm/fault.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/mm/fault.c    2011-08-23 21:47:55.000000000 -0400
 @@ -182,6 +182,13 @@ __do_user_fault(struct task_struct *tsk,
        }
  #endif
@@ -583,9 +583,9 @@ diff -urNp linux-3.0.3/arch/arm/mm/fault.c linux-3.0.3/arch/arm/mm/fault.c
  /*
   * First Level Translation Fault Handler
   *
-diff -urNp linux-3.0.3/arch/arm/mm/mmap.c linux-3.0.3/arch/arm/mm/mmap.c
---- linux-3.0.3/arch/arm/mm/mmap.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/arm/mm/mmap.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/arm/mm/mmap.c linux-3.0.4/arch/arm/mm/mmap.c
+--- linux-3.0.4/arch/arm/mm/mmap.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/arm/mm/mmap.c     2011-08-23 21:47:55.000000000 -0400
 @@ -65,6 +65,10 @@ arch_get_unmapped_area(struct file *filp
        if (len > TASK_SIZE)
                return -ENOMEM;
@@ -635,9 +635,9 @@ diff -urNp linux-3.0.3/arch/arm/mm/mmap.c linux-3.0.3/arch/arm/mm/mmap.c
                        /*
                         * Remember the place where we stopped the search:
                         */
-diff -urNp linux-3.0.3/arch/avr32/include/asm/elf.h linux-3.0.3/arch/avr32/include/asm/elf.h
---- linux-3.0.3/arch/avr32/include/asm/elf.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/avr32/include/asm/elf.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/avr32/include/asm/elf.h linux-3.0.4/arch/avr32/include/asm/elf.h
+--- linux-3.0.4/arch/avr32/include/asm/elf.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/avr32/include/asm/elf.h   2011-08-23 21:47:55.000000000 -0400
 @@ -84,8 +84,14 @@ typedef struct user_fpu_struct elf_fpreg
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -654,9 +654,9 @@ diff -urNp linux-3.0.3/arch/avr32/include/asm/elf.h linux-3.0.3/arch/avr32/inclu
  
  /* 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-3.0.3/arch/avr32/include/asm/kmap_types.h linux-3.0.3/arch/avr32/include/asm/kmap_types.h
---- linux-3.0.3/arch/avr32/include/asm/kmap_types.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/avr32/include/asm/kmap_types.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/avr32/include/asm/kmap_types.h linux-3.0.4/arch/avr32/include/asm/kmap_types.h
+--- linux-3.0.4/arch/avr32/include/asm/kmap_types.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/avr32/include/asm/kmap_types.h    2011-08-23 21:47:55.000000000 -0400
 @@ -22,7 +22,8 @@ D(10)        KM_IRQ0,
  D(11) KM_IRQ1,
  D(12) KM_SOFTIRQ0,
@@ -667,9 +667,9 @@ diff -urNp linux-3.0.3/arch/avr32/include/asm/kmap_types.h linux-3.0.3/arch/avr3
  };
  
  #undef D
-diff -urNp linux-3.0.3/arch/avr32/mm/fault.c linux-3.0.3/arch/avr32/mm/fault.c
---- linux-3.0.3/arch/avr32/mm/fault.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/avr32/mm/fault.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/avr32/mm/fault.c linux-3.0.4/arch/avr32/mm/fault.c
+--- linux-3.0.4/arch/avr32/mm/fault.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/avr32/mm/fault.c  2011-08-23 21:47:55.000000000 -0400
 @@ -41,6 +41,23 @@ static inline int notify_page_fault(stru
  
  int exception_trace = 1;
@@ -711,9 +711,9 @@ diff -urNp linux-3.0.3/arch/avr32/mm/fault.c linux-3.0.3/arch/avr32/mm/fault.c
                if (exception_trace && printk_ratelimit())
                        printk("%s%s[%d]: segfault at %08lx pc %08lx "
                               "sp %08lx ecr %lu\n",
-diff -urNp linux-3.0.3/arch/frv/include/asm/kmap_types.h linux-3.0.3/arch/frv/include/asm/kmap_types.h
---- linux-3.0.3/arch/frv/include/asm/kmap_types.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/frv/include/asm/kmap_types.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/frv/include/asm/kmap_types.h linux-3.0.4/arch/frv/include/asm/kmap_types.h
+--- linux-3.0.4/arch/frv/include/asm/kmap_types.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/frv/include/asm/kmap_types.h      2011-08-23 21:47:55.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -722,9 +722,9 @@ diff -urNp linux-3.0.3/arch/frv/include/asm/kmap_types.h linux-3.0.3/arch/frv/in
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/frv/mm/elf-fdpic.c linux-3.0.3/arch/frv/mm/elf-fdpic.c
---- linux-3.0.3/arch/frv/mm/elf-fdpic.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/frv/mm/elf-fdpic.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/frv/mm/elf-fdpic.c linux-3.0.4/arch/frv/mm/elf-fdpic.c
+--- linux-3.0.4/arch/frv/mm/elf-fdpic.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/frv/mm/elf-fdpic.c        2011-08-23 21:47:55.000000000 -0400
 @@ -73,8 +73,7 @@ unsigned long arch_get_unmapped_area(str
        if (addr) {
                addr = PAGE_ALIGN(addr);
@@ -753,9 +753,9 @@ diff -urNp linux-3.0.3/arch/frv/mm/elf-fdpic.c linux-3.0.3/arch/frv/mm/elf-fdpic
                                goto success;
                        addr = vma->vm_end;
                }
-diff -urNp linux-3.0.3/arch/ia64/include/asm/elf.h linux-3.0.3/arch/ia64/include/asm/elf.h
---- linux-3.0.3/arch/ia64/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/elf.h linux-3.0.4/arch/ia64/include/asm/elf.h
+--- linux-3.0.4/arch/ia64/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
 @@ -42,6 +42,13 @@
   */
  #define ELF_ET_DYN_BASE               (TASK_UNMAPPED_BASE + 0x800000000UL)
@@ -770,9 +770,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/elf.h linux-3.0.3/arch/ia64/include
  #define PT_IA_64_UNWIND               0x70000001
  
  /* IA-64 relocations: */
-diff -urNp linux-3.0.3/arch/ia64/include/asm/pgtable.h linux-3.0.3/arch/ia64/include/asm/pgtable.h
---- linux-3.0.3/arch/ia64/include/asm/pgtable.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/pgtable.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/pgtable.h linux-3.0.4/arch/ia64/include/asm/pgtable.h
+--- linux-3.0.4/arch/ia64/include/asm/pgtable.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/pgtable.h        2011-08-23 21:47:55.000000000 -0400
 @@ -12,7 +12,7 @@
   *    David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -800,9 +800,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/pgtable.h linux-3.0.3/arch/ia64/inc
  #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-3.0.3/arch/ia64/include/asm/spinlock.h linux-3.0.3/arch/ia64/include/asm/spinlock.h
---- linux-3.0.3/arch/ia64/include/asm/spinlock.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/spinlock.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/spinlock.h linux-3.0.4/arch/ia64/include/asm/spinlock.h
+--- linux-3.0.4/arch/ia64/include/asm/spinlock.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/spinlock.h       2011-08-23 21:47:55.000000000 -0400
 @@ -72,7 +72,7 @@ static __always_inline void __ticket_spi
        unsigned short  *p = (unsigned short *)&lock->lock + 1, tmp;
  
@@ -812,9 +812,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/spinlock.h linux-3.0.3/arch/ia64/in
  }
  
  static __always_inline void __ticket_spin_unlock_wait(arch_spinlock_t *lock)
-diff -urNp linux-3.0.3/arch/ia64/include/asm/uaccess.h linux-3.0.3/arch/ia64/include/asm/uaccess.h
---- linux-3.0.3/arch/ia64/include/asm/uaccess.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/include/asm/uaccess.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/include/asm/uaccess.h linux-3.0.4/arch/ia64/include/asm/uaccess.h
+--- linux-3.0.4/arch/ia64/include/asm/uaccess.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/include/asm/uaccess.h        2011-08-23 21:47:55.000000000 -0400
 @@ -257,7 +257,7 @@ __copy_from_user (void *to, const void _
        const void *__cu_from = (from);                                                 \
        long __cu_len = (n);                                                            \
@@ -833,9 +833,9 @@ diff -urNp linux-3.0.3/arch/ia64/include/asm/uaccess.h linux-3.0.3/arch/ia64/inc
                __cu_len = __copy_user((__force void __user *) __cu_to, __cu_from, __cu_len);   \
        __cu_len;                                                                       \
  })
-diff -urNp linux-3.0.3/arch/ia64/kernel/module.c linux-3.0.3/arch/ia64/kernel/module.c
---- linux-3.0.3/arch/ia64/kernel/module.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/kernel/module.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/kernel/module.c linux-3.0.4/arch/ia64/kernel/module.c
+--- linux-3.0.4/arch/ia64/kernel/module.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/kernel/module.c      2011-08-23 21:47:55.000000000 -0400
 @@ -315,8 +315,7 @@ module_alloc (unsigned long size)
  void
  module_free (struct module *mod, void *module_region)
@@ -924,9 +924,9 @@ diff -urNp linux-3.0.3/arch/ia64/kernel/module.c linux-3.0.3/arch/ia64/kernel/mo
                mod->arch.gp = gp;
                DEBUGP("%s: placing gp at 0x%lx\n", __func__, gp);
        }
-diff -urNp linux-3.0.3/arch/ia64/kernel/sys_ia64.c linux-3.0.3/arch/ia64/kernel/sys_ia64.c
---- linux-3.0.3/arch/ia64/kernel/sys_ia64.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/kernel/sys_ia64.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/kernel/sys_ia64.c linux-3.0.4/arch/ia64/kernel/sys_ia64.c
+--- linux-3.0.4/arch/ia64/kernel/sys_ia64.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/kernel/sys_ia64.c    2011-08-23 21:47:55.000000000 -0400
 @@ -43,6 +43,13 @@ arch_get_unmapped_area (struct file *fil
        if (REGION_NUMBER(addr) == RGN_HPAGE)
                addr = 0;
@@ -959,9 +959,9 @@ diff -urNp linux-3.0.3/arch/ia64/kernel/sys_ia64.c linux-3.0.3/arch/ia64/kernel/
                        /* Remember the address where we stopped this search:  */
                        mm->free_area_cache = addr + len;
                        return addr;
-diff -urNp linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S
---- linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S
+--- linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/kernel/vmlinux.lds.S 2011-08-23 21:47:55.000000000 -0400
 @@ -199,7 +199,7 @@ SECTIONS {
        /* Per-cpu data: */
        . = ALIGN(PERCPU_PAGE_SIZE);
@@ -971,9 +971,9 @@ diff -urNp linux-3.0.3/arch/ia64/kernel/vmlinux.lds.S linux-3.0.3/arch/ia64/kern
        /*
         * ensure percpu data fits
         * into percpu page size
-diff -urNp linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3/arch/ia64/mm/fault.c
---- linux-3.0.3/arch/ia64/mm/fault.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/mm/fault.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/mm/fault.c linux-3.0.4/arch/ia64/mm/fault.c
+--- linux-3.0.4/arch/ia64/mm/fault.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/mm/fault.c   2011-08-23 21:47:55.000000000 -0400
 @@ -73,6 +73,23 @@ mapped_kernel_page_is_present (unsigned 
        return pte_present(pte);
  }
@@ -1023,9 +1023,9 @@ diff -urNp linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3/arch/ia64/mm/fault.c
        /*
         * If for any reason at all we couldn't handle the fault, make
         * sure we exit gracefully rather than endlessly redo the
-diff -urNp linux-3.0.3/arch/ia64/mm/hugetlbpage.c linux-3.0.3/arch/ia64/mm/hugetlbpage.c
---- linux-3.0.3/arch/ia64/mm/hugetlbpage.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/mm/hugetlbpage.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/mm/hugetlbpage.c linux-3.0.4/arch/ia64/mm/hugetlbpage.c
+--- linux-3.0.4/arch/ia64/mm/hugetlbpage.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/mm/hugetlbpage.c     2011-08-23 21:47:55.000000000 -0400
 @@ -171,7 +171,7 @@ unsigned long hugetlb_get_unmapped_area(
                /* At this point:  (!vmm || addr < vmm->vm_end). */
                if (REGION_OFFSET(addr) + len > RGN_MAP_LIMIT)
@@ -1035,9 +1035,9 @@ diff -urNp linux-3.0.3/arch/ia64/mm/hugetlbpage.c linux-3.0.3/arch/ia64/mm/huget
                        return addr;
                addr = ALIGN(vmm->vm_end, HPAGE_SIZE);
        }
-diff -urNp linux-3.0.3/arch/ia64/mm/init.c linux-3.0.3/arch/ia64/mm/init.c
---- linux-3.0.3/arch/ia64/mm/init.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/ia64/mm/init.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/ia64/mm/init.c linux-3.0.4/arch/ia64/mm/init.c
+--- linux-3.0.4/arch/ia64/mm/init.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/ia64/mm/init.c    2011-08-23 21:47:55.000000000 -0400
 @@ -120,6 +120,19 @@ ia64_init_addr_space (void)
                vma->vm_start = current->thread.rbs_bot & PAGE_MASK;
                vma->vm_end = vma->vm_start + PAGE_SIZE;
@@ -1058,9 +1058,9 @@ diff -urNp linux-3.0.3/arch/ia64/mm/init.c linux-3.0.3/arch/ia64/mm/init.c
                vma->vm_page_prot = vm_get_page_prot(vma->vm_flags);
                down_write(&current->mm->mmap_sem);
                if (insert_vm_struct(current->mm, vma)) {
-diff -urNp linux-3.0.3/arch/m32r/lib/usercopy.c linux-3.0.3/arch/m32r/lib/usercopy.c
---- linux-3.0.3/arch/m32r/lib/usercopy.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/m32r/lib/usercopy.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/m32r/lib/usercopy.c linux-3.0.4/arch/m32r/lib/usercopy.c
+--- linux-3.0.4/arch/m32r/lib/usercopy.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/m32r/lib/usercopy.c       2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@
  unsigned long
  __generic_copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -1081,9 +1081,9 @@ diff -urNp linux-3.0.3/arch/m32r/lib/usercopy.c linux-3.0.3/arch/m32r/lib/userco
        prefetchw(to);
        if (access_ok(VERIFY_READ, from, n))
                __copy_user_zeroing(to,from,n);
-diff -urNp linux-3.0.3/arch/mips/include/asm/elf.h linux-3.0.3/arch/mips/include/asm/elf.h
---- linux-3.0.3/arch/mips/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/include/asm/elf.h linux-3.0.4/arch/mips/include/asm/elf.h
+--- linux-3.0.4/arch/mips/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
 @@ -372,13 +372,16 @@ extern const char *__elf_platform;
  #define ELF_ET_DYN_BASE         (TASK_SIZE / 3 * 2)
  #endif
@@ -1105,9 +1105,9 @@ diff -urNp linux-3.0.3/arch/mips/include/asm/elf.h linux-3.0.3/arch/mips/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_ELF_H */
-diff -urNp linux-3.0.3/arch/mips/include/asm/page.h linux-3.0.3/arch/mips/include/asm/page.h
---- linux-3.0.3/arch/mips/include/asm/page.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/include/asm/page.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/include/asm/page.h linux-3.0.4/arch/mips/include/asm/page.h
+--- linux-3.0.4/arch/mips/include/asm/page.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/include/asm/page.h   2011-08-23 21:47:55.000000000 -0400
 @@ -93,7 +93,7 @@ extern void copy_user_highpage(struct pa
    #ifdef CONFIG_CPU_MIPS32
      typedef struct { unsigned long pte_low, pte_high; } pte_t;
@@ -1117,9 +1117,9 @@ diff -urNp linux-3.0.3/arch/mips/include/asm/page.h linux-3.0.3/arch/mips/includ
    #else
       typedef struct { unsigned long long pte; } pte_t;
       #define pte_val(x)       ((x).pte)
-diff -urNp linux-3.0.3/arch/mips/include/asm/system.h linux-3.0.3/arch/mips/include/asm/system.h
---- linux-3.0.3/arch/mips/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/include/asm/system.h linux-3.0.4/arch/mips/include/asm/system.h
+--- linux-3.0.4/arch/mips/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400
 @@ -230,6 +230,6 @@ extern void per_cpu_trap_init(void);
   */
  #define __ARCH_WANT_UNLOCKED_CTXSW
@@ -1128,9 +1128,9 @@ diff -urNp linux-3.0.3/arch/mips/include/asm/system.h linux-3.0.3/arch/mips/incl
 +#define arch_align_stack(x) ((x) & ~0xfUL)
  
  #endif /* _ASM_SYSTEM_H */
-diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c
---- linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c
+--- linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/kernel/binfmt_elfn32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -50,6 +50,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1145,9 +1145,9 @@ diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfn32.c linux-3.0.3/arch/mips/ke
  #include <asm/processor.h>
  #include <linux/module.h>
  #include <linux/elfcore.h>
-diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c
---- linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c
+--- linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/kernel/binfmt_elfo32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -52,6 +52,13 @@ typedef elf_fpreg_t elf_fpregset_t[ELF_N
  #undef ELF_ET_DYN_BASE
  #define ELF_ET_DYN_BASE         (TASK32_SIZE / 3 * 2)
@@ -1162,9 +1162,9 @@ diff -urNp linux-3.0.3/arch/mips/kernel/binfmt_elfo32.c linux-3.0.3/arch/mips/ke
  #include <asm/processor.h>
  
  /*
-diff -urNp linux-3.0.3/arch/mips/kernel/process.c linux-3.0.3/arch/mips/kernel/process.c
---- linux-3.0.3/arch/mips/kernel/process.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/kernel/process.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/kernel/process.c linux-3.0.4/arch/mips/kernel/process.c
+--- linux-3.0.4/arch/mips/kernel/process.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/kernel/process.c     2011-08-23 21:47:55.000000000 -0400
 @@ -473,15 +473,3 @@ unsigned long get_wchan(struct task_stru
  out:
        return pc;
@@ -1181,9 +1181,9 @@ diff -urNp linux-3.0.3/arch/mips/kernel/process.c linux-3.0.3/arch/mips/kernel/p
 -
 -      return sp & ALMASK;
 -}
-diff -urNp linux-3.0.3/arch/mips/mm/fault.c linux-3.0.3/arch/mips/mm/fault.c
---- linux-3.0.3/arch/mips/mm/fault.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/mm/fault.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/mm/fault.c linux-3.0.4/arch/mips/mm/fault.c
+--- linux-3.0.4/arch/mips/mm/fault.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/mm/fault.c   2011-08-23 21:47:55.000000000 -0400
 @@ -28,6 +28,23 @@
  #include <asm/highmem.h>              /* For VMALLOC_END */
  #include <linux/kdebug.h>
@@ -1208,9 +1208,9 @@ diff -urNp linux-3.0.3/arch/mips/mm/fault.c linux-3.0.3/arch/mips/mm/fault.c
  /*
   * 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-3.0.3/arch/mips/mm/mmap.c linux-3.0.3/arch/mips/mm/mmap.c
---- linux-3.0.3/arch/mips/mm/mmap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/mips/mm/mmap.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/mips/mm/mmap.c linux-3.0.4/arch/mips/mm/mmap.c
+--- linux-3.0.4/arch/mips/mm/mmap.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/mips/mm/mmap.c    2011-08-23 21:47:55.000000000 -0400
 @@ -48,14 +48,18 @@ unsigned long arch_get_unmapped_area(str
        do_color_align = 0;
        if (filp || (flags & MAP_SHARED))
@@ -1272,9 +1272,9 @@ diff -urNp linux-3.0.3/arch/mips/mm/mmap.c linux-3.0.3/arch/mips/mm/mmap.c
 -
 -      return ret;
 -}
-diff -urNp linux-3.0.3/arch/parisc/include/asm/elf.h linux-3.0.3/arch/parisc/include/asm/elf.h
---- linux-3.0.3/arch/parisc/include/asm/elf.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/include/asm/elf.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/include/asm/elf.h linux-3.0.4/arch/parisc/include/asm/elf.h
+--- linux-3.0.4/arch/parisc/include/asm/elf.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/include/asm/elf.h  2011-08-23 21:47:55.000000000 -0400
 @@ -342,6 +342,13 @@ struct pt_regs;   /* forward declaration..
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE + 0x01000000)
@@ -1289,9 +1289,9 @@ diff -urNp linux-3.0.3/arch/parisc/include/asm/elf.h linux-3.0.3/arch/parisc/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,
     but it's not easy, and we've already done it here.  */
-diff -urNp linux-3.0.3/arch/parisc/include/asm/pgtable.h linux-3.0.3/arch/parisc/include/asm/pgtable.h
---- linux-3.0.3/arch/parisc/include/asm/pgtable.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/include/asm/pgtable.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/include/asm/pgtable.h linux-3.0.4/arch/parisc/include/asm/pgtable.h
+--- linux-3.0.4/arch/parisc/include/asm/pgtable.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/include/asm/pgtable.h      2011-08-23 21:47:55.000000000 -0400
 @@ -210,6 +210,17 @@ struct vm_area_struct;
  #define PAGE_EXECREAD   __pgprot(_PAGE_PRESENT | _PAGE_USER | _PAGE_READ | _PAGE_EXEC |_PAGE_ACCESSED)
  #define PAGE_COPY       PAGE_EXECREAD
@@ -1310,9 +1310,9 @@ diff -urNp linux-3.0.3/arch/parisc/include/asm/pgtable.h linux-3.0.3/arch/parisc
  #define PAGE_KERNEL   __pgprot(_PAGE_KERNEL)
  #define PAGE_KERNEL_EXEC      __pgprot(_PAGE_KERNEL_EXEC)
  #define PAGE_KERNEL_RWX       __pgprot(_PAGE_KERNEL_RWX)
-diff -urNp linux-3.0.3/arch/parisc/kernel/module.c linux-3.0.3/arch/parisc/kernel/module.c
---- linux-3.0.3/arch/parisc/kernel/module.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/kernel/module.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/kernel/module.c linux-3.0.4/arch/parisc/kernel/module.c
+--- linux-3.0.4/arch/parisc/kernel/module.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/kernel/module.c    2011-08-23 21:47:55.000000000 -0400
 @@ -98,16 +98,38 @@
  
  /* three functions to determine where in the module core
@@ -1413,9 +1413,9 @@ diff -urNp linux-3.0.3/arch/parisc/kernel/module.c linux-3.0.3/arch/parisc/kerne
  
        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-3.0.3/arch/parisc/kernel/sys_parisc.c linux-3.0.3/arch/parisc/kernel/sys_parisc.c
---- linux-3.0.3/arch/parisc/kernel/sys_parisc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/kernel/sys_parisc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/kernel/sys_parisc.c linux-3.0.4/arch/parisc/kernel/sys_parisc.c
+--- linux-3.0.4/arch/parisc/kernel/sys_parisc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/kernel/sys_parisc.c        2011-08-23 21:47:55.000000000 -0400
 @@ -43,7 +43,7 @@ static unsigned long get_unshared_area(u
                /* At this point:  (!vma || addr < vma->vm_end). */
                if (TASK_SIZE - len < addr)
@@ -1443,9 +1443,9 @@ diff -urNp linux-3.0.3/arch/parisc/kernel/sys_parisc.c linux-3.0.3/arch/parisc/k
  
        if (filp) {
                addr = get_shared_area(filp->f_mapping, addr, len, pgoff);
-diff -urNp linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3/arch/parisc/kernel/traps.c
---- linux-3.0.3/arch/parisc/kernel/traps.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/kernel/traps.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/kernel/traps.c linux-3.0.4/arch/parisc/kernel/traps.c
+--- linux-3.0.4/arch/parisc/kernel/traps.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/kernel/traps.c     2011-08-23 21:47:55.000000000 -0400
 @@ -733,9 +733,7 @@ void notrace handle_interruption(int cod
  
                        down_read(&current->mm->mmap_sem);
@@ -1457,9 +1457,9 @@ diff -urNp linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3/arch/parisc/kernel
                                fault_address = regs->iaoq[0];
                                fault_space = regs->iasq[0];
  
-diff -urNp linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3/arch/parisc/mm/fault.c
---- linux-3.0.3/arch/parisc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/parisc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/parisc/mm/fault.c linux-3.0.4/arch/parisc/mm/fault.c
+--- linux-3.0.4/arch/parisc/mm/fault.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/parisc/mm/fault.c 2011-08-23 21:47:55.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/sched.h>
  #include <linux/interrupt.h>
@@ -1629,9 +1629,9 @@ diff -urNp linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3/arch/parisc/mm/fault.c
  
        /*
         * If for any reason at all we couldn't handle the fault, make
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/elf.h linux-3.0.3/arch/powerpc/include/asm/elf.h
---- linux-3.0.3/arch/powerpc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/elf.h linux-3.0.4/arch/powerpc/include/asm/elf.h
+--- linux-3.0.4/arch/powerpc/include/asm/elf.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/elf.h 2011-08-23 21:47:55.000000000 -0400
 @@ -178,8 +178,19 @@ typedef elf_fpreg_t elf_vsrreghalf_t32[E
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -1664,9 +1664,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/elf.h linux-3.0.3/arch/powerpc/i
  #endif /* __KERNEL__ */
  
  /*
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/kmap_types.h linux-3.0.3/arch/powerpc/include/asm/kmap_types.h
---- linux-3.0.3/arch/powerpc/include/asm/kmap_types.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/kmap_types.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/kmap_types.h linux-3.0.4/arch/powerpc/include/asm/kmap_types.h
+--- linux-3.0.4/arch/powerpc/include/asm/kmap_types.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/kmap_types.h  2011-08-23 21:47:55.000000000 -0400
 @@ -27,6 +27,7 @@ enum km_type {
        KM_PPC_SYNC_PAGE,
        KM_PPC_SYNC_ICACHE,
@@ -1675,9 +1675,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/kmap_types.h linux-3.0.3/arch/po
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/mman.h linux-3.0.3/arch/powerpc/include/asm/mman.h
---- linux-3.0.3/arch/powerpc/include/asm/mman.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/mman.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/mman.h linux-3.0.4/arch/powerpc/include/asm/mman.h
+--- linux-3.0.4/arch/powerpc/include/asm/mman.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/mman.h        2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,7 @@ static inline unsigned long arch_calc_vm
  }
  #define arch_calc_vm_prot_bits(prot) arch_calc_vm_prot_bits(prot)
@@ -1687,9 +1687,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/mman.h linux-3.0.3/arch/powerpc/
  {
        return (vm_flags & VM_SAO) ? __pgprot(_PAGE_SAO) : __pgprot(0);
  }
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/page_64.h linux-3.0.3/arch/powerpc/include/asm/page_64.h
---- linux-3.0.3/arch/powerpc/include/asm/page_64.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/page_64.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/page_64.h linux-3.0.4/arch/powerpc/include/asm/page_64.h
+--- linux-3.0.4/arch/powerpc/include/asm/page_64.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/page_64.h     2011-08-23 21:47:55.000000000 -0400
 @@ -155,15 +155,18 @@ do {                                             \
   * stack by default, so in the absence of a PT_GNU_STACK program header
   * we turn execute permission off.
@@ -1711,9 +1711,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/page_64.h linux-3.0.3/arch/power
  
  #include <asm-generic/getorder.h>
  
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/page.h linux-3.0.3/arch/powerpc/include/asm/page.h
---- linux-3.0.3/arch/powerpc/include/asm/page.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/page.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/page.h linux-3.0.4/arch/powerpc/include/asm/page.h
+--- linux-3.0.4/arch/powerpc/include/asm/page.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/page.h        2011-08-23 21:47:55.000000000 -0400
 @@ -129,8 +129,9 @@ extern phys_addr_t kernstart_addr;
   * and needs to be executable.  This means the whole heap ends
   * up being executable.
@@ -1736,9 +1736,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/page.h linux-3.0.3/arch/powerpc/
  #ifndef __ASSEMBLY__
  
  #undef STRICT_MM_TYPECHECKS
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/pgtable.h linux-3.0.3/arch/powerpc/include/asm/pgtable.h
---- linux-3.0.3/arch/powerpc/include/asm/pgtable.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/pgtable.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/pgtable.h linux-3.0.4/arch/powerpc/include/asm/pgtable.h
+--- linux-3.0.4/arch/powerpc/include/asm/pgtable.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/pgtable.h     2011-08-23 21:47:55.000000000 -0400
 @@ -2,6 +2,7 @@
  #define _ASM_POWERPC_PGTABLE_H
  #ifdef __KERNEL__
@@ -1747,9 +1747,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/pgtable.h linux-3.0.3/arch/power
  #ifndef __ASSEMBLY__
  #include <asm/processor.h>            /* For TASK_SIZE */
  #include <asm/mmu.h>
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h
---- linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h
+--- linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/pte-hash32.h  2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,7 @@
  #define _PAGE_FILE    0x004   /* when !present: nonlinear file mapping */
  #define _PAGE_USER    0x004   /* usermode access allowed */
@@ -1758,9 +1758,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/pte-hash32.h linux-3.0.3/arch/po
  #define _PAGE_COHERENT        0x010   /* M: enforce memory coherence (SMP systems) */
  #define _PAGE_NO_CACHE        0x020   /* I: cache inhibit */
  #define _PAGE_WRITETHRU       0x040   /* W: cache write-through */
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/reg.h linux-3.0.3/arch/powerpc/include/asm/reg.h
---- linux-3.0.3/arch/powerpc/include/asm/reg.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/reg.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/reg.h linux-3.0.4/arch/powerpc/include/asm/reg.h
+--- linux-3.0.4/arch/powerpc/include/asm/reg.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/reg.h 2011-08-23 21:47:55.000000000 -0400
 @@ -209,6 +209,7 @@
  #define SPRN_DBCR     0x136   /* e300 Data Breakpoint Control Reg */
  #define SPRN_DSISR    0x012   /* Data Storage Interrupt Status Register */
@@ -1769,9 +1769,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/reg.h linux-3.0.3/arch/powerpc/i
  #define   DSISR_PROTFAULT     0x08000000      /* protection fault */
  #define   DSISR_ISSTORE               0x02000000      /* access was a store */
  #define   DSISR_DABRMATCH     0x00400000      /* hit data breakpoint */
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/system.h linux-3.0.3/arch/powerpc/include/asm/system.h
---- linux-3.0.3/arch/powerpc/include/asm/system.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/system.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/system.h linux-3.0.4/arch/powerpc/include/asm/system.h
+--- linux-3.0.4/arch/powerpc/include/asm/system.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/system.h      2011-08-23 21:47:55.000000000 -0400
 @@ -531,7 +531,7 @@ __cmpxchg_local(volatile void *ptr, unsi
  #define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
  #endif
@@ -1781,9 +1781,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/system.h linux-3.0.3/arch/powerp
  
  /* Used in very early kernel initialization. */
  extern unsigned long reloc_offset(void);
-diff -urNp linux-3.0.3/arch/powerpc/include/asm/uaccess.h linux-3.0.3/arch/powerpc/include/asm/uaccess.h
---- linux-3.0.3/arch/powerpc/include/asm/uaccess.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/include/asm/uaccess.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/include/asm/uaccess.h linux-3.0.4/arch/powerpc/include/asm/uaccess.h
+--- linux-3.0.4/arch/powerpc/include/asm/uaccess.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/include/asm/uaccess.h     2011-08-23 21:47:55.000000000 -0400
 @@ -13,6 +13,8 @@
  #define VERIFY_READ   0
  #define VERIFY_WRITE  1
@@ -1961,9 +1961,9 @@ diff -urNp linux-3.0.3/arch/powerpc/include/asm/uaccess.h linux-3.0.3/arch/power
  extern unsigned long __clear_user(void __user *addr, unsigned long size);
  
  static inline unsigned long clear_user(void __user *addr, unsigned long size)
-diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S
---- linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S
+--- linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/exceptions-64e.S   2011-08-23 21:47:55.000000000 -0400
 @@ -567,6 +567,7 @@ storage_fault_common:
        std     r14,_DAR(r1)
        std     r15,_DSISR(r1)
@@ -1982,9 +1982,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64e.S linux-3.0.3/arch/pow
        addi    r3,r1,STACK_FRAME_OVERHEAD
        ld      r4,_DAR(r1)
        bl      .bad_page_fault
-diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S
---- linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S
+--- linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/exceptions-64s.S   2011-08-23 21:47:55.000000000 -0400
 @@ -956,10 +956,10 @@ handle_page_fault:
  11:   ld      r4,_DAR(r1)
        ld      r5,_DSISR(r1)
@@ -1997,9 +1997,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/exceptions-64s.S linux-3.0.3/arch/pow
        mr      r5,r3
        addi    r3,r1,STACK_FRAME_OVERHEAD
        lwz     r4,_DAR(r1)
-diff -urNp linux-3.0.3/arch/powerpc/kernel/module_32.c linux-3.0.3/arch/powerpc/kernel/module_32.c
---- linux-3.0.3/arch/powerpc/kernel/module_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/module_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/module_32.c linux-3.0.4/arch/powerpc/kernel/module_32.c
+--- linux-3.0.4/arch/powerpc/kernel/module_32.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/module_32.c        2011-08-23 21:47:55.000000000 -0400
 @@ -162,7 +162,7 @@ int module_frob_arch_sections(Elf32_Ehdr
                        me->arch.core_plt_section = i;
        }
@@ -2029,9 +2029,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/module_32.c linux-3.0.3/arch/powerpc/
  
        /* Find this entry, or if that fails, the next avail. entry */
        while (entry->jump[0]) {
-diff -urNp linux-3.0.3/arch/powerpc/kernel/module.c linux-3.0.3/arch/powerpc/kernel/module.c
---- linux-3.0.3/arch/powerpc/kernel/module.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/module.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/module.c linux-3.0.4/arch/powerpc/kernel/module.c
+--- linux-3.0.4/arch/powerpc/kernel/module.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/module.c   2011-08-23 21:47:55.000000000 -0400
 @@ -31,11 +31,24 @@
  
  LIST_HEAD(module_bug_list);
@@ -2071,9 +2071,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/module.c linux-3.0.3/arch/powerpc/ker
  static const Elf_Shdr *find_section(const Elf_Ehdr *hdr,
                                    const Elf_Shdr *sechdrs,
                                    const char *name)
-diff -urNp linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3/arch/powerpc/kernel/process.c
---- linux-3.0.3/arch/powerpc/kernel/process.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/process.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/process.c linux-3.0.4/arch/powerpc/kernel/process.c
+--- linux-3.0.4/arch/powerpc/kernel/process.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/process.c  2011-08-23 21:48:14.000000000 -0400
 @@ -676,8 +676,8 @@ void show_regs(struct pt_regs * regs)
         * Lookup NIP late so we have the best change of getting the
         * above info out without failing
@@ -2166,9 +2166,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3/arch/powerpc/ke
 -
 -      return ret;
 -}
-diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_32.c linux-3.0.3/arch/powerpc/kernel/signal_32.c
---- linux-3.0.3/arch/powerpc/kernel/signal_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/signal_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_32.c linux-3.0.4/arch/powerpc/kernel/signal_32.c
+--- linux-3.0.4/arch/powerpc/kernel/signal_32.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/signal_32.c        2011-08-23 21:47:55.000000000 -0400
 @@ -859,7 +859,7 @@ int handle_rt_signal32(unsigned long sig
        /* Save user registers on the stack */
        frame = &rt_sf->uc.uc_mcontext;
@@ -2178,9 +2178,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_32.c linux-3.0.3/arch/powerpc/
                if (save_user_regs(regs, frame, 0, 1))
                        goto badframe;
                regs->link = current->mm->context.vdso_base + vdso32_rt_sigtramp;
-diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_64.c linux-3.0.3/arch/powerpc/kernel/signal_64.c
---- linux-3.0.3/arch/powerpc/kernel/signal_64.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/signal_64.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/signal_64.c linux-3.0.4/arch/powerpc/kernel/signal_64.c
+--- linux-3.0.4/arch/powerpc/kernel/signal_64.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/signal_64.c        2011-08-23 21:47:55.000000000 -0400
 @@ -430,7 +430,7 @@ int handle_rt_signal64(int signr, struct
        current->thread.fpscr.val = 0;
  
@@ -2190,9 +2190,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/signal_64.c linux-3.0.3/arch/powerpc/
                regs->link = current->mm->context.vdso_base + vdso64_rt_sigtramp;
        } else {
                err |= setup_trampoline(__NR_rt_sigreturn, &frame->tramp[0]);
-diff -urNp linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3/arch/powerpc/kernel/traps.c
---- linux-3.0.3/arch/powerpc/kernel/traps.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/traps.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/traps.c linux-3.0.4/arch/powerpc/kernel/traps.c
+--- linux-3.0.4/arch/powerpc/kernel/traps.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/traps.c    2011-08-23 21:48:14.000000000 -0400
 @@ -98,6 +98,8 @@ static void pmac_backlight_unblank(void)
  static inline void pmac_backlight_unblank(void) { }
  #endif
@@ -2211,9 +2211,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3/arch/powerpc/kern
        oops_exit();
        do_exit(err);
  
-diff -urNp linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3/arch/powerpc/kernel/vdso.c
---- linux-3.0.3/arch/powerpc/kernel/vdso.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/kernel/vdso.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/kernel/vdso.c linux-3.0.4/arch/powerpc/kernel/vdso.c
+--- linux-3.0.4/arch/powerpc/kernel/vdso.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/kernel/vdso.c     2011-08-23 21:47:55.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <asm/firmware.h>
  #include <asm/vdso.h>
@@ -2240,9 +2240,9 @@ diff -urNp linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3/arch/powerpc/kerne
        if (IS_ERR_VALUE(vdso_base)) {
                rc = vdso_base;
                goto fail_mmapsem;
-diff -urNp linux-3.0.3/arch/powerpc/lib/usercopy_64.c linux-3.0.3/arch/powerpc/lib/usercopy_64.c
---- linux-3.0.3/arch/powerpc/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/lib/usercopy_64.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/lib/usercopy_64.c linux-3.0.4/arch/powerpc/lib/usercopy_64.c
+--- linux-3.0.4/arch/powerpc/lib/usercopy_64.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/lib/usercopy_64.c 2011-08-23 21:47:55.000000000 -0400
 @@ -9,22 +9,6 @@
  #include <linux/module.h>
  #include <asm/uaccess.h>
@@ -2274,9 +2274,9 @@ diff -urNp linux-3.0.3/arch/powerpc/lib/usercopy_64.c linux-3.0.3/arch/powerpc/l
 -EXPORT_SYMBOL(copy_to_user);
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.3/arch/powerpc/mm/fault.c linux-3.0.3/arch/powerpc/mm/fault.c
---- linux-3.0.3/arch/powerpc/mm/fault.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/mm/fault.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/mm/fault.c linux-3.0.4/arch/powerpc/mm/fault.c
+--- linux-3.0.4/arch/powerpc/mm/fault.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/mm/fault.c        2011-08-23 21:47:55.000000000 -0400
 @@ -32,6 +32,10 @@
  #include <linux/perf_event.h>
  #include <linux/magic.h>
@@ -2381,9 +2381,9 @@ diff -urNp linux-3.0.3/arch/powerpc/mm/fault.c linux-3.0.3/arch/powerpc/mm/fault
                _exception(SIGSEGV, regs, code, address);
                return 0;
        }
-diff -urNp linux-3.0.3/arch/powerpc/mm/mmap_64.c linux-3.0.3/arch/powerpc/mm/mmap_64.c
---- linux-3.0.3/arch/powerpc/mm/mmap_64.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/mm/mmap_64.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/mm/mmap_64.c linux-3.0.4/arch/powerpc/mm/mmap_64.c
+--- linux-3.0.4/arch/powerpc/mm/mmap_64.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/mm/mmap_64.c      2011-08-23 21:47:55.000000000 -0400
 @@ -99,10 +99,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -2407,9 +2407,9 @@ diff -urNp linux-3.0.3/arch/powerpc/mm/mmap_64.c linux-3.0.3/arch/powerpc/mm/mma
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.3/arch/powerpc/mm/slice.c linux-3.0.3/arch/powerpc/mm/slice.c
---- linux-3.0.3/arch/powerpc/mm/slice.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/powerpc/mm/slice.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/powerpc/mm/slice.c linux-3.0.4/arch/powerpc/mm/slice.c
+--- linux-3.0.4/arch/powerpc/mm/slice.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/powerpc/mm/slice.c        2011-08-23 21:47:55.000000000 -0400
 @@ -98,7 +98,7 @@ static int slice_area_is_free(struct mm_
        if ((mm->task_size - len) < addr)
                return 0;
@@ -2476,9 +2476,9 @@ diff -urNp linux-3.0.3/arch/powerpc/mm/slice.c linux-3.0.3/arch/powerpc/mm/slice
        /* If hint, make sure it matches our alignment restrictions */
        if (!fixed && addr) {
                addr = _ALIGN_UP(addr, 1ul << pshift);
-diff -urNp linux-3.0.3/arch/s390/include/asm/elf.h linux-3.0.3/arch/s390/include/asm/elf.h
---- linux-3.0.3/arch/s390/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/include/asm/elf.h linux-3.0.4/arch/s390/include/asm/elf.h
+--- linux-3.0.4/arch/s390/include/asm/elf.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/include/asm/elf.h    2011-08-23 21:47:55.000000000 -0400
 @@ -162,8 +162,14 @@ extern unsigned int vdso_enabled;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -2504,9 +2504,9 @@ diff -urNp linux-3.0.3/arch/s390/include/asm/elf.h linux-3.0.3/arch/s390/include
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif
-diff -urNp linux-3.0.3/arch/s390/include/asm/system.h linux-3.0.3/arch/s390/include/asm/system.h
---- linux-3.0.3/arch/s390/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/include/asm/system.h linux-3.0.4/arch/s390/include/asm/system.h
+--- linux-3.0.4/arch/s390/include/asm/system.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/include/asm/system.h 2011-08-23 21:47:55.000000000 -0400
 @@ -255,7 +255,7 @@ extern void (*_machine_restart)(char *co
  extern void (*_machine_halt)(void);
  extern void (*_machine_power_off)(void);
@@ -2516,9 +2516,9 @@ diff -urNp linux-3.0.3/arch/s390/include/asm/system.h linux-3.0.3/arch/s390/incl
  
  static inline int tprot(unsigned long addr)
  {
-diff -urNp linux-3.0.3/arch/s390/include/asm/uaccess.h linux-3.0.3/arch/s390/include/asm/uaccess.h
---- linux-3.0.3/arch/s390/include/asm/uaccess.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/include/asm/uaccess.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/include/asm/uaccess.h linux-3.0.4/arch/s390/include/asm/uaccess.h
+--- linux-3.0.4/arch/s390/include/asm/uaccess.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/include/asm/uaccess.h        2011-08-23 21:47:55.000000000 -0400
 @@ -235,6 +235,10 @@ static inline unsigned long __must_check
  copy_to_user(void __user *to, const void *from, unsigned long n)
  {
@@ -2551,9 +2551,9 @@ diff -urNp linux-3.0.3/arch/s390/include/asm/uaccess.h linux-3.0.3/arch/s390/inc
        if (unlikely(sz != -1 && sz < n)) {
                copy_from_user_overflow();
                return n;
-diff -urNp linux-3.0.3/arch/s390/kernel/module.c linux-3.0.3/arch/s390/kernel/module.c
---- linux-3.0.3/arch/s390/kernel/module.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/kernel/module.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/kernel/module.c linux-3.0.4/arch/s390/kernel/module.c
+--- linux-3.0.4/arch/s390/kernel/module.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/kernel/module.c      2011-08-23 21:47:55.000000000 -0400
 @@ -168,11 +168,11 @@ module_frob_arch_sections(Elf_Ehdr *hdr,
  
        /* Increase core size by size of got & plt and set start
@@ -2625,9 +2625,9 @@ diff -urNp linux-3.0.3/arch/s390/kernel/module.c linux-3.0.3/arch/s390/kernel/mo
                        rela->r_addend - loc;
                if (r_type == R_390_GOTPC)
                        *(unsigned int *) loc = val;
-diff -urNp linux-3.0.3/arch/s390/kernel/process.c linux-3.0.3/arch/s390/kernel/process.c
---- linux-3.0.3/arch/s390/kernel/process.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/kernel/process.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/kernel/process.c linux-3.0.4/arch/s390/kernel/process.c
+--- linux-3.0.4/arch/s390/kernel/process.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/kernel/process.c     2011-08-23 21:47:55.000000000 -0400
 @@ -319,39 +319,3 @@ unsigned long get_wchan(struct task_stru
        }
        return 0;
@@ -2668,9 +2668,9 @@ diff -urNp linux-3.0.3/arch/s390/kernel/process.c linux-3.0.3/arch/s390/kernel/p
 -              return base;
 -      return ret;
 -}
-diff -urNp linux-3.0.3/arch/s390/kernel/setup.c linux-3.0.3/arch/s390/kernel/setup.c
---- linux-3.0.3/arch/s390/kernel/setup.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/kernel/setup.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/kernel/setup.c linux-3.0.4/arch/s390/kernel/setup.c
+--- linux-3.0.4/arch/s390/kernel/setup.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/kernel/setup.c       2011-08-23 21:47:55.000000000 -0400
 @@ -271,7 +271,7 @@ static int __init early_parse_mem(char *
  }
  early_param("mem", early_parse_mem);
@@ -2680,9 +2680,9 @@ diff -urNp linux-3.0.3/arch/s390/kernel/setup.c linux-3.0.3/arch/s390/kernel/set
  EXPORT_SYMBOL_GPL(user_mode);
  
  static int set_amode_and_uaccess(unsigned long user_amode,
-diff -urNp linux-3.0.3/arch/s390/mm/mmap.c linux-3.0.3/arch/s390/mm/mmap.c
---- linux-3.0.3/arch/s390/mm/mmap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/s390/mm/mmap.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/s390/mm/mmap.c linux-3.0.4/arch/s390/mm/mmap.c
+--- linux-3.0.4/arch/s390/mm/mmap.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/s390/mm/mmap.c    2011-08-23 21:47:55.000000000 -0400
 @@ -91,10 +91,22 @@ void arch_pick_mmap_layout(struct mm_str
         */
        if (mmap_is_legacy()) {
@@ -2729,9 +2729,9 @@ diff -urNp linux-3.0.3/arch/s390/mm/mmap.c linux-3.0.3/arch/s390/mm/mmap.c
                mm->get_unmapped_area = s390_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.3/arch/score/include/asm/system.h linux-3.0.3/arch/score/include/asm/system.h
---- linux-3.0.3/arch/score/include/asm/system.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/score/include/asm/system.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/score/include/asm/system.h linux-3.0.4/arch/score/include/asm/system.h
+--- linux-3.0.4/arch/score/include/asm/system.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/score/include/asm/system.h        2011-08-23 21:47:55.000000000 -0400
 @@ -17,7 +17,7 @@ do {                                                         \
  #define finish_arch_switch(prev)      do {} while (0)
  
@@ -2741,9 +2741,9 @@ diff -urNp linux-3.0.3/arch/score/include/asm/system.h linux-3.0.3/arch/score/in
  
  #define mb()          barrier()
  #define rmb()         barrier()
-diff -urNp linux-3.0.3/arch/score/kernel/process.c linux-3.0.3/arch/score/kernel/process.c
---- linux-3.0.3/arch/score/kernel/process.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/score/kernel/process.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/score/kernel/process.c linux-3.0.4/arch/score/kernel/process.c
+--- linux-3.0.4/arch/score/kernel/process.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/score/kernel/process.c    2011-08-23 21:47:55.000000000 -0400
 @@ -161,8 +161,3 @@ unsigned long get_wchan(struct task_stru
  
        return task_pt_regs(task)->cp0_epc;
@@ -2753,9 +2753,9 @@ diff -urNp linux-3.0.3/arch/score/kernel/process.c linux-3.0.3/arch/score/kernel
 -{
 -      return sp;
 -}
-diff -urNp linux-3.0.3/arch/sh/mm/mmap.c linux-3.0.3/arch/sh/mm/mmap.c
---- linux-3.0.3/arch/sh/mm/mmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sh/mm/mmap.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sh/mm/mmap.c linux-3.0.4/arch/sh/mm/mmap.c
+--- linux-3.0.4/arch/sh/mm/mmap.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sh/mm/mmap.c      2011-08-23 21:47:55.000000000 -0400
 @@ -74,8 +74,7 @@ unsigned long arch_get_unmapped_area(str
                        addr = PAGE_ALIGN(addr);
  
@@ -2830,9 +2830,9 @@ diff -urNp linux-3.0.3/arch/sh/mm/mmap.c linux-3.0.3/arch/sh/mm/mmap.c
  
  bottomup:
        /*
-diff -urNp linux-3.0.3/arch/sparc/include/asm/atomic_64.h linux-3.0.3/arch/sparc/include/asm/atomic_64.h
---- linux-3.0.3/arch/sparc/include/asm/atomic_64.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/atomic_64.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/atomic_64.h linux-3.0.4/arch/sparc/include/asm/atomic_64.h
+--- linux-3.0.4/arch/sparc/include/asm/atomic_64.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/atomic_64.h     2011-08-23 21:48:14.000000000 -0400
 @@ -14,18 +14,40 @@
  #define ATOMIC64_INIT(i)      { (i) }
  
@@ -3025,9 +3025,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/atomic_64.h linux-3.0.3/arch/sparc
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.3/arch/sparc/include/asm/cache.h linux-3.0.3/arch/sparc/include/asm/cache.h
---- linux-3.0.3/arch/sparc/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/cache.h linux-3.0.4/arch/sparc/include/asm/cache.h
+--- linux-3.0.4/arch/sparc/include/asm/cache.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/cache.h 2011-08-23 21:47:55.000000000 -0400
 @@ -10,7 +10,7 @@
  #define ARCH_SLAB_MINALIGN    __alignof__(unsigned long long)
  
@@ -3037,9 +3037,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/cache.h linux-3.0.3/arch/sparc/inc
  
  #ifdef CONFIG_SPARC32
  #define SMP_CACHE_BYTES_SHIFT 5
-diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_32.h linux-3.0.3/arch/sparc/include/asm/elf_32.h
---- linux-3.0.3/arch/sparc/include/asm/elf_32.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/elf_32.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_32.h linux-3.0.4/arch/sparc/include/asm/elf_32.h
+--- linux-3.0.4/arch/sparc/include/asm/elf_32.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/elf_32.h        2011-08-23 21:47:55.000000000 -0400
 @@ -114,6 +114,13 @@ typedef struct {
  
  #define ELF_ET_DYN_BASE         (TASK_UNMAPPED_BASE)
@@ -3054,9 +3054,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_32.h linux-3.0.3/arch/sparc/in
  /* 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-3.0.3/arch/sparc/include/asm/elf_64.h linux-3.0.3/arch/sparc/include/asm/elf_64.h
---- linux-3.0.3/arch/sparc/include/asm/elf_64.h        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/elf_64.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/elf_64.h linux-3.0.4/arch/sparc/include/asm/elf_64.h
+--- linux-3.0.4/arch/sparc/include/asm/elf_64.h        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/elf_64.h        2011-08-23 21:47:55.000000000 -0400
 @@ -180,6 +180,13 @@ typedef struct {
  #define ELF_ET_DYN_BASE               0x0000010000000000UL
  #define COMPAT_ELF_ET_DYN_BASE        0x0000000070000000UL
@@ -3071,9 +3071,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/elf_64.h linux-3.0.3/arch/sparc/in
  extern unsigned long sparc64_elf_hwcap;
  #define ELF_HWCAP     sparc64_elf_hwcap
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtable_32.h linux-3.0.3/arch/sparc/include/asm/pgtable_32.h
---- linux-3.0.3/arch/sparc/include/asm/pgtable_32.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/pgtable_32.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtable_32.h linux-3.0.4/arch/sparc/include/asm/pgtable_32.h
+--- linux-3.0.4/arch/sparc/include/asm/pgtable_32.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/pgtable_32.h    2011-08-23 21:47:55.000000000 -0400
 @@ -45,6 +45,13 @@ BTFIXUPDEF_SIMM13(user_ptrs_per_pgd)
  BTFIXUPDEF_INT(page_none)
  BTFIXUPDEF_INT(page_copy)
@@ -3105,9 +3105,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtable_32.h linux-3.0.3/arch/spar
  extern unsigned long page_kernel;
  
  #ifdef MODULE
-diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h
---- linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h
+--- linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/pgtsrmmu.h      2011-08-23 21:47:55.000000000 -0400
 @@ -115,6 +115,13 @@
                                    SRMMU_EXEC | SRMMU_REF)
  #define SRMMU_PAGE_RDONLY  __pgprot(SRMMU_VALID | SRMMU_CACHE | \
@@ -3122,9 +3122,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/pgtsrmmu.h linux-3.0.3/arch/sparc/
  #define SRMMU_PAGE_KERNEL  __pgprot(SRMMU_VALID | SRMMU_CACHE | SRMMU_PRIV | \
                                    SRMMU_DIRTY | SRMMU_REF)
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/spinlock_64.h linux-3.0.3/arch/sparc/include/asm/spinlock_64.h
---- linux-3.0.3/arch/sparc/include/asm/spinlock_64.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/spinlock_64.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/spinlock_64.h linux-3.0.4/arch/sparc/include/asm/spinlock_64.h
+--- linux-3.0.4/arch/sparc/include/asm/spinlock_64.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/spinlock_64.h   2011-08-23 21:47:55.000000000 -0400
 @@ -92,14 +92,19 @@ static inline void arch_spin_lock_flags(
  
  /* Multi-reader locks, these are much saner than the 32-bit Sparc ones... */
@@ -3222,9 +3222,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/spinlock_64.h linux-3.0.3/arch/spa
  {
        unsigned long mask, tmp1, tmp2, result;
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_32.h linux-3.0.3/arch/sparc/include/asm/thread_info_32.h
---- linux-3.0.3/arch/sparc/include/asm/thread_info_32.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/thread_info_32.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_32.h linux-3.0.4/arch/sparc/include/asm/thread_info_32.h
+--- linux-3.0.4/arch/sparc/include/asm/thread_info_32.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/thread_info_32.h        2011-08-23 21:47:55.000000000 -0400
 @@ -50,6 +50,8 @@ struct thread_info {
        unsigned long           w_saved;
  
@@ -3234,9 +3234,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_32.h linux-3.0.3/arch/
  };
  
  /*
-diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_64.h linux-3.0.3/arch/sparc/include/asm/thread_info_64.h
---- linux-3.0.3/arch/sparc/include/asm/thread_info_64.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/thread_info_64.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/thread_info_64.h linux-3.0.4/arch/sparc/include/asm/thread_info_64.h
+--- linux-3.0.4/arch/sparc/include/asm/thread_info_64.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/thread_info_64.h        2011-08-23 21:47:55.000000000 -0400
 @@ -63,6 +63,8 @@ struct thread_info {
        struct pt_regs          *kern_una_regs;
        unsigned int            kern_una_insn;
@@ -3246,9 +3246,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/thread_info_64.h linux-3.0.3/arch/
        unsigned long           fpregs[0] __attribute__ ((aligned(64)));
  };
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_32.h linux-3.0.3/arch/sparc/include/asm/uaccess_32.h
---- linux-3.0.3/arch/sparc/include/asm/uaccess_32.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/uaccess_32.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_32.h linux-3.0.4/arch/sparc/include/asm/uaccess_32.h
+--- linux-3.0.4/arch/sparc/include/asm/uaccess_32.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/uaccess_32.h    2011-08-23 21:47:55.000000000 -0400
 @@ -249,27 +249,46 @@ extern unsigned long __copy_user(void __
  
  static inline unsigned long copy_to_user(void __user *to, const void *from, unsigned long n)
@@ -3300,9 +3300,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_32.h linux-3.0.3/arch/spar
        return __copy_user((__force void __user *) to, from, n);
  }
  
-diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_64.h linux-3.0.3/arch/sparc/include/asm/uaccess_64.h
---- linux-3.0.3/arch/sparc/include/asm/uaccess_64.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/uaccess_64.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess_64.h linux-3.0.4/arch/sparc/include/asm/uaccess_64.h
+--- linux-3.0.4/arch/sparc/include/asm/uaccess_64.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/uaccess_64.h    2011-08-23 21:47:55.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <linux/string.h>
@@ -3345,9 +3345,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess_64.h linux-3.0.3/arch/spar
        if (unlikely(ret))
                ret = copy_to_user_fixup(to, from, size);
        return ret;
-diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess.h linux-3.0.3/arch/sparc/include/asm/uaccess.h
---- linux-3.0.3/arch/sparc/include/asm/uaccess.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/include/asm/uaccess.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/include/asm/uaccess.h linux-3.0.4/arch/sparc/include/asm/uaccess.h
+--- linux-3.0.4/arch/sparc/include/asm/uaccess.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/include/asm/uaccess.h       2011-08-23 21:47:55.000000000 -0400
 @@ -1,5 +1,13 @@
  #ifndef ___ASM_SPARC_UACCESS_H
  #define ___ASM_SPARC_UACCESS_H
@@ -3362,9 +3362,9 @@ diff -urNp linux-3.0.3/arch/sparc/include/asm/uaccess.h linux-3.0.3/arch/sparc/i
  #if defined(__sparc__) && defined(__arch64__)
  #include <asm/uaccess_64.h>
  #else
-diff -urNp linux-3.0.3/arch/sparc/kernel/Makefile linux-3.0.3/arch/sparc/kernel/Makefile
---- linux-3.0.3/arch/sparc/kernel/Makefile     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/Makefile     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/Makefile linux-3.0.4/arch/sparc/kernel/Makefile
+--- linux-3.0.4/arch/sparc/kernel/Makefile     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/Makefile     2011-08-23 21:47:55.000000000 -0400
 @@ -3,7 +3,7 @@
  #
  
@@ -3374,9 +3374,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/Makefile linux-3.0.3/arch/sparc/kernel/
  
  extra-y     := head_$(BITS).o
  extra-y     += init_task.o
-diff -urNp linux-3.0.3/arch/sparc/kernel/process_32.c linux-3.0.3/arch/sparc/kernel/process_32.c
---- linux-3.0.3/arch/sparc/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/process_32.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/process_32.c linux-3.0.4/arch/sparc/kernel/process_32.c
+--- linux-3.0.4/arch/sparc/kernel/process_32.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/process_32.c 2011-08-23 21:48:14.000000000 -0400
 @@ -204,7 +204,7 @@ void __show_backtrace(unsigned long fp)
                       rw->ins[4], rw->ins[5],
                       rw->ins[6],
@@ -3412,9 +3412,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/process_32.c linux-3.0.3/arch/sparc/ker
                fp = rw->ins[6];
        } while (++count < 16);
        printk("\n");
-diff -urNp linux-3.0.3/arch/sparc/kernel/process_64.c linux-3.0.3/arch/sparc/kernel/process_64.c
---- linux-3.0.3/arch/sparc/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/process_64.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/process_64.c linux-3.0.4/arch/sparc/kernel/process_64.c
+--- linux-3.0.4/arch/sparc/kernel/process_64.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/process_64.c 2011-08-23 21:48:14.000000000 -0400
 @@ -180,14 +180,14 @@ static void show_regwindow(struct pt_reg
        printk("i4: %016lx i5: %016lx i6: %016lx i7: %016lx\n",
               rwk->ins[4], rwk->ins[5], rwk->ins[6], rwk->ins[7]);
@@ -3450,9 +3450,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/process_64.c linux-3.0.3/arch/sparc/ker
                               (void *) gp->tpc,
                               (void *) gp->o7,
                               (void *) gp->i7,
-diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c
---- linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c
+--- linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/sys_sparc_32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -56,7 +56,7 @@ unsigned long arch_get_unmapped_area(str
        if (ARCH_SUN4C && len > 0x20000000)
                return -ENOMEM;
@@ -3471,9 +3471,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_32.c linux-3.0.3/arch/sparc/k
                        return addr;
                addr = vmm->vm_end;
                if (flags & MAP_SHARED)
-diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c
---- linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c
+--- linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/sys_sparc_64.c       2011-08-23 21:47:55.000000000 -0400
 @@ -124,7 +124,7 @@ unsigned long arch_get_unmapped_area(str
                /* We do not accept a shared mapping if it would violate
                 * cache aliasing constraints.
@@ -3621,9 +3621,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/sys_sparc_64.c linux-3.0.3/arch/sparc/k
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.3/arch/sparc/kernel/traps_32.c linux-3.0.3/arch/sparc/kernel/traps_32.c
---- linux-3.0.3/arch/sparc/kernel/traps_32.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/traps_32.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/traps_32.c linux-3.0.4/arch/sparc/kernel/traps_32.c
+--- linux-3.0.4/arch/sparc/kernel/traps_32.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/traps_32.c   2011-08-23 21:48:14.000000000 -0400
 @@ -44,6 +44,8 @@ static void instruction_dump(unsigned lo
  #define __SAVE __asm__ __volatile__("save %sp, -0x40, %sp\n\t")
  #define __RESTORE __asm__ __volatile__("restore %g0, %g0, %g0\n\t")
@@ -3653,9 +3653,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/traps_32.c linux-3.0.3/arch/sparc/kerne
        do_exit(SIGSEGV);
  }
  
-diff -urNp linux-3.0.3/arch/sparc/kernel/traps_64.c linux-3.0.3/arch/sparc/kernel/traps_64.c
---- linux-3.0.3/arch/sparc/kernel/traps_64.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/traps_64.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/traps_64.c linux-3.0.4/arch/sparc/kernel/traps_64.c
+--- linux-3.0.4/arch/sparc/kernel/traps_64.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/traps_64.c   2011-08-23 21:48:14.000000000 -0400
 @@ -75,7 +75,7 @@ static void dump_tl1_traplog(struct tl1_
                       i + 1,
                       p->trapstack[i].tstate, p->trapstack[i].tpc,
@@ -3793,9 +3793,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/traps_64.c linux-3.0.3/arch/sparc/kerne
        do_exit(SIGSEGV);
  }
  EXPORT_SYMBOL(die_if_kernel);
-diff -urNp linux-3.0.3/arch/sparc/kernel/unaligned_64.c linux-3.0.3/arch/sparc/kernel/unaligned_64.c
---- linux-3.0.3/arch/sparc/kernel/unaligned_64.c       2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/sparc/kernel/unaligned_64.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/kernel/unaligned_64.c linux-3.0.4/arch/sparc/kernel/unaligned_64.c
+--- linux-3.0.4/arch/sparc/kernel/unaligned_64.c       2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/sparc/kernel/unaligned_64.c       2011-08-23 21:48:14.000000000 -0400
 @@ -279,7 +279,7 @@ static void log_unaligned(struct pt_regs
        static DEFINE_RATELIMIT_STATE(ratelimit, 5 * HZ, 5);
  
@@ -3805,9 +3805,9 @@ diff -urNp linux-3.0.3/arch/sparc/kernel/unaligned_64.c linux-3.0.3/arch/sparc/k
                       regs->tpc, (void *) regs->tpc);
        }
  }
-diff -urNp linux-3.0.3/arch/sparc/lib/atomic_64.S linux-3.0.3/arch/sparc/lib/atomic_64.S
---- linux-3.0.3/arch/sparc/lib/atomic_64.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/lib/atomic_64.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/lib/atomic_64.S linux-3.0.4/arch/sparc/lib/atomic_64.S
+--- linux-3.0.4/arch/sparc/lib/atomic_64.S     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/lib/atomic_64.S     2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,12 @@
  atomic_add: /* %o0 = increment, %o1 = atomic_ptr */
        BACKOFF_SETUP(%o2)
@@ -4042,9 +4042,9 @@ diff -urNp linux-3.0.3/arch/sparc/lib/atomic_64.S linux-3.0.3/arch/sparc/lib/ato
        casx    [%o1], %g1, %g7
        cmp     %g1, %g7
        bne,pn  %xcc, BACKOFF_LABEL(2f, 1b)
-diff -urNp linux-3.0.3/arch/sparc/lib/ksyms.c linux-3.0.3/arch/sparc/lib/ksyms.c
---- linux-3.0.3/arch/sparc/lib/ksyms.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/lib/ksyms.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/lib/ksyms.c linux-3.0.4/arch/sparc/lib/ksyms.c
+--- linux-3.0.4/arch/sparc/lib/ksyms.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/lib/ksyms.c 2011-08-23 21:48:14.000000000 -0400
 @@ -142,12 +142,18 @@ EXPORT_SYMBOL(__downgrade_write);
  
  /* Atomic counter implementation. */
@@ -4064,9 +4064,9 @@ diff -urNp linux-3.0.3/arch/sparc/lib/ksyms.c linux-3.0.3/arch/sparc/lib/ksyms.c
  EXPORT_SYMBOL(atomic64_sub_ret);
  
  /* Atomic bit operations. */
-diff -urNp linux-3.0.3/arch/sparc/lib/Makefile linux-3.0.3/arch/sparc/lib/Makefile
---- linux-3.0.3/arch/sparc/lib/Makefile        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/sparc/lib/Makefile        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/lib/Makefile linux-3.0.4/arch/sparc/lib/Makefile
+--- linux-3.0.4/arch/sparc/lib/Makefile        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/sparc/lib/Makefile        2011-08-23 21:47:55.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -4076,9 +4076,9 @@ diff -urNp linux-3.0.3/arch/sparc/lib/Makefile linux-3.0.3/arch/sparc/lib/Makefi
  
  lib-$(CONFIG_SPARC32) += mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o
  lib-$(CONFIG_SPARC32) += memcpy.o memset.o
-diff -urNp linux-3.0.3/arch/sparc/Makefile linux-3.0.3/arch/sparc/Makefile
---- linux-3.0.3/arch/sparc/Makefile    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/Makefile    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/Makefile linux-3.0.4/arch/sparc/Makefile
+--- linux-3.0.4/arch/sparc/Makefile    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/Makefile    2011-08-23 21:48:14.000000000 -0400
 @@ -75,7 +75,7 @@ drivers-$(CONFIG_OPROFILE)   += arch/sparc
  # Export what is needed by arch/sparc/boot/Makefile
  export VMLINUX_INIT VMLINUX_MAIN
@@ -4088,9 +4088,9 @@ diff -urNp linux-3.0.3/arch/sparc/Makefile linux-3.0.3/arch/sparc/Makefile
  VMLINUX_MAIN += $(patsubst %/, %/lib.a, $(libs-y)) $(libs-y)
  VMLINUX_MAIN += $(drivers-y) $(net-y)
  
-diff -urNp linux-3.0.3/arch/sparc/mm/fault_32.c linux-3.0.3/arch/sparc/mm/fault_32.c
---- linux-3.0.3/arch/sparc/mm/fault_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/fault_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/fault_32.c linux-3.0.4/arch/sparc/mm/fault_32.c
+--- linux-3.0.4/arch/sparc/mm/fault_32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/fault_32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -22,6 +22,9 @@
  #include <linux/interrupt.h>
  #include <linux/module.h>
@@ -4395,9 +4395,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/fault_32.c linux-3.0.3/arch/sparc/mm/fault_
                /* Allow reads even for write-only mappings */
                if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
                        goto bad_area;
-diff -urNp linux-3.0.3/arch/sparc/mm/fault_64.c linux-3.0.3/arch/sparc/mm/fault_64.c
---- linux-3.0.3/arch/sparc/mm/fault_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/fault_64.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/fault_64.c linux-3.0.4/arch/sparc/mm/fault_64.c
+--- linux-3.0.4/arch/sparc/mm/fault_64.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/fault_64.c       2011-08-23 21:48:14.000000000 -0400
 @@ -21,6 +21,9 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -4905,9 +4905,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/fault_64.c linux-3.0.3/arch/sparc/mm/fault_
        /* 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-3.0.3/arch/sparc/mm/hugetlbpage.c linux-3.0.3/arch/sparc/mm/hugetlbpage.c
---- linux-3.0.3/arch/sparc/mm/hugetlbpage.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/hugetlbpage.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/hugetlbpage.c linux-3.0.4/arch/sparc/mm/hugetlbpage.c
+--- linux-3.0.4/arch/sparc/mm/hugetlbpage.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/hugetlbpage.c    2011-08-23 21:47:55.000000000 -0400
 @@ -68,7 +68,7 @@ full_search:
                        }
                        return -ENOMEM;
@@ -4967,9 +4967,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/hugetlbpage.c linux-3.0.3/arch/sparc/mm/hug
                        return addr;
        }
        if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.3/arch/sparc/mm/init_32.c linux-3.0.3/arch/sparc/mm/init_32.c
---- linux-3.0.3/arch/sparc/mm/init_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/init_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/init_32.c linux-3.0.4/arch/sparc/mm/init_32.c
+--- linux-3.0.4/arch/sparc/mm/init_32.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/init_32.c        2011-08-23 21:47:55.000000000 -0400
 @@ -316,6 +316,9 @@ extern void device_scan(void);
  pgprot_t PAGE_SHARED __read_mostly;
  EXPORT_SYMBOL(PAGE_SHARED);
@@ -5004,9 +5004,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/init_32.c linux-3.0.3/arch/sparc/mm/init_32
        protection_map[12] = PAGE_READONLY;
        protection_map[13] = PAGE_READONLY;
        protection_map[14] = PAGE_SHARED;
-diff -urNp linux-3.0.3/arch/sparc/mm/Makefile linux-3.0.3/arch/sparc/mm/Makefile
---- linux-3.0.3/arch/sparc/mm/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/Makefile 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/Makefile linux-3.0.4/arch/sparc/mm/Makefile
+--- linux-3.0.4/arch/sparc/mm/Makefile 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/Makefile 2011-08-23 21:47:55.000000000 -0400
 @@ -2,7 +2,7 @@
  #
  
@@ -5016,9 +5016,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/Makefile linux-3.0.3/arch/sparc/mm/Makefile
  
  obj-$(CONFIG_SPARC64)   += ultra.o tlb.o tsb.o
  obj-y                   += fault_$(BITS).o
-diff -urNp linux-3.0.3/arch/sparc/mm/srmmu.c linux-3.0.3/arch/sparc/mm/srmmu.c
---- linux-3.0.3/arch/sparc/mm/srmmu.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/sparc/mm/srmmu.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/sparc/mm/srmmu.c linux-3.0.4/arch/sparc/mm/srmmu.c
+--- linux-3.0.4/arch/sparc/mm/srmmu.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/sparc/mm/srmmu.c  2011-08-23 21:47:55.000000000 -0400
 @@ -2200,6 +2200,13 @@ void __init ld_mmu_srmmu(void)
        PAGE_SHARED = pgprot_val(SRMMU_PAGE_SHARED);
        BTFIXUPSET_INT(page_copy, pgprot_val(SRMMU_PAGE_COPY));
@@ -5033,9 +5033,9 @@ diff -urNp linux-3.0.3/arch/sparc/mm/srmmu.c linux-3.0.3/arch/sparc/mm/srmmu.c
        BTFIXUPSET_INT(page_kernel, pgprot_val(SRMMU_PAGE_KERNEL));
        page_kernel = pgprot_val(SRMMU_PAGE_KERNEL);
  
-diff -urNp linux-3.0.3/arch/um/include/asm/kmap_types.h linux-3.0.3/arch/um/include/asm/kmap_types.h
---- linux-3.0.3/arch/um/include/asm/kmap_types.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/include/asm/kmap_types.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/include/asm/kmap_types.h linux-3.0.4/arch/um/include/asm/kmap_types.h
+--- linux-3.0.4/arch/um/include/asm/kmap_types.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/include/asm/kmap_types.h       2011-08-23 21:47:55.000000000 -0400
 @@ -23,6 +23,7 @@ enum km_type {
        KM_IRQ1,
        KM_SOFTIRQ0,
@@ -5044,9 +5044,9 @@ diff -urNp linux-3.0.3/arch/um/include/asm/kmap_types.h linux-3.0.3/arch/um/incl
        KM_TYPE_NR
  };
  
-diff -urNp linux-3.0.3/arch/um/include/asm/page.h linux-3.0.3/arch/um/include/asm/page.h
---- linux-3.0.3/arch/um/include/asm/page.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/include/asm/page.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/include/asm/page.h linux-3.0.4/arch/um/include/asm/page.h
+--- linux-3.0.4/arch/um/include/asm/page.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/include/asm/page.h     2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@
  #define PAGE_SIZE     (_AC(1, UL) << PAGE_SHIFT)
  #define PAGE_MASK     (~(PAGE_SIZE-1))
@@ -5057,9 +5057,9 @@ diff -urNp linux-3.0.3/arch/um/include/asm/page.h linux-3.0.3/arch/um/include/as
  #ifndef __ASSEMBLY__
  
  struct page;
-diff -urNp linux-3.0.3/arch/um/kernel/process.c linux-3.0.3/arch/um/kernel/process.c
---- linux-3.0.3/arch/um/kernel/process.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/kernel/process.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/kernel/process.c linux-3.0.4/arch/um/kernel/process.c
+--- linux-3.0.4/arch/um/kernel/process.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/kernel/process.c       2011-08-23 21:47:55.000000000 -0400
 @@ -404,22 +404,6 @@ int singlestepping(void * t)
        return 2;
  }
@@ -5083,9 +5083,9 @@ diff -urNp linux-3.0.3/arch/um/kernel/process.c linux-3.0.3/arch/um/kernel/proce
  unsigned long get_wchan(struct task_struct *p)
  {
        unsigned long stack_page, sp, ip;
-diff -urNp linux-3.0.3/arch/um/sys-i386/syscalls.c linux-3.0.3/arch/um/sys-i386/syscalls.c
---- linux-3.0.3/arch/um/sys-i386/syscalls.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/um/sys-i386/syscalls.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/um/sys-i386/syscalls.c linux-3.0.4/arch/um/sys-i386/syscalls.c
+--- linux-3.0.4/arch/um/sys-i386/syscalls.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/um/sys-i386/syscalls.c    2011-08-23 21:47:55.000000000 -0400
 @@ -11,6 +11,21 @@
  #include "asm/uaccess.h"
  #include "asm/unistd.h"
@@ -5108,9 +5108,9 @@ diff -urNp linux-3.0.3/arch/um/sys-i386/syscalls.c linux-3.0.3/arch/um/sys-i386/
  /*
   * The prototype on i386 is:
   *
-diff -urNp linux-3.0.3/arch/x86/boot/bitops.h linux-3.0.3/arch/x86/boot/bitops.h
---- linux-3.0.3/arch/x86/boot/bitops.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/bitops.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/bitops.h linux-3.0.4/arch/x86/boot/bitops.h
+--- linux-3.0.4/arch/x86/boot/bitops.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/bitops.h 2011-08-23 21:47:55.000000000 -0400
 @@ -26,7 +26,7 @@ static inline int variable_test_bit(int 
        u8 v;
        const u32 *p = (const u32 *)addr;
@@ -5129,9 +5129,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/bitops.h linux-3.0.3/arch/x86/boot/bitops.h
  }
  
  #endif /* BOOT_BITOPS_H */
-diff -urNp linux-3.0.3/arch/x86/boot/boot.h linux-3.0.3/arch/x86/boot/boot.h
---- linux-3.0.3/arch/x86/boot/boot.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/boot.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/boot.h linux-3.0.4/arch/x86/boot/boot.h
+--- linux-3.0.4/arch/x86/boot/boot.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/boot.h   2011-08-23 21:47:55.000000000 -0400
 @@ -85,7 +85,7 @@ static inline void io_delay(void)
  static inline u16 ds(void)
  {
@@ -5150,9 +5150,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/boot.h linux-3.0.3/arch/x86/boot/boot.h
            : "=qm" (diff), "+D" (s1), "+S" (s2), "+c" (len));
        return diff;
  }
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_32.S linux-3.0.3/arch/x86/boot/compressed/head_32.S
---- linux-3.0.3/arch/x86/boot/compressed/head_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/head_32.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_32.S linux-3.0.4/arch/x86/boot/compressed/head_32.S
+--- linux-3.0.4/arch/x86/boot/compressed/head_32.S     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/head_32.S     2011-08-23 21:47:55.000000000 -0400
 @@ -76,7 +76,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5181,9 +5181,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_32.S linux-3.0.3/arch/x86/b
        addl    %ebx, -__PAGE_OFFSET(%ebx, %ecx)
        jmp     1b
  2:
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_64.S linux-3.0.3/arch/x86/boot/compressed/head_64.S
---- linux-3.0.3/arch/x86/boot/compressed/head_64.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/head_64.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/head_64.S linux-3.0.4/arch/x86/boot/compressed/head_64.S
+--- linux-3.0.4/arch/x86/boot/compressed/head_64.S     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/head_64.S     2011-08-23 21:47:55.000000000 -0400
 @@ -91,7 +91,7 @@ ENTRY(startup_32)
        notl    %eax
        andl    %eax, %ebx
@@ -5202,9 +5202,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/head_64.S linux-3.0.3/arch/x86/b
  #endif
  
        /* Target address to relocate to for decompression */
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/Makefile linux-3.0.3/arch/x86/boot/compressed/Makefile
---- linux-3.0.3/arch/x86/boot/compressed/Makefile      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/Makefile      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/Makefile linux-3.0.4/arch/x86/boot/compressed/Makefile
+--- linux-3.0.4/arch/x86/boot/compressed/Makefile      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/Makefile      2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,9 @@ cflags-$(CONFIG_X86_64) := -mcmodel=smal
  KBUILD_CFLAGS += $(cflags-y)
  KBUILD_CFLAGS += $(call cc-option,-ffreestanding)
@@ -5215,9 +5215,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/Makefile linux-3.0.3/arch/x86/bo
  
  KBUILD_AFLAGS  := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/misc.c linux-3.0.3/arch/x86/boot/compressed/misc.c
---- linux-3.0.3/arch/x86/boot/compressed/misc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/misc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/misc.c linux-3.0.4/arch/x86/boot/compressed/misc.c
+--- linux-3.0.4/arch/x86/boot/compressed/misc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/misc.c        2011-08-23 21:47:55.000000000 -0400
 @@ -310,7 +310,7 @@ static void parse_elf(void *output)
                case PT_LOAD:
  #ifdef CONFIG_RELOCATABLE
@@ -5236,9 +5236,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/misc.c linux-3.0.3/arch/x86/boot
                error("Wrong destination address");
  #endif
  
-diff -urNp linux-3.0.3/arch/x86/boot/compressed/relocs.c linux-3.0.3/arch/x86/boot/compressed/relocs.c
---- linux-3.0.3/arch/x86/boot/compressed/relocs.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/compressed/relocs.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/compressed/relocs.c linux-3.0.4/arch/x86/boot/compressed/relocs.c
+--- linux-3.0.4/arch/x86/boot/compressed/relocs.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/compressed/relocs.c      2011-08-23 21:47:55.000000000 -0400
 @@ -13,8 +13,11 @@
  
  static void die(char *fmt, ...);
@@ -5431,9 +5431,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/compressed/relocs.c linux-3.0.3/arch/x86/bo
        read_shdrs(fp);
        read_strtabs(fp);
        read_symtabs(fp);
-diff -urNp linux-3.0.3/arch/x86/boot/cpucheck.c linux-3.0.3/arch/x86/boot/cpucheck.c
---- linux-3.0.3/arch/x86/boot/cpucheck.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/cpucheck.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/cpucheck.c linux-3.0.4/arch/x86/boot/cpucheck.c
+--- linux-3.0.4/arch/x86/boot/cpucheck.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/cpucheck.c       2011-08-23 21:47:55.000000000 -0400
 @@ -74,7 +74,7 @@ static int has_fpu(void)
        u16 fcw = -1, fsw = -1;
        u32 cr0;
@@ -5529,9 +5529,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/cpucheck.c linux-3.0.3/arch/x86/boot/cpuche
  
                err = check_flags();
        }
-diff -urNp linux-3.0.3/arch/x86/boot/header.S linux-3.0.3/arch/x86/boot/header.S
---- linux-3.0.3/arch/x86/boot/header.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/header.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/header.S linux-3.0.4/arch/x86/boot/header.S
+--- linux-3.0.4/arch/x86/boot/header.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/header.S 2011-08-23 21:47:55.000000000 -0400
 @@ -224,7 +224,7 @@ setup_data:                .quad 0                 # 64-bit physical
                                                # single linked list of
                                                # struct setup_data
@@ -5541,9 +5541,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/header.S linux-3.0.3/arch/x86/boot/header.S
  
  #define ZO_INIT_SIZE  (ZO__end - ZO_startup_32 + ZO_z_extract_offset)
  #define VO_INIT_SIZE  (VO__end - VO__text)
-diff -urNp linux-3.0.3/arch/x86/boot/Makefile linux-3.0.3/arch/x86/boot/Makefile
---- linux-3.0.3/arch/x86/boot/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/Makefile 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/Makefile linux-3.0.4/arch/x86/boot/Makefile
+--- linux-3.0.4/arch/x86/boot/Makefile 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/Makefile 2011-08-23 21:47:55.000000000 -0400
 @@ -69,6 +69,9 @@ KBUILD_CFLAGS        := $(LINUXINCLUDE) -g -Os 
                   $(call cc-option, -fno-stack-protector) \
                   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -5554,9 +5554,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/Makefile linux-3.0.3/arch/x86/boot/Makefile
  KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.3/arch/x86/boot/memory.c linux-3.0.3/arch/x86/boot/memory.c
---- linux-3.0.3/arch/x86/boot/memory.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/memory.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/memory.c linux-3.0.4/arch/x86/boot/memory.c
+--- linux-3.0.4/arch/x86/boot/memory.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/memory.c 2011-08-23 21:47:55.000000000 -0400
 @@ -19,7 +19,7 @@
  
  static int detect_memory_e820(void)
@@ -5566,9 +5566,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/memory.c linux-3.0.3/arch/x86/boot/memory.c
        struct biosregs ireg, oreg;
        struct e820entry *desc = boot_params.e820_map;
        static struct e820entry buf; /* static so it is zeroed */
-diff -urNp linux-3.0.3/arch/x86/boot/video.c linux-3.0.3/arch/x86/boot/video.c
---- linux-3.0.3/arch/x86/boot/video.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/video.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/video.c linux-3.0.4/arch/x86/boot/video.c
+--- linux-3.0.4/arch/x86/boot/video.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/video.c  2011-08-23 21:47:55.000000000 -0400
 @@ -96,7 +96,7 @@ static void store_mode_params(void)
  static unsigned int get_entry(void)
  {
@@ -5578,9 +5578,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/video.c linux-3.0.3/arch/x86/boot/video.c
        int key;
        unsigned int v;
  
-diff -urNp linux-3.0.3/arch/x86/boot/video-vesa.c linux-3.0.3/arch/x86/boot/video-vesa.c
---- linux-3.0.3/arch/x86/boot/video-vesa.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/boot/video-vesa.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/boot/video-vesa.c linux-3.0.4/arch/x86/boot/video-vesa.c
+--- linux-3.0.4/arch/x86/boot/video-vesa.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/boot/video-vesa.c     2011-08-23 21:47:55.000000000 -0400
 @@ -200,6 +200,7 @@ static void vesa_store_pm_info(void)
  
        boot_params.screen_info.vesapm_seg = oreg.es;
@@ -5589,9 +5589,9 @@ diff -urNp linux-3.0.3/arch/x86/boot/video-vesa.c linux-3.0.3/arch/x86/boot/vide
  }
  
  /*
-diff -urNp linux-3.0.3/arch/x86/ia32/ia32_aout.c linux-3.0.3/arch/x86/ia32/ia32_aout.c
---- linux-3.0.3/arch/x86/ia32/ia32_aout.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/ia32/ia32_aout.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/ia32/ia32_aout.c linux-3.0.4/arch/x86/ia32/ia32_aout.c
+--- linux-3.0.4/arch/x86/ia32/ia32_aout.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/ia32/ia32_aout.c      2011-08-23 21:48:14.000000000 -0400
 @@ -162,6 +162,8 @@ static int aout_core_dump(long signr, st
        unsigned long dump_start, dump_size;
        struct user32 dump;
@@ -5601,9 +5601,9 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32_aout.c linux-3.0.3/arch/x86/ia32/ia32_
        fs = get_fs();
        set_fs(KERNEL_DS);
        has_dumped = 1;
-diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32entry.S
---- linux-3.0.3/arch/x86/ia32/ia32entry.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/ia32/ia32entry.S      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/ia32/ia32entry.S linux-3.0.4/arch/x86/ia32/ia32entry.S
+--- linux-3.0.4/arch/x86/ia32/ia32entry.S      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/ia32/ia32entry.S      2011-08-25 17:36:37.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <asm/thread_info.h>  
  #include <asm/segment.h>
@@ -5612,7 +5612,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
  #include <linux/linkage.h>
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
-@@ -95,6 +96,32 @@ ENTRY(native_irq_enable_sysexit)
+@@ -95,6 +96,29 @@ ENTRY(native_irq_enable_sysexit)
  ENDPROC(native_irq_enable_sysexit)
  #endif
  
@@ -5631,9 +5631,6 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
 +      call pax_randomize_kstack
 +      popq %rax
 +#endif
-+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+      call pax_erase_kstack
-+#endif
 +      .endm
 +
 +      .macro pax_erase_kstack
@@ -5645,7 +5642,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
  /*
   * 32bit SYSENTER instruction entry.
   *
-@@ -121,7 +148,7 @@ ENTRY(ia32_sysenter_target)
+@@ -121,7 +145,7 @@ ENTRY(ia32_sysenter_target)
        CFI_REGISTER    rsp,rbp
        SWAPGS_UNSAFE_STACK
        movq    PER_CPU_VAR(kernel_stack), %rsp
@@ -5654,7 +5651,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        /*
         * No need to follow this irqs on/off section: the syscall
         * disabled irqs, here we enable it straight after entry:
-@@ -134,7 +161,8 @@ ENTRY(ia32_sysenter_target)
+@@ -134,7 +158,8 @@ ENTRY(ia32_sysenter_target)
        CFI_REL_OFFSET rsp,0
        pushfq_cfi
        /*CFI_REL_OFFSET rflags,0*/
@@ -5664,7 +5661,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        CFI_REGISTER rip,r10
        pushq_cfi $__USER32_CS
        /*CFI_REL_OFFSET cs,0*/
-@@ -146,6 +174,12 @@ ENTRY(ia32_sysenter_target)
+@@ -146,6 +171,12 @@ ENTRY(ia32_sysenter_target)
        SAVE_ARGS 0,0,1
        /* no need to do an access_ok check here because rbp has been
           32bit zero extended */ 
@@ -5677,15 +5674,16 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
  1:    movl    (%rbp),%ebp
        .section __ex_table,"a"
        .quad 1b,ia32_badarg
-@@ -168,6 +202,7 @@ sysenter_dispatch:
+@@ -168,6 +199,8 @@ sysenter_dispatch:
        testl   $_TIF_ALLWORK_MASK,TI_flags(%r10)
        jnz     sysexit_audit
  sysexit_from_sys_call:
 +      pax_exit_kernel_user
++      pax_erase_kstack
        andl    $~TS_COMPAT,TI_status(%r10)
        /* clear IF, that popfq doesn't enable interrupts early */
        andl  $~0x200,EFLAGS-R11(%rsp) 
-@@ -194,6 +229,9 @@ sysexit_from_sys_call:
+@@ -194,6 +227,9 @@ sysexit_from_sys_call:
        movl %eax,%esi                  /* 2nd arg: syscall number */
        movl $AUDIT_ARCH_I386,%edi      /* 1st arg: audit arch */
        call audit_syscall_entry
@@ -5695,7 +5693,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        movl RAX-ARGOFFSET(%rsp),%eax   /* reload syscall number */
        cmpq $(IA32_NR_syscalls-1),%rax
        ja ia32_badsys
-@@ -246,6 +284,9 @@ sysenter_tracesys:
+@@ -246,6 +282,9 @@ sysenter_tracesys:
        movq    $-ENOSYS,RAX(%rsp)/* ptrace can change this for a bad syscall */
        movq    %rsp,%rdi        /* &pt_regs -> arg1 */
        call    syscall_trace_enter
@@ -5705,7 +5703,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
        RESTORE_REST
        cmpq    $(IA32_NR_syscalls-1),%rax
-@@ -277,19 +318,24 @@ ENDPROC(ia32_sysenter_target)
+@@ -277,19 +316,24 @@ ENDPROC(ia32_sysenter_target)
  ENTRY(ia32_cstar_target)
        CFI_STARTPROC32 simple
        CFI_SIGNAL_FRAME
@@ -5732,7 +5730,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        movl    %eax,%eax       /* zero extension */
        movq    %rax,ORIG_RAX-ARGOFFSET(%rsp)
        movq    %rcx,RIP-ARGOFFSET(%rsp)
-@@ -305,6 +351,12 @@ ENTRY(ia32_cstar_target)
+@@ -305,6 +349,12 @@ ENTRY(ia32_cstar_target)
        /* no need to do an access_ok check here because r8 has been
           32bit zero extended */ 
        /* hardware stack frame is complete now */      
@@ -5745,15 +5743,16 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
  1:    movl    (%r8),%r9d
        .section __ex_table,"a"
        .quad 1b,ia32_badarg
-@@ -327,6 +379,7 @@ cstar_dispatch:
+@@ -327,6 +377,8 @@ cstar_dispatch:
        testl $_TIF_ALLWORK_MASK,TI_flags(%r10)
        jnz sysretl_audit
  sysretl_from_sys_call:
 +      pax_exit_kernel_user
++      pax_erase_kstack
        andl $~TS_COMPAT,TI_status(%r10)
        RESTORE_ARGS 1,-ARG_SKIP,1,1,1
        movl RIP-ARGOFFSET(%rsp),%ecx
-@@ -364,6 +417,9 @@ cstar_tracesys:
+@@ -364,6 +416,9 @@ cstar_tracesys:
        movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
        movq %rsp,%rdi        /* &pt_regs -> arg1 */
        call syscall_trace_enter
@@ -5763,7 +5762,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        LOAD_ARGS32 ARGOFFSET, 1  /* reload args from stack in case ptrace changed it */
        RESTORE_REST
        xchgl %ebp,%r9d
-@@ -409,6 +465,7 @@ ENTRY(ia32_syscall)
+@@ -409,6 +464,7 @@ ENTRY(ia32_syscall)
        CFI_REL_OFFSET  rip,RIP-RIP
        PARAVIRT_ADJUST_EXCEPTION_FRAME
        SWAPGS
@@ -5771,7 +5770,7 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        /*
         * No need to follow this irqs on/off section: the syscall
         * disabled irqs and here we enable it straight after entry:
-@@ -441,6 +498,9 @@ ia32_tracesys:                      
+@@ -441,6 +497,9 @@ ia32_tracesys:                      
        movq $-ENOSYS,RAX(%rsp) /* ptrace can change this for a bad syscall */
        movq %rsp,%rdi        /* &pt_regs -> arg1 */
        call syscall_trace_enter
@@ -5781,9 +5780,9 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3/arch/x86/ia32/ia32e
        LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
        RESTORE_REST
        cmpq $(IA32_NR_syscalls-1),%rax
-diff -urNp linux-3.0.3/arch/x86/ia32/ia32_signal.c linux-3.0.3/arch/x86/ia32/ia32_signal.c
---- linux-3.0.3/arch/x86/ia32/ia32_signal.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/ia32/ia32_signal.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/ia32/ia32_signal.c linux-3.0.4/arch/x86/ia32/ia32_signal.c
+--- linux-3.0.4/arch/x86/ia32/ia32_signal.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/ia32/ia32_signal.c    2011-08-23 21:47:55.000000000 -0400
 @@ -403,7 +403,7 @@ static void __user *get_sigframe(struct 
        sp -= frame_size;
        /* Align the stack pointer according to the i386 ABI,
@@ -5833,9 +5832,9 @@ diff -urNp linux-3.0.3/arch/x86/ia32/ia32_signal.c linux-3.0.3/arch/x86/ia32/ia3
        } put_user_catch(err);
  
        if (err)
-diff -urNp linux-3.0.3/arch/x86/include/asm/alternative.h linux-3.0.3/arch/x86/include/asm/alternative.h
---- linux-3.0.3/arch/x86/include/asm/alternative.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/alternative.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/alternative.h linux-3.0.4/arch/x86/include/asm/alternative.h
+--- linux-3.0.4/arch/x86/include/asm/alternative.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/alternative.h     2011-08-23 21:47:55.000000000 -0400
 @@ -93,7 +93,7 @@ static inline int alternatives_text_rese
        ".section .discard,\"aw\",@progbits\n"                          \
        "        .byte 0xff + (664f-663f) - (662b-661b)\n" /* rlen <= slen */   \
@@ -5845,9 +5844,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/alternative.h linux-3.0.3/arch/x86/i
        "663:\n\t" newinstr "\n664:\n"          /* replacement     */   \
        ".previous"
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/apic.h linux-3.0.3/arch/x86/include/asm/apic.h
---- linux-3.0.3/arch/x86/include/asm/apic.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/apic.h    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/apic.h linux-3.0.4/arch/x86/include/asm/apic.h
+--- linux-3.0.4/arch/x86/include/asm/apic.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/apic.h    2011-08-23 21:48:14.000000000 -0400
 @@ -45,7 +45,7 @@ static inline void generic_apic_probe(vo
  
  #ifdef CONFIG_X86_LOCAL_APIC
@@ -5857,9 +5856,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/apic.h linux-3.0.3/arch/x86/include/
  extern int local_apic_timer_c2_ok;
  
  extern int disable_apic;
-diff -urNp linux-3.0.3/arch/x86/include/asm/apm.h linux-3.0.3/arch/x86/include/asm/apm.h
---- linux-3.0.3/arch/x86/include/asm/apm.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/apm.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/apm.h linux-3.0.4/arch/x86/include/asm/apm.h
+--- linux-3.0.4/arch/x86/include/asm/apm.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/apm.h     2011-08-23 21:47:55.000000000 -0400
 @@ -34,7 +34,7 @@ static inline void apm_bios_call_asm(u32
        __asm__ __volatile__(APM_DO_ZERO_SEGS
                "pushl %%edi\n\t"
@@ -5878,9 +5877,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/apm.h linux-3.0.3/arch/x86/include/a
                "setc %%bl\n\t"
                "popl %%ebp\n\t"
                "popl %%edi\n\t"
-diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_32.h linux-3.0.3/arch/x86/include/asm/atomic64_32.h
---- linux-3.0.3/arch/x86/include/asm/atomic64_32.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/atomic64_32.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_32.h linux-3.0.4/arch/x86/include/asm/atomic64_32.h
+--- linux-3.0.4/arch/x86/include/asm/atomic64_32.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/atomic64_32.h     2011-08-23 21:47:55.000000000 -0400
 @@ -12,6 +12,14 @@ typedef struct {
        u64 __aligned(8) counter;
  } atomic64_t;
@@ -6030,9 +6029,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_32.h linux-3.0.3/arch/x86/i
   * atomic64_sub - subtract the atomic64 variable
   * @i: integer value to subtract
   * @v: pointer to type atomic64_t
-diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_64.h linux-3.0.3/arch/x86/include/asm/atomic64_64.h
---- linux-3.0.3/arch/x86/include/asm/atomic64_64.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/atomic64_64.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/atomic64_64.h linux-3.0.4/arch/x86/include/asm/atomic64_64.h
+--- linux-3.0.4/arch/x86/include/asm/atomic64_64.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/atomic64_64.h     2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,19 @@
   */
  static inline long atomic64_read(const atomic64_t *v)
@@ -6354,9 +6353,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/atomic64_64.h linux-3.0.3/arch/x86/i
  }
  
  #define atomic64_inc_not_zero(v) atomic64_add_unless((v), 1, 0)
-diff -urNp linux-3.0.3/arch/x86/include/asm/atomic.h linux-3.0.3/arch/x86/include/asm/atomic.h
---- linux-3.0.3/arch/x86/include/asm/atomic.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/atomic.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/atomic.h linux-3.0.4/arch/x86/include/asm/atomic.h
+--- linux-3.0.4/arch/x86/include/asm/atomic.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/atomic.h  2011-08-23 21:47:55.000000000 -0400
 @@ -22,7 +22,18 @@
   */
  static inline int atomic_read(const atomic_t *v)
@@ -6769,9 +6768,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/atomic.h linux-3.0.3/arch/x86/includ
  /*
   * atomic_dec_if_positive - decrement by 1 if old value positive
   * @v: pointer of type atomic_t
-diff -urNp linux-3.0.3/arch/x86/include/asm/bitops.h linux-3.0.3/arch/x86/include/asm/bitops.h
---- linux-3.0.3/arch/x86/include/asm/bitops.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/bitops.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/bitops.h linux-3.0.4/arch/x86/include/asm/bitops.h
+--- linux-3.0.4/arch/x86/include/asm/bitops.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/bitops.h  2011-08-23 21:47:55.000000000 -0400
 @@ -38,7 +38,7 @@
   * a mask operation on a byte.
   */
@@ -6781,9 +6780,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/bitops.h linux-3.0.3/arch/x86/includ
  #define CONST_MASK(nr)                        (1 << ((nr) & 7))
  
  /**
-diff -urNp linux-3.0.3/arch/x86/include/asm/boot.h linux-3.0.3/arch/x86/include/asm/boot.h
---- linux-3.0.3/arch/x86/include/asm/boot.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/boot.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/boot.h linux-3.0.4/arch/x86/include/asm/boot.h
+--- linux-3.0.4/arch/x86/include/asm/boot.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/boot.h    2011-08-23 21:47:55.000000000 -0400
 @@ -11,10 +11,15 @@
  #include <asm/pgtable_types.h>
  
@@ -6801,9 +6800,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/boot.h linux-3.0.3/arch/x86/include/
  /* Minimum kernel alignment, as a power of two */
  #ifdef CONFIG_X86_64
  #define MIN_KERNEL_ALIGN_LG2  PMD_SHIFT
-diff -urNp linux-3.0.3/arch/x86/include/asm/cacheflush.h linux-3.0.3/arch/x86/include/asm/cacheflush.h
---- linux-3.0.3/arch/x86/include/asm/cacheflush.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/cacheflush.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/cacheflush.h linux-3.0.4/arch/x86/include/asm/cacheflush.h
+--- linux-3.0.4/arch/x86/include/asm/cacheflush.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/cacheflush.h      2011-08-23 21:47:55.000000000 -0400
 @@ -26,7 +26,7 @@ static inline unsigned long get_page_mem
        unsigned long pg_flags = pg->flags & _PGMT_MASK;
  
@@ -6813,9 +6812,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/cacheflush.h linux-3.0.3/arch/x86/in
        else if (pg_flags == _PGMT_WC)
                return _PAGE_CACHE_WC;
        else if (pg_flags == _PGMT_UC_MINUS)
-diff -urNp linux-3.0.3/arch/x86/include/asm/cache.h linux-3.0.3/arch/x86/include/asm/cache.h
---- linux-3.0.3/arch/x86/include/asm/cache.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/cache.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/cache.h linux-3.0.4/arch/x86/include/asm/cache.h
+--- linux-3.0.4/arch/x86/include/asm/cache.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/cache.h   2011-08-23 21:47:55.000000000 -0400
 @@ -5,12 +5,13 @@
  
  /* L1 cache line size */
@@ -6832,9 +6831,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/cache.h linux-3.0.3/arch/x86/include
  
  #ifdef CONFIG_X86_VSMP
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.3/arch/x86/include/asm/checksum_32.h linux-3.0.3/arch/x86/include/asm/checksum_32.h
---- linux-3.0.3/arch/x86/include/asm/checksum_32.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/checksum_32.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/checksum_32.h linux-3.0.4/arch/x86/include/asm/checksum_32.h
+--- linux-3.0.4/arch/x86/include/asm/checksum_32.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/checksum_32.h     2011-08-23 21:47:55.000000000 -0400
 @@ -31,6 +31,14 @@ asmlinkage __wsum csum_partial_copy_gene
                                            int len, __wsum sum,
                                            int *src_err_ptr, int *dst_err_ptr);
@@ -6868,9 +6867,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/checksum_32.h linux-3.0.3/arch/x86/i
                                                 len, sum, NULL, err_ptr);
  
        if (len)
-diff -urNp linux-3.0.3/arch/x86/include/asm/cpufeature.h linux-3.0.3/arch/x86/include/asm/cpufeature.h
---- linux-3.0.3/arch/x86/include/asm/cpufeature.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/cpufeature.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/cpufeature.h linux-3.0.4/arch/x86/include/asm/cpufeature.h
+--- linux-3.0.4/arch/x86/include/asm/cpufeature.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/cpufeature.h      2011-08-23 21:47:55.000000000 -0400
 @@ -358,7 +358,7 @@ static __always_inline __pure bool __sta
                             ".section .discard,\"aw\",@progbits\n"
                             " .byte 0xff + (4f-3f) - (2b-1b)\n" /* size check */
@@ -6880,9 +6879,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/cpufeature.h linux-3.0.3/arch/x86/in
                             "3: movb $1,%0\n"
                             "4:\n"
                             ".previous\n"
-diff -urNp linux-3.0.3/arch/x86/include/asm/desc_defs.h linux-3.0.3/arch/x86/include/asm/desc_defs.h
---- linux-3.0.3/arch/x86/include/asm/desc_defs.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/desc_defs.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/desc_defs.h linux-3.0.4/arch/x86/include/asm/desc_defs.h
+--- linux-3.0.4/arch/x86/include/asm/desc_defs.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/desc_defs.h       2011-08-23 21:47:55.000000000 -0400
 @@ -31,6 +31,12 @@ struct desc_struct {
                        unsigned base1: 8, type: 4, s: 1, dpl: 2, p: 1;
                        unsigned limit: 4, avl: 1, l: 1, d: 1, g: 1, base2: 8;
@@ -6896,9 +6895,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/desc_defs.h linux-3.0.3/arch/x86/inc
        };
  } __attribute__((packed));
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/desc.h linux-3.0.3/arch/x86/include/asm/desc.h
---- linux-3.0.3/arch/x86/include/asm/desc.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/desc.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/desc.h linux-3.0.4/arch/x86/include/asm/desc.h
+--- linux-3.0.4/arch/x86/include/asm/desc.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/desc.h    2011-08-23 21:47:55.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <asm/desc_defs.h>
  #include <asm/ldt.h>
@@ -7077,9 +7076,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/desc.h linux-3.0.3/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_DESC_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/e820.h linux-3.0.3/arch/x86/include/asm/e820.h
---- linux-3.0.3/arch/x86/include/asm/e820.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/e820.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/e820.h linux-3.0.4/arch/x86/include/asm/e820.h
+--- linux-3.0.4/arch/x86/include/asm/e820.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/e820.h    2011-08-23 21:47:55.000000000 -0400
 @@ -69,7 +69,7 @@ struct e820map {
  #define ISA_START_ADDRESS     0xa0000
  #define ISA_END_ADDRESS               0x100000
@@ -7089,9 +7088,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/e820.h linux-3.0.3/arch/x86/include/
  #define BIOS_END              0x00100000
  
  #define BIOS_ROM_BASE         0xffe00000
-diff -urNp linux-3.0.3/arch/x86/include/asm/elf.h linux-3.0.3/arch/x86/include/asm/elf.h
---- linux-3.0.3/arch/x86/include/asm/elf.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/elf.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/elf.h linux-3.0.4/arch/x86/include/asm/elf.h
+--- linux-3.0.4/arch/x86/include/asm/elf.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/elf.h     2011-08-23 21:47:55.000000000 -0400
 @@ -237,7 +237,25 @@ extern int force_personality32;
     the loader.  We need to make sure that it is out of the way of the program
     that it will "exec", and that there is sufficient room for the brk.  */
@@ -7146,9 +7145,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/elf.h linux-3.0.3/arch/x86/include/a
 -#define arch_randomize_brk arch_randomize_brk
 -
  #endif /* _ASM_X86_ELF_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/emergency-restart.h linux-3.0.3/arch/x86/include/asm/emergency-restart.h
---- linux-3.0.3/arch/x86/include/asm/emergency-restart.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/emergency-restart.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/emergency-restart.h linux-3.0.4/arch/x86/include/asm/emergency-restart.h
+--- linux-3.0.4/arch/x86/include/asm/emergency-restart.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/emergency-restart.h       2011-08-23 21:47:55.000000000 -0400
 @@ -15,6 +15,6 @@ enum reboot_type {
  
  extern enum reboot_type reboot_type;
@@ -7157,9 +7156,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/emergency-restart.h linux-3.0.3/arch
 +extern void machine_emergency_restart(void) __noreturn;
  
  #endif /* _ASM_X86_EMERGENCY_RESTART_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/futex.h linux-3.0.3/arch/x86/include/asm/futex.h
---- linux-3.0.3/arch/x86/include/asm/futex.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/futex.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/futex.h linux-3.0.4/arch/x86/include/asm/futex.h
+--- linux-3.0.4/arch/x86/include/asm/futex.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/futex.h   2011-08-23 21:47:55.000000000 -0400
 @@ -12,16 +12,18 @@
  #include <asm/system.h>
  
@@ -7218,9 +7217,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/futex.h linux-3.0.3/arch/x86/include
                     : "i" (-EFAULT), "r" (newval), "1" (oldval)
                     : "memory"
        );
-diff -urNp linux-3.0.3/arch/x86/include/asm/hw_irq.h linux-3.0.3/arch/x86/include/asm/hw_irq.h
---- linux-3.0.3/arch/x86/include/asm/hw_irq.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/hw_irq.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/hw_irq.h linux-3.0.4/arch/x86/include/asm/hw_irq.h
+--- linux-3.0.4/arch/x86/include/asm/hw_irq.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/hw_irq.h  2011-08-23 21:47:55.000000000 -0400
 @@ -137,8 +137,8 @@ extern void setup_ioapic_dest(void);
  extern void enable_IO_APIC(void);
  
@@ -7232,9 +7231,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/hw_irq.h linux-3.0.3/arch/x86/includ
  
  /* EISA */
  extern void eisa_set_level_irq(unsigned int irq);
-diff -urNp linux-3.0.3/arch/x86/include/asm/i387.h linux-3.0.3/arch/x86/include/asm/i387.h
---- linux-3.0.3/arch/x86/include/asm/i387.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/i387.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/i387.h linux-3.0.4/arch/x86/include/asm/i387.h
+--- linux-3.0.4/arch/x86/include/asm/i387.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/i387.h    2011-08-23 21:47:55.000000000 -0400
 @@ -92,6 +92,11 @@ static inline int fxrstor_checking(struc
  {
        int err;
@@ -7284,9 +7283,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/i387.h linux-3.0.3/arch/x86/include/
        else
                clts();
  }
-diff -urNp linux-3.0.3/arch/x86/include/asm/io.h linux-3.0.3/arch/x86/include/asm/io.h
---- linux-3.0.3/arch/x86/include/asm/io.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/io.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/io.h linux-3.0.4/arch/x86/include/asm/io.h
+--- linux-3.0.4/arch/x86/include/asm/io.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/io.h      2011-08-23 21:47:55.000000000 -0400
 @@ -196,6 +196,17 @@ extern void set_iounmap_nonlazy(void);
  
  #include <linux/vmalloc.h>
@@ -7305,9 +7304,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/io.h linux-3.0.3/arch/x86/include/as
  /*
   * Convert a virtual cached pointer to an uncached pointer
   */
-diff -urNp linux-3.0.3/arch/x86/include/asm/irqflags.h linux-3.0.3/arch/x86/include/asm/irqflags.h
---- linux-3.0.3/arch/x86/include/asm/irqflags.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/irqflags.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/irqflags.h linux-3.0.4/arch/x86/include/asm/irqflags.h
+--- linux-3.0.4/arch/x86/include/asm/irqflags.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/irqflags.h        2011-08-23 21:47:55.000000000 -0400
 @@ -140,6 +140,11 @@ static inline unsigned long arch_local_i
        sti;                                    \
        sysexit
@@ -7320,9 +7319,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/irqflags.h linux-3.0.3/arch/x86/incl
  #else
  #define INTERRUPT_RETURN              iret
  #define ENABLE_INTERRUPTS_SYSEXIT     sti; sysexit
-diff -urNp linux-3.0.3/arch/x86/include/asm/kprobes.h linux-3.0.3/arch/x86/include/asm/kprobes.h
---- linux-3.0.3/arch/x86/include/asm/kprobes.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/kprobes.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/kprobes.h linux-3.0.4/arch/x86/include/asm/kprobes.h
+--- linux-3.0.4/arch/x86/include/asm/kprobes.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/kprobes.h 2011-08-23 21:47:55.000000000 -0400
 @@ -37,13 +37,8 @@ typedef u8 kprobe_opcode_t;
  #define RELATIVEJUMP_SIZE 5
  #define RELATIVECALL_OPCODE 0xe8
@@ -7339,9 +7338,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/kprobes.h linux-3.0.3/arch/x86/inclu
  
  #define flush_insn_slot(p)    do { } while (0)
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/kvm_host.h linux-3.0.3/arch/x86/include/asm/kvm_host.h
---- linux-3.0.3/arch/x86/include/asm/kvm_host.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/kvm_host.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/kvm_host.h linux-3.0.4/arch/x86/include/asm/kvm_host.h
+--- linux-3.0.4/arch/x86/include/asm/kvm_host.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/kvm_host.h        2011-08-26 19:49:56.000000000 -0400
 @@ -441,7 +441,7 @@ struct kvm_arch {
        unsigned int n_used_mmu_pages;
        unsigned int n_requested_mmu_pages;
@@ -7351,18 +7350,18 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/kvm_host.h linux-3.0.3/arch/x86/incl
        struct hlist_head mmu_page_hash[KVM_NUM_MMU_PAGES];
        /*
         * Hash table of struct kvm_mmu_page.
-@@ -618,7 +618,7 @@ struct kvm_x86_ops {
-                              struct x86_instruction_info *info,
+@@ -619,7 +619,7 @@ struct kvm_x86_ops {
                               enum x86_intercept_stage stage);
  
--      const struct trace_print_flags *exit_reasons_str;
-+      const struct trace_print_flags * const exit_reasons_str;
- };
+       const struct trace_print_flags *exit_reasons_str;
+-};
++} __do_const;
  
  struct kvm_arch_async_pf {
-diff -urNp linux-3.0.3/arch/x86/include/asm/local.h linux-3.0.3/arch/x86/include/asm/local.h
---- linux-3.0.3/arch/x86/include/asm/local.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/local.h   2011-08-23 21:47:55.000000000 -0400
+       u32 token;
+diff -urNp linux-3.0.4/arch/x86/include/asm/local.h linux-3.0.4/arch/x86/include/asm/local.h
+--- linux-3.0.4/arch/x86/include/asm/local.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/local.h   2011-08-23 21:47:55.000000000 -0400
 @@ -18,26 +18,58 @@ typedef struct {
  
  static inline void local_inc(local_t *l)
@@ -7515,9 +7514,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/local.h linux-3.0.3/arch/x86/include
                     : "+r" (i), "+m" (l->a.counter)
                     : : "memory");
        return i + __i;
-diff -urNp linux-3.0.3/arch/x86/include/asm/mman.h linux-3.0.3/arch/x86/include/asm/mman.h
---- linux-3.0.3/arch/x86/include/asm/mman.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/mman.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/mman.h linux-3.0.4/arch/x86/include/asm/mman.h
+--- linux-3.0.4/arch/x86/include/asm/mman.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/mman.h    2011-08-23 21:47:55.000000000 -0400
 @@ -5,4 +5,14 @@
  
  #include <asm-generic/mman.h>
@@ -7533,9 +7532,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/mman.h linux-3.0.3/arch/x86/include/
 +#endif
 +
  #endif /* _ASM_X86_MMAN_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/mmu_context.h linux-3.0.3/arch/x86/include/asm/mmu_context.h
---- linux-3.0.3/arch/x86/include/asm/mmu_context.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/mmu_context.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/mmu_context.h linux-3.0.4/arch/x86/include/asm/mmu_context.h
+--- linux-3.0.4/arch/x86/include/asm/mmu_context.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/mmu_context.h     2011-08-23 21:48:14.000000000 -0400
 @@ -24,6 +24,18 @@ void destroy_context(struct mm_struct *m
  
  static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
@@ -7656,9 +7655,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/mmu_context.h linux-3.0.3/arch/x86/i
  }
  
  #define activate_mm(prev, next)                       \
-diff -urNp linux-3.0.3/arch/x86/include/asm/mmu.h linux-3.0.3/arch/x86/include/asm/mmu.h
---- linux-3.0.3/arch/x86/include/asm/mmu.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/mmu.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/mmu.h linux-3.0.4/arch/x86/include/asm/mmu.h
+--- linux-3.0.4/arch/x86/include/asm/mmu.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/mmu.h     2011-08-23 21:47:55.000000000 -0400
 @@ -9,7 +9,7 @@
   * we put the segment information here.
   */
@@ -7689,9 +7688,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/mmu.h linux-3.0.3/arch/x86/include/a
  } mm_context_t;
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.3/arch/x86/include/asm/module.h linux-3.0.3/arch/x86/include/asm/module.h
---- linux-3.0.3/arch/x86/include/asm/module.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/module.h  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/module.h linux-3.0.4/arch/x86/include/asm/module.h
+--- linux-3.0.4/arch/x86/include/asm/module.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/module.h  2011-08-23 21:48:14.000000000 -0400
 @@ -5,6 +5,7 @@
  
  #ifdef CONFIG_X86_64
@@ -7733,9 +7732,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/module.h linux-3.0.3/arch/x86/includ
 +#define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_GRSEC MODULE_PAX_KERNEXEC MODULE_PAX_UDEREF MODULE_PAX_REFCOUNT
 +
  #endif /* _ASM_X86_MODULE_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/page_64_types.h linux-3.0.3/arch/x86/include/asm/page_64_types.h
---- linux-3.0.3/arch/x86/include/asm/page_64_types.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/page_64_types.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/page_64_types.h linux-3.0.4/arch/x86/include/asm/page_64_types.h
+--- linux-3.0.4/arch/x86/include/asm/page_64_types.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/page_64_types.h   2011-08-23 21:47:55.000000000 -0400
 @@ -56,7 +56,7 @@ void copy_page(void *to, void *from);
  
  /* duplicated to the one in bootmem.h */
@@ -7745,9 +7744,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/page_64_types.h linux-3.0.3/arch/x86
  
  extern unsigned long __phys_addr(unsigned long);
  #define __phys_reloc_hide(x)  (x)
-diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt.h linux-3.0.3/arch/x86/include/asm/paravirt.h
---- linux-3.0.3/arch/x86/include/asm/paravirt.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/paravirt.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt.h linux-3.0.4/arch/x86/include/asm/paravirt.h
+--- linux-3.0.4/arch/x86/include/asm/paravirt.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/paravirt.h        2011-08-23 21:47:55.000000000 -0400
 @@ -658,6 +658,18 @@ static inline void set_pgd(pgd_t *pgdp, 
                            val);
  }
@@ -7820,9 +7819,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt.h linux-3.0.3/arch/x86/incl
  #endif        /* CONFIG_X86_32 */
  
  #endif /* __ASSEMBLY__ */
-diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt_types.h linux-3.0.3/arch/x86/include/asm/paravirt_types.h
---- linux-3.0.3/arch/x86/include/asm/paravirt_types.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/paravirt_types.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/paravirt_types.h linux-3.0.4/arch/x86/include/asm/paravirt_types.h
+--- linux-3.0.4/arch/x86/include/asm/paravirt_types.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/paravirt_types.h  2011-08-23 21:47:55.000000000 -0400
 @@ -78,19 +78,19 @@ struct pv_init_ops {
         */
        unsigned (*patch)(u8 type, u16 clobber, void *insnbuf,
@@ -7894,9 +7893,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/paravirt_types.h linux-3.0.3/arch/x8
  
  /* This contains all the paravirt structures: we get a convenient
   * number for each function using the offset which we use to indicate
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgalloc.h linux-3.0.3/arch/x86/include/asm/pgalloc.h
---- linux-3.0.3/arch/x86/include/asm/pgalloc.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgalloc.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgalloc.h linux-3.0.4/arch/x86/include/asm/pgalloc.h
+--- linux-3.0.4/arch/x86/include/asm/pgalloc.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgalloc.h 2011-08-23 21:47:55.000000000 -0400
 @@ -63,6 +63,13 @@ static inline void pmd_populate_kernel(s
                                       pmd_t *pmd, pte_t *pte)
  {
@@ -7911,9 +7910,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgalloc.h linux-3.0.3/arch/x86/inclu
        set_pmd(pmd, __pmd(__pa(pte) | _PAGE_TABLE));
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-2level.h linux-3.0.3/arch/x86/include/asm/pgtable-2level.h
---- linux-3.0.3/arch/x86/include/asm/pgtable-2level.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable-2level.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-2level.h linux-3.0.4/arch/x86/include/asm/pgtable-2level.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable-2level.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable-2level.h  2011-08-23 21:47:55.000000000 -0400
 @@ -18,7 +18,9 @@ static inline void native_set_pte(pte_t 
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -7924,9 +7923,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-2level.h linux-3.0.3/arch/x8
  }
  
  static inline void native_set_pte_atomic(pte_t *ptep, pte_t pte)
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32.h linux-3.0.3/arch/x86/include/asm/pgtable_32.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_32.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_32.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32.h linux-3.0.4/arch/x86/include/asm/pgtable_32.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_32.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_32.h      2011-08-23 21:47:55.000000000 -0400
 @@ -25,9 +25,6 @@
  struct mm_struct;
  struct vm_area_struct;
@@ -7970,9 +7969,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32.h linux-3.0.3/arch/x86/in
  /*
   * kern_addr_valid() is (1) for FLATMEM and (0) for
   * SPARSEMEM and DISCONTIGMEM
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_32_types.h        2011-08-23 21:47:55.000000000 -0400
 @@ -8,7 +8,7 @@
   */
  #ifdef CONFIG_X86_PAE
@@ -8002,9 +8001,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_32_types.h linux-3.0.3/arch/
  #define MODULES_VADDR VMALLOC_START
  #define MODULES_END   VMALLOC_END
  #define MODULES_LEN   (MODULES_VADDR - MODULES_END)
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-3level.h linux-3.0.3/arch/x86/include/asm/pgtable-3level.h
---- linux-3.0.3/arch/x86/include/asm/pgtable-3level.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable-3level.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable-3level.h linux-3.0.4/arch/x86/include/asm/pgtable-3level.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable-3level.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable-3level.h  2011-08-23 21:47:55.000000000 -0400
 @@ -38,12 +38,16 @@ static inline void native_set_pte_atomic
  
  static inline void native_set_pmd(pmd_t *pmdp, pmd_t pmd)
@@ -8022,9 +8021,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable-3level.h linux-3.0.3/arch/x8
  }
  
  /*
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64.h linux-3.0.3/arch/x86/include/asm/pgtable_64.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_64.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_64.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64.h linux-3.0.4/arch/x86/include/asm/pgtable_64.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_64.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_64.h      2011-08-23 21:47:55.000000000 -0400
 @@ -16,10 +16,13 @@
  
  extern pud_t level3_kernel_pgt[512];
@@ -8065,9 +8064,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64.h linux-3.0.3/arch/x86/in
        *pgdp = pgd;
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_64_types.h        2011-08-23 21:47:55.000000000 -0400
 @@ -59,5 +59,10 @@ typedef struct { pteval_t pte; } pte_t;
  #define MODULES_VADDR    _AC(0xffffffffa0000000, UL)
  #define MODULES_END      _AC(0xffffffffff000000, UL)
@@ -8079,9 +8078,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_64_types.h linux-3.0.3/arch/
 +#define ktva_ktla(addr)               (addr)
  
  #endif /* _ASM_X86_PGTABLE_64_DEFS_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable.h linux-3.0.3/arch/x86/include/asm/pgtable.h
---- linux-3.0.3/arch/x86/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable.h linux-3.0.4/arch/x86/include/asm/pgtable.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable.h 2011-08-23 21:47:55.000000000 -0400
 @@ -44,6 +44,7 @@ extern struct mm_struct *pgd_page_get_mm
  
  #ifndef __PAGETABLE_PUD_FOLDED
@@ -8259,9 +8258,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable.h linux-3.0.3/arch/x86/inclu
  
  #include <asm-generic/pgtable.h>
  #endif        /* __ASSEMBLY__ */
-diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_types.h linux-3.0.3/arch/x86/include/asm/pgtable_types.h
---- linux-3.0.3/arch/x86/include/asm/pgtable_types.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/pgtable_types.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/pgtable_types.h linux-3.0.4/arch/x86/include/asm/pgtable_types.h
+--- linux-3.0.4/arch/x86/include/asm/pgtable_types.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/pgtable_types.h   2011-08-23 21:47:55.000000000 -0400
 @@ -16,13 +16,12 @@
  #define _PAGE_BIT_PSE         7       /* 4 MB (or 2MB) page */
  #define _PAGE_BIT_PAT         7       /* on 4KB pages */
@@ -8375,9 +8374,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/pgtable_types.h linux-3.0.3/arch/x86
  
  #define pgprot_writecombine   pgprot_writecombine
  extern pgprot_t pgprot_writecombine(pgprot_t prot);
-diff -urNp linux-3.0.3/arch/x86/include/asm/processor.h linux-3.0.3/arch/x86/include/asm/processor.h
---- linux-3.0.3/arch/x86/include/asm/processor.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/processor.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/processor.h linux-3.0.4/arch/x86/include/asm/processor.h
+--- linux-3.0.4/arch/x86/include/asm/processor.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/processor.h       2011-08-23 21:47:55.000000000 -0400
 @@ -266,7 +266,7 @@ struct tss_struct {
  
  } ____cacheline_aligned;
@@ -8480,9 +8479,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/processor.h linux-3.0.3/arch/x86/inc
  #define KSTK_EIP(task)                (task_pt_regs(task)->ip)
  
  /* Get/set a process' ability to use the timestamp counter instruction */
-diff -urNp linux-3.0.3/arch/x86/include/asm/ptrace.h linux-3.0.3/arch/x86/include/asm/ptrace.h
---- linux-3.0.3/arch/x86/include/asm/ptrace.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/ptrace.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/ptrace.h linux-3.0.4/arch/x86/include/asm/ptrace.h
+--- linux-3.0.4/arch/x86/include/asm/ptrace.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/ptrace.h  2011-08-23 21:47:55.000000000 -0400
 @@ -153,28 +153,29 @@ static inline unsigned long regs_return_
  }
  
@@ -8519,9 +8518,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/ptrace.h linux-3.0.3/arch/x86/includ
  #endif
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/reboot.h linux-3.0.3/arch/x86/include/asm/reboot.h
---- linux-3.0.3/arch/x86/include/asm/reboot.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/reboot.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/reboot.h linux-3.0.4/arch/x86/include/asm/reboot.h
+--- linux-3.0.4/arch/x86/include/asm/reboot.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/reboot.h  2011-08-23 21:47:55.000000000 -0400
 @@ -6,19 +6,19 @@
  struct pt_regs;
  
@@ -8548,9 +8547,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/reboot.h linux-3.0.3/arch/x86/includ
  /* These must match dispatch_table in reboot_32.S */
  #define MRR_BIOS      0
  #define MRR_APM               1
-diff -urNp linux-3.0.3/arch/x86/include/asm/rwsem.h linux-3.0.3/arch/x86/include/asm/rwsem.h
---- linux-3.0.3/arch/x86/include/asm/rwsem.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/rwsem.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/rwsem.h linux-3.0.4/arch/x86/include/asm/rwsem.h
+--- linux-3.0.4/arch/x86/include/asm/rwsem.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/rwsem.h   2011-08-23 21:47:55.000000000 -0400
 @@ -64,6 +64,14 @@ static inline void __down_read(struct rw
  {
        asm volatile("# beginning down_read\n\t"
@@ -8675,9 +8674,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/rwsem.h linux-3.0.3/arch/x86/include
                     : "+r" (tmp), "+m" (sem->count)
                     : : "memory");
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/segment.h linux-3.0.3/arch/x86/include/asm/segment.h
---- linux-3.0.3/arch/x86/include/asm/segment.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/segment.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/segment.h linux-3.0.4/arch/x86/include/asm/segment.h
+--- linux-3.0.4/arch/x86/include/asm/segment.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/segment.h 2011-08-23 21:47:55.000000000 -0400
 @@ -64,8 +64,8 @@
   *  26 - ESPFIX small SS
   *  27 - per-cpu                      [ offset to per-cpu data area ]
@@ -8737,9 +8736,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/segment.h linux-3.0.3/arch/x86/inclu
  #define __KERNEL_DS   (GDT_ENTRY_KERNEL_DS*8)
  #define __USER_DS     (GDT_ENTRY_DEFAULT_USER_DS*8+3)
  #define __USER_CS     (GDT_ENTRY_DEFAULT_USER_CS*8+3)
-diff -urNp linux-3.0.3/arch/x86/include/asm/smp.h linux-3.0.3/arch/x86/include/asm/smp.h
---- linux-3.0.3/arch/x86/include/asm/smp.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/smp.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/smp.h linux-3.0.4/arch/x86/include/asm/smp.h
+--- linux-3.0.4/arch/x86/include/asm/smp.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/smp.h     2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_
  /* cpus sharing the last level cache: */
  DECLARE_PER_CPU(cpumask_var_t, cpu_llc_shared_map);
@@ -8775,9 +8774,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/smp.h linux-3.0.3/arch/x86/include/a
  #define safe_smp_processor_id()               smp_processor_id()
  
  #endif
-diff -urNp linux-3.0.3/arch/x86/include/asm/spinlock.h linux-3.0.3/arch/x86/include/asm/spinlock.h
---- linux-3.0.3/arch/x86/include/asm/spinlock.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/spinlock.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/spinlock.h linux-3.0.4/arch/x86/include/asm/spinlock.h
+--- linux-3.0.4/arch/x86/include/asm/spinlock.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/spinlock.h        2011-08-23 21:47:55.000000000 -0400
 @@ -249,6 +249,14 @@ static inline int arch_write_can_lock(ar
  static inline void arch_read_lock(arch_rwlock_t *rw)
  {
@@ -8840,9 +8839,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/spinlock.h linux-3.0.3/arch/x86/incl
                     : "+m" (rw->lock) : "i" (RW_LOCK_BIAS) : "memory");
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/stackprotector.h linux-3.0.3/arch/x86/include/asm/stackprotector.h
---- linux-3.0.3/arch/x86/include/asm/stackprotector.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/stackprotector.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/stackprotector.h linux-3.0.4/arch/x86/include/asm/stackprotector.h
+--- linux-3.0.4/arch/x86/include/asm/stackprotector.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/stackprotector.h  2011-08-23 21:47:55.000000000 -0400
 @@ -48,7 +48,7 @@
   * head_32 for boot CPU and setup_per_cpu_areas() for others.
   */
@@ -8861,9 +8860,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/stackprotector.h linux-3.0.3/arch/x8
        asm volatile ("mov %0, %%gs" : : "r" (0));
  #endif
  }
-diff -urNp linux-3.0.3/arch/x86/include/asm/stacktrace.h linux-3.0.3/arch/x86/include/asm/stacktrace.h
---- linux-3.0.3/arch/x86/include/asm/stacktrace.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/stacktrace.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/stacktrace.h linux-3.0.4/arch/x86/include/asm/stacktrace.h
+--- linux-3.0.4/arch/x86/include/asm/stacktrace.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/stacktrace.h      2011-08-23 21:47:55.000000000 -0400
 @@ -11,28 +11,20 @@
  
  extern int kstack_depth_to_print;
@@ -8914,9 +8913,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/stacktrace.h linux-3.0.3/arch/x86/in
  };
  
  void dump_trace(struct task_struct *tsk, struct pt_regs *regs,
-diff -urNp linux-3.0.3/arch/x86/include/asm/system.h linux-3.0.3/arch/x86/include/asm/system.h
---- linux-3.0.3/arch/x86/include/asm/system.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/system.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/system.h linux-3.0.4/arch/x86/include/asm/system.h
+--- linux-3.0.4/arch/x86/include/asm/system.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/system.h  2011-08-23 21:47:55.000000000 -0400
 @@ -129,7 +129,7 @@ do {                                                                       \
             "call __switch_to\n\t"                                       \
             "movq "__percpu_arg([current_task])",%%rsi\n\t"              \
@@ -8959,9 +8958,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/system.h linux-3.0.3/arch/x86/includ
  
  /*
   * Force strict CPU ordering.
-diff -urNp linux-3.0.3/arch/x86/include/asm/thread_info.h linux-3.0.3/arch/x86/include/asm/thread_info.h
---- linux-3.0.3/arch/x86/include/asm/thread_info.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/thread_info.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/thread_info.h linux-3.0.4/arch/x86/include/asm/thread_info.h
+--- linux-3.0.4/arch/x86/include/asm/thread_info.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/thread_info.h     2011-08-23 21:47:55.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compiler.h>
  #include <asm/page.h>
@@ -9109,9 +9108,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/thread_info.h linux-3.0.3/arch/x86/i
 +
  #endif
  #endif /* _ASM_X86_THREAD_INFO_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_32.h linux-3.0.3/arch/x86/include/asm/uaccess_32.h
---- linux-3.0.3/arch/x86/include/asm/uaccess_32.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/uaccess_32.h      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_32.h linux-3.0.4/arch/x86/include/asm/uaccess_32.h
+--- linux-3.0.4/arch/x86/include/asm/uaccess_32.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/uaccess_32.h      2011-08-23 21:48:14.000000000 -0400
 @@ -43,6 +43,11 @@ 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)
@@ -9279,9 +9278,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_32.h linux-3.0.3/arch/x86/in
        return n;
  }
  
-diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_64.h linux-3.0.3/arch/x86/include/asm/uaccess_64.h
---- linux-3.0.3/arch/x86/include/asm/uaccess_64.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/uaccess_64.h      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess_64.h linux-3.0.4/arch/x86/include/asm/uaccess_64.h
+--- linux-3.0.4/arch/x86/include/asm/uaccess_64.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/uaccess_64.h      2011-08-23 21:48:14.000000000 -0400
 @@ -10,6 +10,9 @@
  #include <asm/alternative.h>
  #include <asm/cpufeature.h>
@@ -9686,9 +9685,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess_64.h linux-3.0.3/arch/x86/in
  copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest);
  
  #endif /* _ASM_X86_UACCESS_64_H */
-diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess.h linux-3.0.3/arch/x86/include/asm/uaccess.h
---- linux-3.0.3/arch/x86/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/uaccess.h linux-3.0.4/arch/x86/include/asm/uaccess.h
+--- linux-3.0.4/arch/x86/include/asm/uaccess.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/uaccess.h 2011-08-23 21:47:55.000000000 -0400
 @@ -7,12 +7,15 @@
  #include <linux/compiler.h>
  #include <linux/thread_info.h>
@@ -9899,9 +9898,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/uaccess.h linux-3.0.3/arch/x86/inclu
  } while (0)
  
  #ifdef CONFIG_X86_WP_WORKS_OK
-diff -urNp linux-3.0.3/arch/x86/include/asm/vgtod.h linux-3.0.3/arch/x86/include/asm/vgtod.h
---- linux-3.0.3/arch/x86/include/asm/vgtod.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/vgtod.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/vgtod.h linux-3.0.4/arch/x86/include/asm/vgtod.h
+--- linux-3.0.4/arch/x86/include/asm/vgtod.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/vgtod.h   2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,7 @@ struct vsyscall_gtod_data {
        int             sysctl_enabled;
        struct timezone sys_tz;
@@ -9910,9 +9909,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/vgtod.h linux-3.0.3/arch/x86/include
                cycle_t (*vread)(void);
                cycle_t cycle_last;
                cycle_t mask;
-diff -urNp linux-3.0.3/arch/x86/include/asm/x86_init.h linux-3.0.3/arch/x86/include/asm/x86_init.h
---- linux-3.0.3/arch/x86/include/asm/x86_init.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/x86_init.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/x86_init.h linux-3.0.4/arch/x86/include/asm/x86_init.h
+--- linux-3.0.4/arch/x86/include/asm/x86_init.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/x86_init.h        2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,7 @@ struct x86_init_mpparse {
        void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name);
        void (*find_smp_config)(void);
@@ -10030,9 +10029,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/x86_init.h linux-3.0.3/arch/x86/incl
  
  extern struct x86_init_ops x86_init;
  extern struct x86_cpuinit_ops x86_cpuinit;
-diff -urNp linux-3.0.3/arch/x86/include/asm/xsave.h linux-3.0.3/arch/x86/include/asm/xsave.h
---- linux-3.0.3/arch/x86/include/asm/xsave.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/include/asm/xsave.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/include/asm/xsave.h linux-3.0.4/arch/x86/include/asm/xsave.h
+--- linux-3.0.4/arch/x86/include/asm/xsave.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/include/asm/xsave.h   2011-08-23 21:47:55.000000000 -0400
 @@ -65,6 +65,11 @@ static inline int xsave_user(struct xsav
  {
        int err;
@@ -10057,9 +10056,9 @@ diff -urNp linux-3.0.3/arch/x86/include/asm/xsave.h linux-3.0.3/arch/x86/include
        __asm__ __volatile__("1: .byte " REX_PREFIX "0x0f,0xae,0x2f\n"
                             "2:\n"
                             ".section .fixup,\"ax\"\n"
-diff -urNp linux-3.0.3/arch/x86/Kconfig linux-3.0.3/arch/x86/Kconfig
---- linux-3.0.3/arch/x86/Kconfig       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Kconfig       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Kconfig linux-3.0.4/arch/x86/Kconfig
+--- linux-3.0.4/arch/x86/Kconfig       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Kconfig       2011-08-23 21:48:14.000000000 -0400
 @@ -229,7 +229,7 @@ config X86_HT
  
  config X86_32_LAZY_GS
@@ -10141,9 +10140,9 @@ diff -urNp linux-3.0.3/arch/x86/Kconfig linux-3.0.3/arch/x86/Kconfig
        ---help---
          Map the 32-bit VDSO to the predictable old-style address too.
  
-diff -urNp linux-3.0.3/arch/x86/Kconfig.cpu linux-3.0.3/arch/x86/Kconfig.cpu
---- linux-3.0.3/arch/x86/Kconfig.cpu   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Kconfig.cpu   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Kconfig.cpu linux-3.0.4/arch/x86/Kconfig.cpu
+--- linux-3.0.4/arch/x86/Kconfig.cpu   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Kconfig.cpu   2011-08-23 21:47:55.000000000 -0400
 @@ -338,7 +338,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -10171,9 +10170,9 @@ diff -urNp linux-3.0.3/arch/x86/Kconfig.cpu linux-3.0.3/arch/x86/Kconfig.cpu
  
  config X86_MINIMUM_CPU_FAMILY
        int
-diff -urNp linux-3.0.3/arch/x86/Kconfig.debug linux-3.0.3/arch/x86/Kconfig.debug
---- linux-3.0.3/arch/x86/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Kconfig.debug 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Kconfig.debug linux-3.0.4/arch/x86/Kconfig.debug
+--- linux-3.0.4/arch/x86/Kconfig.debug 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Kconfig.debug 2011-08-23 21:47:55.000000000 -0400
 @@ -81,7 +81,7 @@ config X86_PTDUMP
  config DEBUG_RODATA
        bool "Write protect kernel read-only data structures"
@@ -10192,9 +10191,9 @@ diff -urNp linux-3.0.3/arch/x86/Kconfig.debug linux-3.0.3/arch/x86/Kconfig.debug
        ---help---
          This option helps catch unintended modifications to loadable
          kernel module's text and read-only data. It also prevents execution
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile
---- linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile
+--- linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/realmode/Makefile 2011-08-23 21:47:55.000000000 -0400
 @@ -41,6 +41,9 @@ KBUILD_CFLAGS        := $(LINUXINCLUDE) -g -Os 
                   $(call cc-option, -fno-stack-protector) \
                   $(call cc-option, -mpreferred-stack-boundary=2)
@@ -10205,9 +10204,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/Makefile linux-3.0.3/arch/x
  KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__
  GCOV_PROFILE := n
  
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S
---- linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S
+--- linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/realmode/wakeup.S 2011-08-23 21:48:14.000000000 -0400
 @@ -108,6 +108,9 @@ wakeup_code:
        /* Do any other stuff... */
  
@@ -10226,9 +10225,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/realmode/wakeup.S linux-3.0.3/arch/x
  #else
        pushw   $0
        pushw   trampoline_segment
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/sleep.c linux-3.0.3/arch/x86/kernel/acpi/sleep.c
---- linux-3.0.3/arch/x86/kernel/acpi/sleep.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/sleep.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/sleep.c linux-3.0.4/arch/x86/kernel/acpi/sleep.c
+--- linux-3.0.4/arch/x86/kernel/acpi/sleep.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/sleep.c   2011-08-23 21:47:55.000000000 -0400
 @@ -94,8 +94,12 @@ int acpi_suspend_lowlevel(void)
        header->trampoline_segment = trampoline_address() >> 4;
  #ifdef CONFIG_SMP
@@ -10242,9 +10241,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/sleep.c linux-3.0.3/arch/x86/kernel/
        initial_gs = per_cpu_offset(smp_processor_id());
  #endif
        initial_code = (unsigned long)wakeup_long64;
-diff -urNp linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S
---- linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S
+--- linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/acpi/wakeup_32.S       2011-08-23 21:47:55.000000000 -0400
 @@ -30,13 +30,11 @@ wakeup_pmode_return:
        # and restore the stack ... but you need gdt for this to work
        movl    saved_context_esp, %esp
@@ -10261,9 +10260,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/acpi/wakeup_32.S linux-3.0.3/arch/x86/ker
  
  bogus_magic:
        jmp     bogus_magic
-diff -urNp linux-3.0.3/arch/x86/kernel/alternative.c linux-3.0.3/arch/x86/kernel/alternative.c
---- linux-3.0.3/arch/x86/kernel/alternative.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/alternative.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/alternative.c linux-3.0.4/arch/x86/kernel/alternative.c
+--- linux-3.0.4/arch/x86/kernel/alternative.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/alternative.c  2011-08-23 21:47:55.000000000 -0400
 @@ -313,7 +313,7 @@ static void alternatives_smp_lock(const 
                if (!*poff || ptr < text || ptr >= text_end)
                        continue;
@@ -10365,9 +10364,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/alternative.c linux-3.0.3/arch/x86/kernel
        return addr;
  }
  
-diff -urNp linux-3.0.3/arch/x86/kernel/apic/apic.c linux-3.0.3/arch/x86/kernel/apic/apic.c
---- linux-3.0.3/arch/x86/kernel/apic/apic.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/apic/apic.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/apic/apic.c linux-3.0.4/arch/x86/kernel/apic/apic.c
+--- linux-3.0.4/arch/x86/kernel/apic/apic.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/apic/apic.c    2011-08-23 21:48:14.000000000 -0400
 @@ -173,7 +173,7 @@ int first_system_vector = 0xfe;
  /*
   * Debug level, exported for io_apic.c
@@ -10395,9 +10394,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/apic/apic.c linux-3.0.3/arch/x86/kernel/a
        bios_cpu_apicid = early_per_cpu_ptr(x86_bios_cpu_apicid);
        bitmap_zero(clustermap, NUM_APIC_CLUSTERS);
  
-diff -urNp linux-3.0.3/arch/x86/kernel/apic/io_apic.c linux-3.0.3/arch/x86/kernel/apic/io_apic.c
---- linux-3.0.3/arch/x86/kernel/apic/io_apic.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/apic/io_apic.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/apic/io_apic.c linux-3.0.4/arch/x86/kernel/apic/io_apic.c
+--- linux-3.0.4/arch/x86/kernel/apic/io_apic.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/apic/io_apic.c 2011-08-23 21:47:55.000000000 -0400
 @@ -1028,7 +1028,7 @@ int IO_APIC_get_PCI_irq_vector(int bus, 
  }
  EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
@@ -10434,9 +10433,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/apic/io_apic.c linux-3.0.3/arch/x86/kerne
  
                eoi_ioapic_irq(irq, cfg);
        }
-diff -urNp linux-3.0.3/arch/x86/kernel/apm_32.c linux-3.0.3/arch/x86/kernel/apm_32.c
---- linux-3.0.3/arch/x86/kernel/apm_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/apm_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/apm_32.c linux-3.0.4/arch/x86/kernel/apm_32.c
+--- linux-3.0.4/arch/x86/kernel/apm_32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/apm_32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -413,7 +413,7 @@ static DEFINE_MUTEX(apm_mutex);
   * This is for buggy BIOS's that refer to (real mode) segment 0x40
   * even though they are called in protected mode.
@@ -10508,9 +10507,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/apm_32.c linux-3.0.3/arch/x86/kernel/apm_
  
        proc_create("apm", 0, NULL, &apm_file_ops);
  
-diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets_64.c linux-3.0.3/arch/x86/kernel/asm-offsets_64.c
---- linux-3.0.3/arch/x86/kernel/asm-offsets_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/asm-offsets_64.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets_64.c linux-3.0.4/arch/x86/kernel/asm-offsets_64.c
+--- linux-3.0.4/arch/x86/kernel/asm-offsets_64.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/asm-offsets_64.c       2011-08-23 21:47:55.000000000 -0400
 @@ -69,6 +69,7 @@ int main(void)
        BLANK();
  #undef ENTRY
@@ -10519,9 +10518,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets_64.c linux-3.0.3/arch/x86/ker
        OFFSET(TSS_ist, tss_struct, x86_tss.ist);
        BLANK();
  
-diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets.c linux-3.0.3/arch/x86/kernel/asm-offsets.c
---- linux-3.0.3/arch/x86/kernel/asm-offsets.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/asm-offsets.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/asm-offsets.c linux-3.0.4/arch/x86/kernel/asm-offsets.c
+--- linux-3.0.4/arch/x86/kernel/asm-offsets.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/asm-offsets.c  2011-08-23 21:47:55.000000000 -0400
 @@ -33,6 +33,8 @@ void common(void) {
        OFFSET(TI_status, thread_info, status);
        OFFSET(TI_addr_limit, thread_info, addr_limit);
@@ -10558,9 +10557,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/asm-offsets.c linux-3.0.3/arch/x86/kernel
  #ifdef CONFIG_XEN
        BLANK();
        OFFSET(XEN_vcpu_info_mask, vcpu_info, evtchn_upcall_mask);
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/amd.c linux-3.0.3/arch/x86/kernel/cpu/amd.c
---- linux-3.0.3/arch/x86/kernel/cpu/amd.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/amd.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/amd.c linux-3.0.4/arch/x86/kernel/cpu/amd.c
+--- linux-3.0.4/arch/x86/kernel/cpu/amd.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/amd.c      2011-08-23 21:47:55.000000000 -0400
 @@ -647,7 +647,7 @@ static unsigned int __cpuinit amd_size_c
                                                        unsigned int size)
  {
@@ -10570,9 +10569,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/amd.c linux-3.0.3/arch/x86/kernel/cpu
                /* Duron Rev A0 */
                if (c->x86_model == 3 && c->x86_mask == 0)
                        size = 64;
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/common.c linux-3.0.3/arch/x86/kernel/cpu/common.c
---- linux-3.0.3/arch/x86/kernel/cpu/common.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/common.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/common.c linux-3.0.4/arch/x86/kernel/cpu/common.c
+--- linux-3.0.4/arch/x86/kernel/cpu/common.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/common.c   2011-08-23 21:47:55.000000000 -0400
 @@ -83,60 +83,6 @@ static const struct cpu_dev __cpuinitcon
  
  static const struct cpu_dev *this_cpu __cpuinitdata = &default_cpu;
@@ -10717,9 +10716,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/common.c linux-3.0.3/arch/x86/kernel/
        struct thread_struct *thread = &curr->thread;
  
        if (cpumask_test_and_set_cpu(cpu, cpu_initialized_mask)) {
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/intel.c linux-3.0.3/arch/x86/kernel/cpu/intel.c
---- linux-3.0.3/arch/x86/kernel/cpu/intel.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/intel.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/intel.c linux-3.0.4/arch/x86/kernel/cpu/intel.c
+--- linux-3.0.4/arch/x86/kernel/cpu/intel.c    2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/intel.c    2011-08-29 23:30:14.000000000 -0400
 @@ -172,7 +172,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.
@@ -10729,9 +10728,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/intel.c linux-3.0.3/arch/x86/kernel/c
        load_idt(&idt_descr);
  }
  #endif
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/Makefile linux-3.0.3/arch/x86/kernel/cpu/Makefile
---- linux-3.0.3/arch/x86/kernel/cpu/Makefile   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/Makefile   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/Makefile linux-3.0.4/arch/x86/kernel/cpu/Makefile
+--- linux-3.0.4/arch/x86/kernel/cpu/Makefile   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/Makefile   2011-08-23 21:47:55.000000000 -0400
 @@ -8,10 +8,6 @@ CFLAGS_REMOVE_common.o = -pg
  CFLAGS_REMOVE_perf_event.o = -pg
  endif
@@ -10743,9 +10742,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/Makefile linux-3.0.3/arch/x86/kernel/
  obj-y                 := intel_cacheinfo.o scattered.o topology.o
  obj-y                 += proc.o capflags.o powerflags.o common.o
  obj-y                 += vmware.o hypervisor.o sched.o mshyperv.o
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c
---- linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c
+--- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce.c       2011-08-23 21:47:55.000000000 -0400
 @@ -46,6 +46,7 @@
  #include <asm/ipi.h>
  #include <asm/mce.h>
@@ -10847,9 +10846,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce.c linux-3.0.3/arch/x86/ker
        atomic_set(&mce_executing, 0);
        atomic_set(&mce_callin, 0);
        atomic_set(&global_nwo, 0);
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c
---- linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c
+--- linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mcheck/mce-inject.c        2011-08-23 21:47:55.000000000 -0400
 @@ -215,7 +215,9 @@ static int inject_init(void)
        if (!alloc_cpumask_var(&mce_inject_cpumask, GFP_KERNEL))
                return -ENOMEM;
@@ -10861,9 +10860,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mcheck/mce-inject.c linux-3.0.3/arch/
        register_die_notifier(&mce_raise_nb);
        return 0;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c
---- linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c
+--- linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c        2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/main.c        2011-08-29 23:26:21.000000000 -0400
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(mtrr_mutex);
  u64 size_or_mask, size_and_mask;
  static bool mtrr_aps_delayed_init;
@@ -10873,23 +10872,21 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/main.c linux-3.0.3/arch/x86/kern
  
  const struct mtrr_ops *mtrr_if;
  
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h
---- linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-08-23 21:47:55.000000000 -0400
-@@ -12,8 +12,8 @@
- extern unsigned int mtrr_usage_table[MTRR_MAX_VAR_RANGES];
- 
- struct mtrr_ops {
--      u32     vendor;
--      u32     use_intel_if;
-+      const u32       vendor;
-+      const u32       use_intel_if;
-       void    (*set)(unsigned int reg, unsigned long base,
-                      unsigned long size, mtrr_type type);
-       void    (*set_all)(void);
-diff -urNp linux-3.0.3/arch/x86/kernel/cpu/perf_event.c linux-3.0.3/arch/x86/kernel/cpu/perf_event.c
---- linux-3.0.3/arch/x86/kernel/cpu/perf_event.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/cpu/perf_event.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h
+--- linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/mtrr/mtrr.h        2011-08-26 19:49:56.000000000 -0400
+@@ -25,7 +25,7 @@ struct mtrr_ops {
+       int     (*validate_add_page)(unsigned long base, unsigned long size,
+                                    unsigned int type);
+       int     (*have_wrcomb)(void);
+-};
++} __do_const;
+ 
+ extern int generic_get_free_region(unsigned long base, unsigned long size,
+                                  int replace_reg);
+diff -urNp linux-3.0.4/arch/x86/kernel/cpu/perf_event.c linux-3.0.4/arch/x86/kernel/cpu/perf_event.c
+--- linux-3.0.4/arch/x86/kernel/cpu/perf_event.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/cpu/perf_event.c       2011-08-23 21:48:14.000000000 -0400
 @@ -781,6 +781,8 @@ static int x86_schedule_events(struct cp
        int i, j, w, wmax, num = 0;
        struct hw_perf_event *hwc;
@@ -10908,9 +10905,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/cpu/perf_event.c linux-3.0.3/arch/x86/ker
        }
  }
  
-diff -urNp linux-3.0.3/arch/x86/kernel/crash.c linux-3.0.3/arch/x86/kernel/crash.c
---- linux-3.0.3/arch/x86/kernel/crash.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/crash.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/crash.c linux-3.0.4/arch/x86/kernel/crash.c
+--- linux-3.0.4/arch/x86/kernel/crash.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/crash.c        2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@ static void kdump_nmi_callback(int cpu, 
        regs = args->regs;
  
@@ -10920,9 +10917,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/crash.c linux-3.0.3/arch/x86/kernel/crash
                crash_fixup_ss_esp(&fixed_regs, regs);
                regs = &fixed_regs;
        }
-diff -urNp linux-3.0.3/arch/x86/kernel/doublefault_32.c linux-3.0.3/arch/x86/kernel/doublefault_32.c
---- linux-3.0.3/arch/x86/kernel/doublefault_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/doublefault_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/doublefault_32.c linux-3.0.4/arch/x86/kernel/doublefault_32.c
+--- linux-3.0.4/arch/x86/kernel/doublefault_32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/doublefault_32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -11,7 +11,7 @@
  
  #define DOUBLEFAULT_STACKSIZE (1024)
@@ -10954,9 +10951,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/doublefault_32.c linux-3.0.3/arch/x86/ker
                .fs             = __KERNEL_PERCPU,
  
                .__cr3          = __pa_nodebug(swapper_pg_dir),
-diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_32.c linux-3.0.3/arch/x86/kernel/dumpstack_32.c
---- linux-3.0.3/arch/x86/kernel/dumpstack_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/dumpstack_32.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_32.c linux-3.0.4/arch/x86/kernel/dumpstack_32.c
+--- linux-3.0.4/arch/x86/kernel/dumpstack_32.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/dumpstack_32.c 2011-08-23 21:47:55.000000000 -0400
 @@ -38,15 +38,13 @@ void dump_trace(struct task_struct *task
                bp = stack_frame(task, regs);
  
@@ -11020,9 +11017,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_32.c linux-3.0.3/arch/x86/kerne
        if (ip < PAGE_OFFSET)
                return 0;
        if (probe_kernel_address((unsigned short *)ip, ud2))
-diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_64.c linux-3.0.3/arch/x86/kernel/dumpstack_64.c
---- linux-3.0.3/arch/x86/kernel/dumpstack_64.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/dumpstack_64.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack_64.c linux-3.0.4/arch/x86/kernel/dumpstack_64.c
+--- linux-3.0.4/arch/x86/kernel/dumpstack_64.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/dumpstack_64.c 2011-08-23 21:47:55.000000000 -0400
 @@ -147,9 +147,9 @@ void dump_trace(struct task_struct *task
        unsigned long *irq_stack_end =
                (unsigned long *)per_cpu(irq_stack_ptr, cpu);
@@ -11074,9 +11071,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack_64.c linux-3.0.3/arch/x86/kerne
        put_cpu();
  }
  EXPORT_SYMBOL(dump_trace);
-diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack.c linux-3.0.3/arch/x86/kernel/dumpstack.c
---- linux-3.0.3/arch/x86/kernel/dumpstack.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/dumpstack.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/dumpstack.c linux-3.0.4/arch/x86/kernel/dumpstack.c
+--- linux-3.0.4/arch/x86/kernel/dumpstack.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/dumpstack.c    2011-08-23 21:48:14.000000000 -0400
 @@ -2,6 +2,9 @@
   *  Copyright (C) 1991, 1992  Linus Torvalds
   *  Copyright (C) 2000, 2001, 2002 Andi Kleen, SuSE Labs
@@ -11220,9 +11217,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/dumpstack.c linux-3.0.3/arch/x86/kernel/d
                report_bug(regs->ip, regs);
  
        if (__die(str, regs, err))
-diff -urNp linux-3.0.3/arch/x86/kernel/early_printk.c linux-3.0.3/arch/x86/kernel/early_printk.c
---- linux-3.0.3/arch/x86/kernel/early_printk.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/early_printk.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/early_printk.c linux-3.0.4/arch/x86/kernel/early_printk.c
+--- linux-3.0.4/arch/x86/kernel/early_printk.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/early_printk.c 2011-08-23 21:48:14.000000000 -0400
 @@ -7,6 +7,7 @@
  #include <linux/pci_regs.h>
  #include <linux/pci_ids.h>
@@ -11240,9 +11237,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/early_printk.c linux-3.0.3/arch/x86/kerne
        va_start(ap, fmt);
        n = vscnprintf(buf, sizeof(buf), fmt, ap);
        early_console->write(early_console, buf, n);
-diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/entry_32.S
---- linux-3.0.3/arch/x86/kernel/entry_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/entry_32.S     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/entry_32.S linux-3.0.4/arch/x86/kernel/entry_32.S
+--- linux-3.0.4/arch/x86/kernel/entry_32.S     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/entry_32.S     2011-08-23 21:48:14.000000000 -0400
 @@ -185,13 +185,146 @@
        /*CFI_REL_OFFSET gs, PT_GS*/
  .endm
@@ -11738,9 +11735,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_32.S linux-3.0.3/arch/x86/kernel/en
        RESTORE_REGS
        lss 12+4(%esp), %esp            # back to espfix stack
        CFI_ADJUST_CFA_OFFSET -24
-diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/entry_64.S
---- linux-3.0.3/arch/x86/kernel/entry_64.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/entry_64.S     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/entry_64.S linux-3.0.4/arch/x86/kernel/entry_64.S
+--- linux-3.0.4/arch/x86/kernel/entry_64.S     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/entry_64.S     2011-08-26 19:49:56.000000000 -0400
 @@ -53,6 +53,7 @@
  #include <asm/paravirt.h>
  #include <asm/ftrace.h>
@@ -11749,7 +11746,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
  
  /* Avoid __ASSEMBLER__'ifying <linux/audit.h> just for this.  */
  #include <linux/elf-em.h>
-@@ -176,6 +177,259 @@ ENTRY(native_usergs_sysret64)
+@@ -176,6 +177,264 @@ ENTRY(native_usergs_sysret64)
  ENDPROC(native_usergs_sysret64)
  #endif /* CONFIG_PARAVIRT */
  
@@ -11846,9 +11843,6 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
 +      call pax_randomize_kstack
 +      pop %rax
 +#endif
-+#ifdef CONFIG_PAX_MEMORY_STACKLEAK
-+      call pax_erase_kstack
-+#endif
 +      .endm
 +
 +#ifdef CONFIG_PAX_MEMORY_UDEREF
@@ -11971,6 +11965,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
 +ENTRY(pax_erase_kstack)
 +      pushq %rdi
 +      pushq %rax
++      pushq %r10
 +
 +      GET_THREAD_INFO(%r10)
 +      mov TI_lowest_stack(%r10), %rdi
@@ -11994,6 +11989,12 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
 +2:    cld
 +      mov %esp, %ecx
 +      sub %edi, %ecx
++
++      cmp $THREAD_SIZE_asm, %rcx
++      jb 3f
++      ud2
++3:
++
 +      shr $3, %ecx
 +      rep stosq
 +
@@ -12001,6 +12002,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
 +      sub $256, %rdi
 +      mov %rdi, TI_lowest_stack(%r10)
 +
++      popq %r10
 +      popq %rax
 +      popq %rdi
 +      ret
@@ -12009,7 +12011,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
  
  .macro TRACE_IRQS_IRETQ offset=ARGOFFSET
  #ifdef CONFIG_TRACE_IRQFLAGS
-@@ -318,7 +572,7 @@ ENTRY(save_args)
+@@ -318,7 +577,7 @@ ENTRY(save_args)
        leaq -RBP+8(%rsp),%rdi  /* arg1 for handler */
        movq_cfi rbp, 8         /* push %rbp */
        leaq 8(%rsp), %rbp              /* mov %rsp, %ebp */
@@ -12018,7 +12020,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        je 1f
        SWAPGS
        /*
-@@ -409,7 +663,7 @@ ENTRY(ret_from_fork)
+@@ -409,7 +668,7 @@ ENTRY(ret_from_fork)
  
        RESTORE_REST
  
@@ -12027,7 +12029,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        je   int_ret_from_sys_call
  
        testl $_TIF_IA32, TI_flags(%rcx)        # 32-bit compat task needs IRET
-@@ -455,7 +709,7 @@ END(ret_from_fork)
+@@ -455,7 +714,7 @@ END(ret_from_fork)
  ENTRY(system_call)
        CFI_STARTPROC   simple
        CFI_SIGNAL_FRAME
@@ -12036,7 +12038,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        CFI_REGISTER    rip,rcx
        /*CFI_REGISTER  rflags,r11*/
        SWAPGS_UNSAFE_STACK
-@@ -468,12 +722,13 @@ ENTRY(system_call_after_swapgs)
+@@ -468,12 +727,13 @@ ENTRY(system_call_after_swapgs)
  
        movq    %rsp,PER_CPU_VAR(old_rsp)
        movq    PER_CPU_VAR(kernel_stack),%rsp
@@ -12051,15 +12053,16 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        movq  %rax,ORIG_RAX-ARGOFFSET(%rsp)
        movq  %rcx,RIP-ARGOFFSET(%rsp)
        CFI_REL_OFFSET rip,RIP-ARGOFFSET
-@@ -502,6 +757,7 @@ sysret_check:
+@@ -502,6 +762,8 @@ sysret_check:
        andl %edi,%edx
        jnz  sysret_careful
        CFI_REMEMBER_STATE
 +      pax_exit_kernel_user
++      pax_erase_kstack
        /*
         * sysretq will re-enable interrupts:
         */
-@@ -560,6 +816,9 @@ auditsys:
+@@ -560,6 +822,9 @@ auditsys:
        movq %rax,%rsi                  /* 2nd arg: syscall number */
        movl $AUDIT_ARCH_X86_64,%edi    /* 1st arg: audit arch */
        call audit_syscall_entry
@@ -12069,7 +12072,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        LOAD_ARGS 0             /* reload call-clobbered registers */
        jmp system_call_fastpath
  
-@@ -590,6 +849,9 @@ tracesys:
+@@ -590,6 +855,9 @@ tracesys:
        FIXUP_TOP_OF_STACK %rdi
        movq %rsp,%rdi
        call syscall_trace_enter
@@ -12079,7 +12082,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        /*
         * Reload arg registers from stack in case ptrace changed them.
         * We don't reload %rax because syscall_trace_enter() returned
-@@ -611,7 +873,7 @@ tracesys:
+@@ -611,7 +879,7 @@ tracesys:
  GLOBAL(int_ret_from_sys_call)
        DISABLE_INTERRUPTS(CLBR_NONE)
        TRACE_IRQS_OFF
@@ -12088,7 +12091,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        je retint_restore_args
        movl $_TIF_ALLWORK_MASK,%edi
        /* edi: mask to check */
-@@ -793,6 +1055,16 @@ END(interrupt)
+@@ -793,6 +1061,16 @@ END(interrupt)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-RBP
        call save_args
        PARTIAL_FRAME 0
@@ -12105,7 +12108,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        call \func
        .endm
  
-@@ -825,7 +1097,7 @@ ret_from_intr:
+@@ -825,7 +1103,7 @@ ret_from_intr:
        CFI_ADJUST_CFA_OFFSET   -8
  exit_intr:
        GET_THREAD_INFO(%rcx)
@@ -12114,11 +12117,12 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        je retint_kernel
  
        /* Interrupt came from user space */
-@@ -847,12 +1119,14 @@ retint_swapgs:          /* return to user-space 
+@@ -847,12 +1125,15 @@ retint_swapgs:          /* return to user-space 
         * The iretq could re-enable interrupts:
         */
        DISABLE_INTERRUPTS(CLBR_ANY)
 +      pax_exit_kernel_user
++      pax_erase_kstack
        TRACE_IRQS_IRETQ
        SWAPGS
        jmp restore_args
@@ -12129,7 +12133,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        /*
         * The iretq could re-enable interrupts:
         */
-@@ -1027,6 +1301,16 @@ ENTRY(\sym)
+@@ -1027,6 +1308,16 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call error_entry
        DEFAULT_FRAME 0
@@ -12146,7 +12150,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1044,6 +1328,16 @@ ENTRY(\sym)
+@@ -1044,6 +1335,16 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        TRACE_IRQS_OFF
@@ -12163,7 +12167,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        movq %rsp,%rdi          /* pt_regs pointer */
        xorl %esi,%esi          /* no error code */
        call \do_sym
-@@ -1052,7 +1346,7 @@ ENTRY(\sym)
+@@ -1052,7 +1353,7 @@ ENTRY(\sym)
  END(\sym)
  .endm
  
@@ -12172,7 +12176,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
  .macro paranoidzeroentry_ist sym do_sym ist
  ENTRY(\sym)
        INTR_FRAME
-@@ -1062,8 +1356,24 @@ ENTRY(\sym)
+@@ -1062,8 +1363,24 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        TRACE_IRQS_OFF
@@ -12197,7 +12201,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        subq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
        call \do_sym
        addq $EXCEPTION_STKSZ, INIT_TSS_IST(\ist)
-@@ -1080,6 +1390,16 @@ ENTRY(\sym)
+@@ -1080,6 +1397,16 @@ ENTRY(\sym)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call error_entry
        DEFAULT_FRAME 0
@@ -12214,7 +12218,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1099,6 +1419,16 @@ ENTRY(\sym)
+@@ -1099,6 +1426,16 @@ ENTRY(\sym)
        call save_paranoid
        DEFAULT_FRAME 0
        TRACE_IRQS_OFF
@@ -12231,7 +12235,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        movq %rsp,%rdi                  /* pt_regs pointer */
        movq ORIG_RAX(%rsp),%rsi        /* get error code */
        movq $-1,ORIG_RAX(%rsp)         /* no syscall to restart */
-@@ -1361,14 +1691,27 @@ ENTRY(paranoid_exit)
+@@ -1361,14 +1698,27 @@ ENTRY(paranoid_exit)
        TRACE_IRQS_OFF
        testl %ebx,%ebx                         /* swapgs needed? */
        jnz paranoid_restore
@@ -12260,7 +12264,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        TRACE_IRQS_IRETQ 0
        RESTORE_ALL 8
        jmp irq_return
-@@ -1426,7 +1769,7 @@ ENTRY(error_entry)
+@@ -1426,7 +1776,7 @@ ENTRY(error_entry)
        movq_cfi r14, R14+8
        movq_cfi r15, R15+8
        xorl %ebx,%ebx
@@ -12269,7 +12273,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        je error_kernelspace
  error_swapgs:
        SWAPGS
-@@ -1490,6 +1833,16 @@ ENTRY(nmi)
+@@ -1490,6 +1840,16 @@ ENTRY(nmi)
        CFI_ADJUST_CFA_OFFSET ORIG_RAX-R15
        call save_paranoid
        DEFAULT_FRAME 0
@@ -12286,7 +12290,7 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */
        movq %rsp,%rdi
        movq $-1,%rsi
-@@ -1500,11 +1853,25 @@ ENTRY(nmi)
+@@ -1500,11 +1860,25 @@ ENTRY(nmi)
        DISABLE_INTERRUPTS(CLBR_NONE)
        testl %ebx,%ebx                         /* swapgs needed? */
        jnz nmi_restore
@@ -12313,9 +12317,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/entry_64.S linux-3.0.3/arch/x86/kernel/en
        RESTORE_ALL 8
        jmp irq_return
  nmi_userspace:
-diff -urNp linux-3.0.3/arch/x86/kernel/ftrace.c linux-3.0.3/arch/x86/kernel/ftrace.c
---- linux-3.0.3/arch/x86/kernel/ftrace.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ftrace.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ftrace.c linux-3.0.4/arch/x86/kernel/ftrace.c
+--- linux-3.0.4/arch/x86/kernel/ftrace.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ftrace.c       2011-08-23 21:47:55.000000000 -0400
 @@ -126,7 +126,7 @@ static void *mod_code_ip;          /* holds the 
  static const void *mod_code_newcode;  /* holds the text to write to the IP */
  
@@ -12373,9 +12377,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ftrace.c linux-3.0.3/arch/x86/kernel/ftra
        if (probe_kernel_read(code, (void *)ip, MCOUNT_INSN_SIZE))
                return -EFAULT;
  
-diff -urNp linux-3.0.3/arch/x86/kernel/head32.c linux-3.0.3/arch/x86/kernel/head32.c
---- linux-3.0.3/arch/x86/kernel/head32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/head32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/head32.c linux-3.0.4/arch/x86/kernel/head32.c
+--- linux-3.0.4/arch/x86/kernel/head32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/head32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/io_apic.h>
  #include <asm/bios_ebda.h>
@@ -12393,9 +12397,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/head32.c linux-3.0.3/arch/x86/kernel/head
  
  #ifdef CONFIG_BLK_DEV_INITRD
        /* Reserve INITRD */
-diff -urNp linux-3.0.3/arch/x86/kernel/head_32.S linux-3.0.3/arch/x86/kernel/head_32.S
---- linux-3.0.3/arch/x86/kernel/head_32.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/head_32.S      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/head_32.S linux-3.0.4/arch/x86/kernel/head_32.S
+--- linux-3.0.4/arch/x86/kernel/head_32.S      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/head_32.S      2011-08-23 21:47:55.000000000 -0400
 @@ -25,6 +25,12 @@
  /* Physical address */
  #define pa(X) ((X) - __PAGE_OFFSET)
@@ -12830,9 +12834,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/head_32.S linux-3.0.3/arch/x86/kernel/hea
 +      /* Be sure this is zeroed to avoid false validations in Xen */
 +      .fill PAGE_SIZE_asm - GDT_SIZE,1,0
 +      .endr
-diff -urNp linux-3.0.3/arch/x86/kernel/head_64.S linux-3.0.3/arch/x86/kernel/head_64.S
---- linux-3.0.3/arch/x86/kernel/head_64.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/head_64.S      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/head_64.S linux-3.0.4/arch/x86/kernel/head_64.S
+--- linux-3.0.4/arch/x86/kernel/head_64.S      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/head_64.S      2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <asm/cache.h>
  #include <asm/processor-flags.h>
@@ -13102,9 +13106,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/head_64.S linux-3.0.3/arch/x86/kernel/hea
  
        __PAGE_ALIGNED_BSS
        .align PAGE_SIZE
-diff -urNp linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c
---- linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c
+--- linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/i386_ksyms_32.c        2011-08-23 21:47:55.000000000 -0400
 @@ -20,8 +20,12 @@ extern void cmpxchg8b_emu(void);
  EXPORT_SYMBOL(cmpxchg8b_emu);
  #endif
@@ -13126,9 +13130,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/i386_ksyms_32.c linux-3.0.3/arch/x86/kern
 +#ifdef CONFIG_PAX_KERNEXEC
 +EXPORT_SYMBOL(__LOAD_PHYSICAL_ADDR);
 +#endif
-diff -urNp linux-3.0.3/arch/x86/kernel/i8259.c linux-3.0.3/arch/x86/kernel/i8259.c
---- linux-3.0.3/arch/x86/kernel/i8259.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/i8259.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/i8259.c linux-3.0.4/arch/x86/kernel/i8259.c
+--- linux-3.0.4/arch/x86/kernel/i8259.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/i8259.c        2011-08-23 21:47:55.000000000 -0400
 @@ -210,7 +210,7 @@ spurious_8259A_irq:
                               "spurious 8259A interrupt: IRQ%d.\n", irq);
                        spurious_irq_mask |= irqmask;
@@ -13138,9 +13142,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/i8259.c linux-3.0.3/arch/x86/kernel/i8259
                /*
                 * Theoretically we do not have to handle this IRQ,
                 * but in Linux this does not cause problems and is
-diff -urNp linux-3.0.3/arch/x86/kernel/init_task.c linux-3.0.3/arch/x86/kernel/init_task.c
---- linux-3.0.3/arch/x86/kernel/init_task.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/init_task.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/init_task.c linux-3.0.4/arch/x86/kernel/init_task.c
+--- linux-3.0.4/arch/x86/kernel/init_task.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/init_task.c    2011-08-23 21:47:55.000000000 -0400
 @@ -20,8 +20,7 @@ static struct sighand_struct init_sighan
   * way process stacks are handled. This is done by having a special
   * "init_task" linker map entry..
@@ -13159,9 +13163,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/init_task.c linux-3.0.3/arch/x86/kernel/i
 -
 +struct tss_struct init_tss[NR_CPUS] ____cacheline_internodealigned_in_smp = { [0 ... NR_CPUS-1] = INIT_TSS };
 +EXPORT_SYMBOL(init_tss);
-diff -urNp linux-3.0.3/arch/x86/kernel/ioport.c linux-3.0.3/arch/x86/kernel/ioport.c
---- linux-3.0.3/arch/x86/kernel/ioport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ioport.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ioport.c linux-3.0.4/arch/x86/kernel/ioport.c
+--- linux-3.0.4/arch/x86/kernel/ioport.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ioport.c       2011-08-23 21:48:14.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/sched.h>
  #include <linux/kernel.h>
@@ -13205,9 +13209,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ioport.c linux-3.0.3/arch/x86/kernel/iopo
                if (!capable(CAP_SYS_RAWIO))
                        return -EPERM;
        }
-diff -urNp linux-3.0.3/arch/x86/kernel/irq_32.c linux-3.0.3/arch/x86/kernel/irq_32.c
---- linux-3.0.3/arch/x86/kernel/irq_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/irq_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/irq_32.c linux-3.0.4/arch/x86/kernel/irq_32.c
+--- linux-3.0.4/arch/x86/kernel/irq_32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/irq_32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@ static int check_stack_overflow(void)
        __asm__ __volatile__("andl %%esp,%0" :
                             "=r" (sp) : "0" (THREAD_SIZE - 1));
@@ -13347,9 +13351,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/irq_32.c linux-3.0.3/arch/x86/kernel/irq_
                /*
                 * Shouldn't happen, we returned above if in_interrupt():
                 */
-diff -urNp linux-3.0.3/arch/x86/kernel/irq.c linux-3.0.3/arch/x86/kernel/irq.c
---- linux-3.0.3/arch/x86/kernel/irq.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/irq.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/irq.c linux-3.0.4/arch/x86/kernel/irq.c
+--- linux-3.0.4/arch/x86/kernel/irq.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/irq.c  2011-08-23 21:47:55.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <asm/mce.h>
  #include <asm/hw_irq.h>
@@ -13384,9 +13388,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/irq.c linux-3.0.3/arch/x86/kernel/irq.c
  #endif
        return sum;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/kgdb.c linux-3.0.3/arch/x86/kernel/kgdb.c
---- linux-3.0.3/arch/x86/kernel/kgdb.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/kgdb.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/kgdb.c linux-3.0.4/arch/x86/kernel/kgdb.c
+--- linux-3.0.4/arch/x86/kernel/kgdb.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/kgdb.c 2011-08-23 21:47:55.000000000 -0400
 @@ -124,11 +124,11 @@ char *dbg_get_reg(int regno, void *mem, 
  #ifdef CONFIG_X86_32
        switch (regno) {
@@ -13425,9 +13429,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/kgdb.c linux-3.0.3/arch/x86/kernel/kgdb.c
                        if (user_mode(regs))
                                return single_step_cont(regs, args);
                        break;
-diff -urNp linux-3.0.3/arch/x86/kernel/kprobes.c linux-3.0.3/arch/x86/kernel/kprobes.c
---- linux-3.0.3/arch/x86/kernel/kprobes.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/kprobes.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/kprobes.c linux-3.0.4/arch/x86/kernel/kprobes.c
+--- linux-3.0.4/arch/x86/kernel/kprobes.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/kprobes.c      2011-08-23 21:47:55.000000000 -0400
 @@ -115,8 +115,11 @@ static void __kprobes __synthesize_relat
        } __attribute__((packed)) *insn;
  
@@ -13561,9 +13565,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/kprobes.c linux-3.0.3/arch/x86/kernel/kpr
               RELATIVE_ADDR_SIZE);
  
        insn_buf[0] = RELATIVEJUMP_OPCODE;
-diff -urNp linux-3.0.3/arch/x86/kernel/kvm.c linux-3.0.3/arch/x86/kernel/kvm.c
---- linux-3.0.3/arch/x86/kernel/kvm.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/kvm.c  2011-08-24 18:10:12.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/kvm.c linux-3.0.4/arch/x86/kernel/kvm.c
+--- linux-3.0.4/arch/x86/kernel/kvm.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/kvm.c  2011-08-24 18:10:12.000000000 -0400
 @@ -426,6 +426,7 @@ static void __init paravirt_ops_setup(vo
                pv_mmu_ops.set_pud = kvm_set_pud;
  #if PAGETABLE_LEVELS == 4
@@ -13572,9 +13576,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/kvm.c linux-3.0.3/arch/x86/kernel/kvm.c
  #endif
  #endif
                pv_mmu_ops.flush_tlb_user = kvm_flush_tlb;
-diff -urNp linux-3.0.3/arch/x86/kernel/ldt.c linux-3.0.3/arch/x86/kernel/ldt.c
---- linux-3.0.3/arch/x86/kernel/ldt.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ldt.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ldt.c linux-3.0.4/arch/x86/kernel/ldt.c
+--- linux-3.0.4/arch/x86/kernel/ldt.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ldt.c  2011-08-23 21:47:55.000000000 -0400
 @@ -67,13 +67,13 @@ static int alloc_ldt(mm_context_t *pc, i
        if (reload) {
  #ifdef CONFIG_SMP
@@ -13639,9 +13643,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ldt.c linux-3.0.3/arch/x86/kernel/ldt.c
        fill_ldt(&ldt, &ldt_info);
        if (oldmode)
                ldt.avl = 0;
-diff -urNp linux-3.0.3/arch/x86/kernel/machine_kexec_32.c linux-3.0.3/arch/x86/kernel/machine_kexec_32.c
---- linux-3.0.3/arch/x86/kernel/machine_kexec_32.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/machine_kexec_32.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/machine_kexec_32.c linux-3.0.4/arch/x86/kernel/machine_kexec_32.c
+--- linux-3.0.4/arch/x86/kernel/machine_kexec_32.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/machine_kexec_32.c     2011-08-23 21:47:55.000000000 -0400
 @@ -27,7 +27,7 @@
  #include <asm/cacheflush.h>
  #include <asm/debugreg.h>
@@ -13669,9 +13673,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/machine_kexec_32.c linux-3.0.3/arch/x86/k
  
        relocate_kernel_ptr = control_page;
        page_list[PA_CONTROL_PAGE] = __pa(control_page);
-diff -urNp linux-3.0.3/arch/x86/kernel/microcode_intel.c linux-3.0.3/arch/x86/kernel/microcode_intel.c
---- linux-3.0.3/arch/x86/kernel/microcode_intel.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/microcode_intel.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/microcode_intel.c linux-3.0.4/arch/x86/kernel/microcode_intel.c
+--- linux-3.0.4/arch/x86/kernel/microcode_intel.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/microcode_intel.c      2011-08-23 21:47:55.000000000 -0400
 @@ -440,13 +440,13 @@ static enum ucode_state request_microcod
  
  static int get_ucode_user(void *to, const void *from, size_t n)
@@ -13688,9 +13692,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/microcode_intel.c linux-3.0.3/arch/x86/ke
  }
  
  static void microcode_fini_cpu(int cpu)
-diff -urNp linux-3.0.3/arch/x86/kernel/module.c linux-3.0.3/arch/x86/kernel/module.c
---- linux-3.0.3/arch/x86/kernel/module.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/module.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/module.c linux-3.0.4/arch/x86/kernel/module.c
+--- linux-3.0.4/arch/x86/kernel/module.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/module.c       2011-08-23 21:47:55.000000000 -0400
 @@ -36,21 +36,66 @@
  #define DEBUGP(fmt...)
  #endif
@@ -13829,9 +13833,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/module.c linux-3.0.3/arch/x86/kernel/modu
  #if 0
                        if ((s64)val != *(s32 *)loc)
                                goto overflow;
-diff -urNp linux-3.0.3/arch/x86/kernel/paravirt.c linux-3.0.3/arch/x86/kernel/paravirt.c
---- linux-3.0.3/arch/x86/kernel/paravirt.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/paravirt.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/paravirt.c linux-3.0.4/arch/x86/kernel/paravirt.c
+--- linux-3.0.4/arch/x86/kernel/paravirt.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/paravirt.c     2011-08-23 21:48:14.000000000 -0400
 @@ -53,6 +53,9 @@ u64 _paravirt_ident_64(u64 x)
  {
        return x;
@@ -13980,9 +13984,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/paravirt.c linux-3.0.3/arch/x86/kernel/pa
  };
  
  EXPORT_SYMBOL_GPL(pv_time_ops);
-diff -urNp linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c
---- linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c
+--- linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/paravirt-spinlocks.c   2011-08-23 21:47:55.000000000 -0400
 @@ -13,7 +13,7 @@ default_spin_lock_flags(arch_spinlock_t 
        arch_spin_lock(lock);
  }
@@ -13992,9 +13996,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/paravirt-spinlocks.c linux-3.0.3/arch/x86
  #ifdef CONFIG_SMP
        .spin_is_locked = __ticket_spin_is_locked,
        .spin_is_contended = __ticket_spin_is_contended,
-diff -urNp linux-3.0.3/arch/x86/kernel/pci-iommu_table.c linux-3.0.3/arch/x86/kernel/pci-iommu_table.c
---- linux-3.0.3/arch/x86/kernel/pci-iommu_table.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/pci-iommu_table.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/pci-iommu_table.c linux-3.0.4/arch/x86/kernel/pci-iommu_table.c
+--- linux-3.0.4/arch/x86/kernel/pci-iommu_table.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/pci-iommu_table.c      2011-08-23 21:48:14.000000000 -0400
 @@ -2,7 +2,7 @@
  #include <asm/iommu_table.h>
  #include <linux/string.h>
@@ -14013,9 +14017,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/pci-iommu_table.c linux-3.0.3/arch/x86/ke
        /* Simple cyclic dependency checker. */
        for (p = start; p < finish; p++) {
                q = find_dependents_of(start, finish, p);
-diff -urNp linux-3.0.3/arch/x86/kernel/process_32.c linux-3.0.3/arch/x86/kernel/process_32.c
---- linux-3.0.3/arch/x86/kernel/process_32.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/process_32.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/process_32.c linux-3.0.4/arch/x86/kernel/process_32.c
+--- linux-3.0.4/arch/x86/kernel/process_32.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/process_32.c   2011-08-23 21:47:55.000000000 -0400
 @@ -65,6 +65,7 @@ asmlinkage void ret_from_fork(void) __as
  unsigned long thread_saved_pc(struct task_struct *tsk)
  {
@@ -14102,9 +14106,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process_32.c linux-3.0.3/arch/x86/kernel/
        return 0;
  }
 -
-diff -urNp linux-3.0.3/arch/x86/kernel/process_64.c linux-3.0.3/arch/x86/kernel/process_64.c
---- linux-3.0.3/arch/x86/kernel/process_64.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/process_64.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/process_64.c linux-3.0.4/arch/x86/kernel/process_64.c
+--- linux-3.0.4/arch/x86/kernel/process_64.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/process_64.c   2011-08-23 21:47:55.000000000 -0400
 @@ -87,7 +87,7 @@ static void __exit_idle(void)
  void exit_idle(void)
  {
@@ -14169,9 +14173,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process_64.c linux-3.0.3/arch/x86/kernel/
                        return 0;
                ip = *(u64 *)(fp+8);
                if (!in_sched_functions(ip))
-diff -urNp linux-3.0.3/arch/x86/kernel/process.c linux-3.0.3/arch/x86/kernel/process.c
---- linux-3.0.3/arch/x86/kernel/process.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/process.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/process.c linux-3.0.4/arch/x86/kernel/process.c
+--- linux-3.0.4/arch/x86/kernel/process.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/process.c      2011-08-23 21:47:55.000000000 -0400
 @@ -48,16 +48,33 @@ void free_thread_xstate(struct task_stru
  
  void free_thread_info(struct thread_info *ti)
@@ -14306,9 +14310,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/process.c linux-3.0.3/arch/x86/kernel/pro
 +#endif
 +}
 +#endif
-diff -urNp linux-3.0.3/arch/x86/kernel/ptrace.c linux-3.0.3/arch/x86/kernel/ptrace.c
---- linux-3.0.3/arch/x86/kernel/ptrace.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/ptrace.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/ptrace.c linux-3.0.4/arch/x86/kernel/ptrace.c
+--- linux-3.0.4/arch/x86/kernel/ptrace.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/ptrace.c       2011-08-23 21:47:55.000000000 -0400
 @@ -821,7 +821,7 @@ long arch_ptrace(struct task_struct *chi
                 unsigned long addr, unsigned long data)
  {
@@ -14344,9 +14348,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/ptrace.c linux-3.0.3/arch/x86/kernel/ptra
  }
  
  void user_single_step_siginfo(struct task_struct *tsk,
-diff -urNp linux-3.0.3/arch/x86/kernel/pvclock.c linux-3.0.3/arch/x86/kernel/pvclock.c
---- linux-3.0.3/arch/x86/kernel/pvclock.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/pvclock.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/pvclock.c linux-3.0.4/arch/x86/kernel/pvclock.c
+--- linux-3.0.4/arch/x86/kernel/pvclock.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/pvclock.c      2011-08-23 21:47:55.000000000 -0400
 @@ -81,11 +81,11 @@ unsigned long pvclock_tsc_khz(struct pvc
        return pv_tsc_khz;
  }
@@ -14375,9 +14379,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/pvclock.c linux-3.0.3/arch/x86/kernel/pvc
        } while (unlikely(last != ret));
  
        return ret;
-diff -urNp linux-3.0.3/arch/x86/kernel/reboot.c linux-3.0.3/arch/x86/kernel/reboot.c
---- linux-3.0.3/arch/x86/kernel/reboot.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/reboot.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/reboot.c linux-3.0.4/arch/x86/kernel/reboot.c
+--- linux-3.0.4/arch/x86/kernel/reboot.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/reboot.c       2011-08-23 21:47:55.000000000 -0400
 @@ -35,7 +35,7 @@ void (*pm_power_off)(void);
  EXPORT_SYMBOL(pm_power_off);
  
@@ -14509,9 +14513,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/reboot.c linux-3.0.3/arch/x86/kernel/rebo
  }
  
  struct machine_ops machine_ops = {
-diff -urNp linux-3.0.3/arch/x86/kernel/setup.c linux-3.0.3/arch/x86/kernel/setup.c
---- linux-3.0.3/arch/x86/kernel/setup.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/setup.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/setup.c linux-3.0.4/arch/x86/kernel/setup.c
+--- linux-3.0.4/arch/x86/kernel/setup.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/setup.c        2011-08-23 21:47:55.000000000 -0400
 @@ -650,7 +650,7 @@ static void __init trim_bios_range(void)
         * area (640->1Mb) as ram even though it is not.
         * take them out.
@@ -14541,9 +14545,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/setup.c linux-3.0.3/arch/x86/kernel/setup
        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-3.0.3/arch/x86/kernel/setup_percpu.c linux-3.0.3/arch/x86/kernel/setup_percpu.c
---- linux-3.0.3/arch/x86/kernel/setup_percpu.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/setup_percpu.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/setup_percpu.c linux-3.0.4/arch/x86/kernel/setup_percpu.c
+--- linux-3.0.4/arch/x86/kernel/setup_percpu.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/setup_percpu.c 2011-08-23 21:47:55.000000000 -0400
 @@ -21,19 +21,17 @@
  #include <asm/cpu.h>
  #include <asm/stackprotector.h>
@@ -14607,9 +14611,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/setup_percpu.c linux-3.0.3/arch/x86/kerne
                /*
                 * Up to this point, the boot CPU has been using .init.data
                 * area.  Reload any changed state for the boot CPU.
-diff -urNp linux-3.0.3/arch/x86/kernel/signal.c linux-3.0.3/arch/x86/kernel/signal.c
---- linux-3.0.3/arch/x86/kernel/signal.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/signal.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/signal.c linux-3.0.4/arch/x86/kernel/signal.c
+--- linux-3.0.4/arch/x86/kernel/signal.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/signal.c       2011-08-23 21:48:14.000000000 -0400
 @@ -198,7 +198,7 @@ static unsigned long align_sigframe(unsi
         * Align the stack pointer according to the i386 ABI,
         * i.e. so that on function entry ((sp + 4) & 15) == 0.
@@ -14693,9 +14697,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/signal.c linux-3.0.3/arch/x86/kernel/sign
                return;
  
        if (current_thread_info()->status & TS_RESTORE_SIGMASK)
-diff -urNp linux-3.0.3/arch/x86/kernel/smpboot.c linux-3.0.3/arch/x86/kernel/smpboot.c
---- linux-3.0.3/arch/x86/kernel/smpboot.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/smpboot.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/smpboot.c linux-3.0.4/arch/x86/kernel/smpboot.c
+--- linux-3.0.4/arch/x86/kernel/smpboot.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/smpboot.c      2011-08-23 21:47:55.000000000 -0400
 @@ -709,17 +709,20 @@ static int __cpuinit do_boot_cpu(int api
        set_idle_for_cpu(cpu, c_idle.idle);
  do_rest:
@@ -14733,9 +14737,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/smpboot.c linux-3.0.3/arch/x86/kernel/smp
        err = do_boot_cpu(apicid, cpu);
        if (err) {
                pr_debug("do_boot_cpu failed %d\n", err);
-diff -urNp linux-3.0.3/arch/x86/kernel/step.c linux-3.0.3/arch/x86/kernel/step.c
---- linux-3.0.3/arch/x86/kernel/step.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/step.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/step.c linux-3.0.4/arch/x86/kernel/step.c
+--- linux-3.0.4/arch/x86/kernel/step.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/step.c 2011-08-23 21:47:55.000000000 -0400
 @@ -27,10 +27,10 @@ unsigned long convert_ip_to_linear(struc
                struct desc_struct *desc;
                unsigned long base;
@@ -14778,17 +14782,17 @@ diff -urNp linux-3.0.3/arch/x86/kernel/step.c linux-3.0.3/arch/x86/kernel/step.c
                                /* 32-bit mode: register increment */
                                return 0;
                        /* 64-bit mode: REX prefix */
-diff -urNp linux-3.0.3/arch/x86/kernel/syscall_table_32.S linux-3.0.3/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.3/arch/x86/kernel/syscall_table_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/syscall_table_32.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/syscall_table_32.S linux-3.0.4/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.4/arch/x86/kernel/syscall_table_32.S     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/syscall_table_32.S     2011-08-23 21:47:55.000000000 -0400
 @@ -1,3 +1,4 @@
 +.section .rodata,"a",@progbits
  ENTRY(sys_call_table)
        .long sys_restart_syscall       /* 0 - old "setup()" system call, used for restarting */
        .long sys_exit
-diff -urNp linux-3.0.3/arch/x86/kernel/sys_i386_32.c linux-3.0.3/arch/x86/kernel/sys_i386_32.c
---- linux-3.0.3/arch/x86/kernel/sys_i386_32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/sys_i386_32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/sys_i386_32.c linux-3.0.4/arch/x86/kernel/sys_i386_32.c
+--- linux-3.0.4/arch/x86/kernel/sys_i386_32.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/sys_i386_32.c  2011-08-23 21:47:55.000000000 -0400
 @@ -24,17 +24,224 @@
  
  #include <asm/syscalls.h>
@@ -15026,9 +15030,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/sys_i386_32.c linux-3.0.3/arch/x86/kernel
 +
 +      return addr;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/sys_x86_64.c linux-3.0.3/arch/x86/kernel/sys_x86_64.c
---- linux-3.0.3/arch/x86/kernel/sys_x86_64.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/sys_x86_64.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/sys_x86_64.c linux-3.0.4/arch/x86/kernel/sys_x86_64.c
+--- linux-3.0.4/arch/x86/kernel/sys_x86_64.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/sys_x86_64.c   2011-08-23 21:47:55.000000000 -0400
 @@ -32,8 +32,8 @@ out:
        return error;
  }
@@ -15166,9 +15170,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/sys_x86_64.c linux-3.0.3/arch/x86/kernel/
        mm->cached_hole_size = ~0UL;
  
        return addr;
-diff -urNp linux-3.0.3/arch/x86/kernel/tboot.c linux-3.0.3/arch/x86/kernel/tboot.c
---- linux-3.0.3/arch/x86/kernel/tboot.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/tboot.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/tboot.c linux-3.0.4/arch/x86/kernel/tboot.c
+--- linux-3.0.4/arch/x86/kernel/tboot.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/tboot.c        2011-08-23 21:47:55.000000000 -0400
 @@ -217,7 +217,7 @@ static int tboot_setup_sleep(void)
  
  void tboot_shutdown(u32 shutdown_type)
@@ -15217,9 +15221,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/tboot.c linux-3.0.3/arch/x86/kernel/tboot
        register_hotcpu_notifier(&tboot_cpu_notifier);
        return 0;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/time.c linux-3.0.3/arch/x86/kernel/time.c
---- linux-3.0.3/arch/x86/kernel/time.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/time.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/time.c linux-3.0.4/arch/x86/kernel/time.c
+--- linux-3.0.4/arch/x86/kernel/time.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/time.c 2011-08-23 21:47:55.000000000 -0400
 @@ -30,9 +30,9 @@ unsigned long profile_pc(struct pt_regs 
  {
        unsigned long pc = instruction_pointer(regs);
@@ -15250,9 +15254,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/time.c linux-3.0.3/arch/x86/kernel/time.c
        }
        return pc;
  }
-diff -urNp linux-3.0.3/arch/x86/kernel/tls.c linux-3.0.3/arch/x86/kernel/tls.c
---- linux-3.0.3/arch/x86/kernel/tls.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/tls.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/tls.c linux-3.0.4/arch/x86/kernel/tls.c
+--- linux-3.0.4/arch/x86/kernel/tls.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/tls.c  2011-08-23 21:47:55.000000000 -0400
 @@ -85,6 +85,11 @@ int do_set_thread_area(struct task_struc
        if (idx < GDT_ENTRY_TLS_MIN || idx > GDT_ENTRY_TLS_MAX)
                return -EINVAL;
@@ -15265,9 +15269,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/tls.c linux-3.0.3/arch/x86/kernel/tls.c
        set_tls_desc(p, idx, &info, 1);
  
        return 0;
-diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_32.S linux-3.0.3/arch/x86/kernel/trampoline_32.S
---- linux-3.0.3/arch/x86/kernel/trampoline_32.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/trampoline_32.S        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_32.S linux-3.0.4/arch/x86/kernel/trampoline_32.S
+--- linux-3.0.4/arch/x86/kernel/trampoline_32.S        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/trampoline_32.S        2011-08-23 21:47:55.000000000 -0400
 @@ -32,6 +32,12 @@
  #include <asm/segment.h>
  #include <asm/page_types.h>
@@ -15290,9 +15294,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_32.S linux-3.0.3/arch/x86/kern
  
        # These need to be in the same 64K segment as the above;
        # hence we don't use the boot_gdt_descr defined in head.S
-diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_64.S linux-3.0.3/arch/x86/kernel/trampoline_64.S
---- linux-3.0.3/arch/x86/kernel/trampoline_64.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/trampoline_64.S        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/trampoline_64.S linux-3.0.4/arch/x86/kernel/trampoline_64.S
+--- linux-3.0.4/arch/x86/kernel/trampoline_64.S        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/trampoline_64.S        2011-08-23 21:47:55.000000000 -0400
 @@ -90,7 +90,7 @@ startup_32:
        movl    $__KERNEL_DS, %eax      # Initialize the %ds segment register
        movl    %eax, %ds
@@ -15311,9 +15315,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/trampoline_64.S linux-3.0.3/arch/x86/kern
        .long   tgdt - r_base
        .short 0
        .quad   0x00cf9b000000ffff      # __KERNEL32_CS
-diff -urNp linux-3.0.3/arch/x86/kernel/traps.c linux-3.0.3/arch/x86/kernel/traps.c
---- linux-3.0.3/arch/x86/kernel/traps.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/traps.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/traps.c linux-3.0.4/arch/x86/kernel/traps.c
+--- linux-3.0.4/arch/x86/kernel/traps.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/traps.c        2011-08-23 21:47:55.000000000 -0400
 @@ -70,12 +70,6 @@ asmlinkage int system_call(void);
  
  /* Do we ignore FPU interrupts ? */
@@ -15493,9 +15497,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/traps.c linux-3.0.3/arch/x86/kernel/traps
  
        if (!tsk_used_math(tsk)) {
                local_irq_enable();
-diff -urNp linux-3.0.3/arch/x86/kernel/verify_cpu.S linux-3.0.3/arch/x86/kernel/verify_cpu.S
---- linux-3.0.3/arch/x86/kernel/verify_cpu.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/verify_cpu.S   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/verify_cpu.S linux-3.0.4/arch/x86/kernel/verify_cpu.S
+--- linux-3.0.4/arch/x86/kernel/verify_cpu.S   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/verify_cpu.S   2011-08-23 21:48:14.000000000 -0400
 @@ -20,6 +20,7 @@
   *    arch/x86/boot/compressed/head_64.S: Boot cpu verification
   *    arch/x86/kernel/trampoline_64.S: secondary processor verification
@@ -15504,9 +15508,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/verify_cpu.S linux-3.0.3/arch/x86/kernel/
   *
   *    verify_cpu, returns the status of longmode and SSE in register %eax.
   *            0: Success    1: Failure
-diff -urNp linux-3.0.3/arch/x86/kernel/vm86_32.c linux-3.0.3/arch/x86/kernel/vm86_32.c
---- linux-3.0.3/arch/x86/kernel/vm86_32.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/vm86_32.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/vm86_32.c linux-3.0.4/arch/x86/kernel/vm86_32.c
+--- linux-3.0.4/arch/x86/kernel/vm86_32.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/vm86_32.c      2011-08-23 21:48:14.000000000 -0400
 @@ -41,6 +41,7 @@
  #include <linux/ptrace.h>
  #include <linux/audit.h>
@@ -15571,9 +15575,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/vm86_32.c linux-3.0.3/arch/x86/kernel/vm8
        if (get_user(segoffs, intr_ptr))
                goto cannot_handle;
        if ((segoffs >> 16) == BIOSSEG)
-diff -urNp linux-3.0.3/arch/x86/kernel/vmlinux.lds.S linux-3.0.3/arch/x86/kernel/vmlinux.lds.S
---- linux-3.0.3/arch/x86/kernel/vmlinux.lds.S  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/vmlinux.lds.S  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/vmlinux.lds.S linux-3.0.4/arch/x86/kernel/vmlinux.lds.S
+--- linux-3.0.4/arch/x86/kernel/vmlinux.lds.S  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/vmlinux.lds.S  2011-08-23 21:47:55.000000000 -0400
 @@ -26,6 +26,13 @@
  #include <asm/page_types.h>
  #include <asm/cache.h>
@@ -15836,9 +15840,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/vmlinux.lds.S linux-3.0.3/arch/x86/kernel
           "kernel image bigger than KERNEL_IMAGE_SIZE");
  
  #ifdef CONFIG_SMP
-diff -urNp linux-3.0.3/arch/x86/kernel/vsyscall_64.c linux-3.0.3/arch/x86/kernel/vsyscall_64.c
---- linux-3.0.3/arch/x86/kernel/vsyscall_64.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/vsyscall_64.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/vsyscall_64.c linux-3.0.4/arch/x86/kernel/vsyscall_64.c
+--- linux-3.0.4/arch/x86/kernel/vsyscall_64.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/vsyscall_64.c  2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@ DEFINE_VVAR(int, vgetcpu_mode);
  DEFINE_VVAR(struct vsyscall_gtod_data, vsyscall_gtod_data) =
  {
@@ -15857,9 +15861,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/vsyscall_64.c linux-3.0.3/arch/x86/kernel
          .proc_handler = proc_dointvec },
        {}
  };
-diff -urNp linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c
---- linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c
+--- linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/x8664_ksyms_64.c       2011-08-23 21:47:55.000000000 -0400
 @@ -29,8 +29,6 @@ EXPORT_SYMBOL(__put_user_8);
  EXPORT_SYMBOL(copy_user_generic_string);
  EXPORT_SYMBOL(copy_user_generic_unrolled);
@@ -15869,9 +15873,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/x8664_ksyms_64.c linux-3.0.3/arch/x86/ker
  
  EXPORT_SYMBOL(copy_page);
  EXPORT_SYMBOL(clear_page);
-diff -urNp linux-3.0.3/arch/x86/kernel/xsave.c linux-3.0.3/arch/x86/kernel/xsave.c
---- linux-3.0.3/arch/x86/kernel/xsave.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kernel/xsave.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kernel/xsave.c linux-3.0.4/arch/x86/kernel/xsave.c
+--- linux-3.0.4/arch/x86/kernel/xsave.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kernel/xsave.c        2011-08-23 21:47:55.000000000 -0400
 @@ -130,7 +130,7 @@ int check_for_xstate(struct i387_fxsave_
            fx_sw_user->xstate_size > fx_sw_user->extended_size)
                return -EINVAL;
@@ -15899,9 +15903,9 @@ diff -urNp linux-3.0.3/arch/x86/kernel/xsave.c linux-3.0.3/arch/x86/kernel/xsave
                                       buf);
        if (unlikely(err)) {
                /*
-diff -urNp linux-3.0.3/arch/x86/kvm/emulate.c linux-3.0.3/arch/x86/kvm/emulate.c
---- linux-3.0.3/arch/x86/kvm/emulate.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/emulate.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/emulate.c linux-3.0.4/arch/x86/kvm/emulate.c
+--- linux-3.0.4/arch/x86/kvm/emulate.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/emulate.c 2011-08-23 21:47:55.000000000 -0400
 @@ -96,7 +96,7 @@
  #define Src2ImmByte (2<<29)
  #define Src2One     (3<<29)
@@ -15936,9 +15940,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/emulate.c linux-3.0.3/arch/x86/kvm/emulate.c
                switch ((_dst).bytes) {                                      \
                case 1:                                                      \
                        ____emulate_2op(_op,_src,_dst,_eflags,_bx,_by,"b",u8); \
-diff -urNp linux-3.0.3/arch/x86/kvm/lapic.c linux-3.0.3/arch/x86/kvm/lapic.c
---- linux-3.0.3/arch/x86/kvm/lapic.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/lapic.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/lapic.c linux-3.0.4/arch/x86/kvm/lapic.c
+--- linux-3.0.4/arch/x86/kvm/lapic.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/lapic.c   2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@
  #define APIC_BUS_CYCLE_NS 1
  
@@ -15948,9 +15952,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/lapic.c linux-3.0.3/arch/x86/kvm/lapic.c
  
  #define APIC_LVT_NUM                  6
  /* 14 is the version for Xeon and Pentium 8.4.8*/
-diff -urNp linux-3.0.3/arch/x86/kvm/mmu.c linux-3.0.3/arch/x86/kvm/mmu.c
---- linux-3.0.3/arch/x86/kvm/mmu.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/mmu.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/mmu.c linux-3.0.4/arch/x86/kvm/mmu.c
+--- linux-3.0.4/arch/x86/kvm/mmu.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/mmu.c     2011-08-23 21:47:55.000000000 -0400
 @@ -3238,7 +3238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
  
        pgprintk("%s: gpa %llx bytes %d\n", __func__, gpa, bytes);
@@ -15969,9 +15973,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/mmu.c linux-3.0.3/arch/x86/kvm/mmu.c
                gentry = 0;
        kvm_mmu_free_some_pages(vcpu);
        ++vcpu->kvm->stat.mmu_pte_write;
-diff -urNp linux-3.0.3/arch/x86/kvm/paging_tmpl.h linux-3.0.3/arch/x86/kvm/paging_tmpl.h
---- linux-3.0.3/arch/x86/kvm/paging_tmpl.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/paging_tmpl.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/paging_tmpl.h linux-3.0.4/arch/x86/kvm/paging_tmpl.h
+--- linux-3.0.4/arch/x86/kvm/paging_tmpl.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/paging_tmpl.h     2011-08-23 21:48:14.000000000 -0400
 @@ -583,6 +583,8 @@ static int FNAME(page_fault)(struct kvm_
        unsigned long mmu_seq;
        bool map_writable;
@@ -15990,9 +15994,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/paging_tmpl.h linux-3.0.3/arch/x86/kvm/pagin
  
        spin_unlock(&vcpu->kvm->mmu_lock);
  
-diff -urNp linux-3.0.3/arch/x86/kvm/svm.c linux-3.0.3/arch/x86/kvm/svm.c
---- linux-3.0.3/arch/x86/kvm/svm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/svm.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/svm.c linux-3.0.4/arch/x86/kvm/svm.c
+--- linux-3.0.4/arch/x86/kvm/svm.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/svm.c     2011-08-23 21:47:55.000000000 -0400
 @@ -3377,7 +3377,11 @@ static void reload_tss(struct kvm_vcpu *
        int cpu = raw_smp_processor_id();
  
@@ -16016,9 +16020,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/svm.c linux-3.0.3/arch/x86/kvm/svm.c
        reload_tss(vcpu);
  
        local_irq_disable();
-diff -urNp linux-3.0.3/arch/x86/kvm/vmx.c linux-3.0.3/arch/x86/kvm/vmx.c
---- linux-3.0.3/arch/x86/kvm/vmx.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/vmx.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/vmx.c linux-3.0.4/arch/x86/kvm/vmx.c
+--- linux-3.0.4/arch/x86/kvm/vmx.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/vmx.c     2011-08-23 21:47:55.000000000 -0400
 @@ -797,7 +797,11 @@ static void reload_tss(void)
        struct desc_struct *descs;
  
@@ -16097,9 +16101,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/vmx.c linux-3.0.3/arch/x86/kvm/vmx.c
        vmx->launched = 1;
  
        vmx->exit_reason = vmcs_read32(VM_EXIT_REASON);
-diff -urNp linux-3.0.3/arch/x86/kvm/x86.c linux-3.0.3/arch/x86/kvm/x86.c
---- linux-3.0.3/arch/x86/kvm/x86.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/kvm/x86.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/kvm/x86.c linux-3.0.4/arch/x86/kvm/x86.c
+--- linux-3.0.4/arch/x86/kvm/x86.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/kvm/x86.c     2011-08-23 21:47:55.000000000 -0400
 @@ -2057,6 +2057,8 @@ long kvm_arch_dev_ioctl(struct file *fil
                if (n < msr_list.nmsrs)
                        goto out;
@@ -16174,9 +16178,9 @@ diff -urNp linux-3.0.3/arch/x86/kvm/x86.c linux-3.0.3/arch/x86/kvm/x86.c
  {
        int r;
        struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
-diff -urNp linux-3.0.3/arch/x86/lguest/boot.c linux-3.0.3/arch/x86/lguest/boot.c
---- linux-3.0.3/arch/x86/lguest/boot.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lguest/boot.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lguest/boot.c linux-3.0.4/arch/x86/lguest/boot.c
+--- linux-3.0.4/arch/x86/lguest/boot.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lguest/boot.c 2011-08-23 21:47:55.000000000 -0400
 @@ -1176,9 +1176,10 @@ static __init int early_put_chars(u32 vt
   * Rebooting also tells the Host we're finished, but the RESTART flag tells the
   * Launcher to reboot us.
@@ -16189,9 +16193,9 @@ diff -urNp linux-3.0.3/arch/x86/lguest/boot.c linux-3.0.3/arch/x86/lguest/boot.c
  }
  
  /*G:050
-diff -urNp linux-3.0.3/arch/x86/lib/atomic64_32.c linux-3.0.3/arch/x86/lib/atomic64_32.c
---- linux-3.0.3/arch/x86/lib/atomic64_32.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/atomic64_32.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/atomic64_32.c linux-3.0.4/arch/x86/lib/atomic64_32.c
+--- linux-3.0.4/arch/x86/lib/atomic64_32.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/atomic64_32.c     2011-08-23 21:47:55.000000000 -0400
 @@ -8,18 +8,30 @@
  
  long long atomic64_read_cx8(long long, const atomic64_t *v);
@@ -16270,9 +16274,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/atomic64_32.c linux-3.0.3/arch/x86/lib/atomi
  long long atomic64_dec_if_positive_386(atomic64_t *v);
  EXPORT_SYMBOL(atomic64_dec_if_positive_386);
  int atomic64_inc_not_zero_386(atomic64_t *v);
-diff -urNp linux-3.0.3/arch/x86/lib/atomic64_386_32.S linux-3.0.3/arch/x86/lib/atomic64_386_32.S
---- linux-3.0.3/arch/x86/lib/atomic64_386_32.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/atomic64_386_32.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/atomic64_386_32.S linux-3.0.4/arch/x86/lib/atomic64_386_32.S
+--- linux-3.0.4/arch/x86/lib/atomic64_386_32.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/atomic64_386_32.S 2011-08-23 21:47:55.000000000 -0400
 @@ -48,6 +48,10 @@ BEGIN(read)
        movl  (v), %eax
        movl 4(v), %edx
@@ -16528,9 +16532,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/atomic64_386_32.S linux-3.0.3/arch/x86/lib/a
        js 1f
        movl %eax,  (v)
        movl %edx, 4(v)
-diff -urNp linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S
---- linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S
+--- linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/atomic64_cx8_32.S 2011-08-23 21:47:55.000000000 -0400
 @@ -39,6 +39,14 @@ ENTRY(atomic64_read_cx8)
        CFI_ENDPROC
  ENDPROC(atomic64_read_cx8)
@@ -16709,9 +16713,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/atomic64_cx8_32.S linux-3.0.3/arch/x86/lib/a
        LOCK_PREFIX
        cmpxchg8b (%esi)
        jne 1b
-diff -urNp linux-3.0.3/arch/x86/lib/checksum_32.S linux-3.0.3/arch/x86/lib/checksum_32.S
---- linux-3.0.3/arch/x86/lib/checksum_32.S     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/checksum_32.S     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/checksum_32.S linux-3.0.4/arch/x86/lib/checksum_32.S
+--- linux-3.0.4/arch/x86/lib/checksum_32.S     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/checksum_32.S     2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,8 @@
  #include <linux/linkage.h>
  #include <asm/dwarf2.h>
@@ -16956,9 +16960,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/checksum_32.S linux-3.0.3/arch/x86/lib/check
                                
  #undef ROUND
  #undef ROUND1         
-diff -urNp linux-3.0.3/arch/x86/lib/clear_page_64.S linux-3.0.3/arch/x86/lib/clear_page_64.S
---- linux-3.0.3/arch/x86/lib/clear_page_64.S   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/clear_page_64.S   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/clear_page_64.S linux-3.0.4/arch/x86/lib/clear_page_64.S
+--- linux-3.0.4/arch/x86/lib/clear_page_64.S   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/clear_page_64.S   2011-08-23 21:47:55.000000000 -0400
 @@ -58,7 +58,7 @@ ENDPROC(clear_page)
  
  #include <asm/cpufeature.h>
@@ -16968,9 +16972,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/clear_page_64.S linux-3.0.3/arch/x86/lib/cle
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (clear_page_c - clear_page) - (2f - 1b)   /* offset */
  2:    .byte 0xeb                                      /* jmp <disp8> */
-diff -urNp linux-3.0.3/arch/x86/lib/copy_page_64.S linux-3.0.3/arch/x86/lib/copy_page_64.S
---- linux-3.0.3/arch/x86/lib/copy_page_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/copy_page_64.S    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/copy_page_64.S linux-3.0.4/arch/x86/lib/copy_page_64.S
+--- linux-3.0.4/arch/x86/lib/copy_page_64.S    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/copy_page_64.S    2011-08-23 21:47:55.000000000 -0400
 @@ -104,7 +104,7 @@ ENDPROC(copy_page)
  
  #include <asm/cpufeature.h>
@@ -16980,9 +16984,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/copy_page_64.S linux-3.0.3/arch/x86/lib/copy
  1:    .byte 0xeb                                      /* jmp <disp8> */
        .byte (copy_page_c - copy_page) - (2f - 1b)     /* offset */
  2:
-diff -urNp linux-3.0.3/arch/x86/lib/copy_user_64.S linux-3.0.3/arch/x86/lib/copy_user_64.S
---- linux-3.0.3/arch/x86/lib/copy_user_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/copy_user_64.S    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/copy_user_64.S linux-3.0.4/arch/x86/lib/copy_user_64.S
+--- linux-3.0.4/arch/x86/lib/copy_user_64.S    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/copy_user_64.S    2011-08-23 21:47:55.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <asm/thread_info.h>
  #include <asm/cpufeature.h>
@@ -17044,9 +17048,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/copy_user_64.S linux-3.0.3/arch/x86/lib/copy
        movl %edx,%ecx
        xorl %eax,%eax
        rep
-diff -urNp linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S
---- linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S
+--- linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/copy_user_nocache_64.S    2011-08-23 21:47:55.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <asm/current.h>
  #include <asm/asm-offsets.h>
@@ -17071,9 +17075,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/copy_user_nocache_64.S linux-3.0.3/arch/x86/
        cmpl $8,%edx
        jb 20f          /* less then 8 bytes, go to byte copy loop */
        ALIGN_DESTINATION
-diff -urNp linux-3.0.3/arch/x86/lib/csum-wrappers_64.c linux-3.0.3/arch/x86/lib/csum-wrappers_64.c
---- linux-3.0.3/arch/x86/lib/csum-wrappers_64.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/csum-wrappers_64.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/csum-wrappers_64.c linux-3.0.4/arch/x86/lib/csum-wrappers_64.c
+--- linux-3.0.4/arch/x86/lib/csum-wrappers_64.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/csum-wrappers_64.c        2011-08-23 21:47:55.000000000 -0400
 @@ -52,6 +52,12 @@ csum_partial_copy_from_user(const void _
                        len -= 2;
                }
@@ -17100,9 +17104,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/csum-wrappers_64.c linux-3.0.3/arch/x86/lib/
        return csum_partial_copy_generic(src, (void __force *)dst,
                                         len, isum, NULL, errp);
  }
-diff -urNp linux-3.0.3/arch/x86/lib/getuser.S linux-3.0.3/arch/x86/lib/getuser.S
---- linux-3.0.3/arch/x86/lib/getuser.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/getuser.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/getuser.S linux-3.0.4/arch/x86/lib/getuser.S
+--- linux-3.0.4/arch/x86/lib/getuser.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/getuser.S 2011-08-23 21:47:55.000000000 -0400
 @@ -33,14 +33,35 @@
  #include <asm/asm-offsets.h>
  #include <asm/thread_info.h>
@@ -17208,9 +17212,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/getuser.S linux-3.0.3/arch/x86/lib/getuser.S
  4:    movq -7(%_ASM_AX),%_ASM_DX
        xor %eax,%eax
        ret
-diff -urNp linux-3.0.3/arch/x86/lib/insn.c linux-3.0.3/arch/x86/lib/insn.c
---- linux-3.0.3/arch/x86/lib/insn.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/insn.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/insn.c linux-3.0.4/arch/x86/lib/insn.c
+--- linux-3.0.4/arch/x86/lib/insn.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/insn.c    2011-08-23 21:47:55.000000000 -0400
 @@ -21,6 +21,11 @@
  #include <linux/string.h>
  #include <asm/inat.h>
@@ -17234,9 +17238,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/insn.c linux-3.0.3/arch/x86/lib/insn.c
        insn->x86_64 = x86_64 ? 1 : 0;
        insn->opnd_bytes = 4;
        if (x86_64)
-diff -urNp linux-3.0.3/arch/x86/lib/mmx_32.c linux-3.0.3/arch/x86/lib/mmx_32.c
---- linux-3.0.3/arch/x86/lib/mmx_32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/mmx_32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/mmx_32.c linux-3.0.4/arch/x86/lib/mmx_32.c
+--- linux-3.0.4/arch/x86/lib/mmx_32.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/mmx_32.c  2011-08-23 21:47:55.000000000 -0400
 @@ -29,6 +29,7 @@ void *_mmx_memcpy(void *to, const void *
  {
        void *p;
@@ -17552,9 +17556,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/mmx_32.c linux-3.0.3/arch/x86/lib/mmx_32.c
  
                from += 64;
                to += 64;
-diff -urNp linux-3.0.3/arch/x86/lib/putuser.S linux-3.0.3/arch/x86/lib/putuser.S
---- linux-3.0.3/arch/x86/lib/putuser.S 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/putuser.S 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/putuser.S linux-3.0.4/arch/x86/lib/putuser.S
+--- linux-3.0.4/arch/x86/lib/putuser.S 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/putuser.S 2011-08-23 21:47:55.000000000 -0400
 @@ -15,7 +15,8 @@
  #include <asm/thread_info.h>
  #include <asm/errno.h>
@@ -17692,9 +17696,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/putuser.S linux-3.0.3/arch/x86/lib/putuser.S
  #endif
        xor %eax,%eax
        EXIT
-diff -urNp linux-3.0.3/arch/x86/lib/usercopy_32.c linux-3.0.3/arch/x86/lib/usercopy_32.c
---- linux-3.0.3/arch/x86/lib/usercopy_32.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/usercopy_32.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/usercopy_32.c linux-3.0.4/arch/x86/lib/usercopy_32.c
+--- linux-3.0.4/arch/x86/lib/usercopy_32.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/usercopy_32.c     2011-08-23 21:47:55.000000000 -0400
 @@ -43,7 +43,7 @@ do {                                                                    \
        __asm__ __volatile__(                                              \
                "       testl %1,%1\n"                                     \
@@ -18315,9 +18319,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/usercopy_32.c linux-3.0.3/arch/x86/lib/userc
 +}
 +EXPORT_SYMBOL(set_fs);
 +#endif
-diff -urNp linux-3.0.3/arch/x86/lib/usercopy_64.c linux-3.0.3/arch/x86/lib/usercopy_64.c
---- linux-3.0.3/arch/x86/lib/usercopy_64.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/lib/usercopy_64.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/lib/usercopy_64.c linux-3.0.4/arch/x86/lib/usercopy_64.c
+--- linux-3.0.4/arch/x86/lib/usercopy_64.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/lib/usercopy_64.c     2011-08-23 21:47:55.000000000 -0400
 @@ -42,6 +42,12 @@ long
  __strncpy_from_user(char *dst, const char __user *src, long count)
  {
@@ -18366,9 +18370,9 @@ diff -urNp linux-3.0.3/arch/x86/lib/usercopy_64.c linux-3.0.3/arch/x86/lib/userc
  }
  EXPORT_SYMBOL(copy_in_user);
  
-diff -urNp linux-3.0.3/arch/x86/Makefile linux-3.0.3/arch/x86/Makefile
---- linux-3.0.3/arch/x86/Makefile      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/Makefile      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/Makefile linux-3.0.4/arch/x86/Makefile
+--- linux-3.0.4/arch/x86/Makefile      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/Makefile      2011-08-23 21:48:14.000000000 -0400
 @@ -44,6 +44,7 @@ ifeq ($(CONFIG_X86_32),y)
  else
          BITS := 64
@@ -18390,9 +18394,9 @@ diff -urNp linux-3.0.3/arch/x86/Makefile linux-3.0.3/arch/x86/Makefile
 +
 +archprepare:
 +      $(if $(LDFLAGS_BUILD_ID),,$(error $(OLD_LD)))
-diff -urNp linux-3.0.3/arch/x86/mm/extable.c linux-3.0.3/arch/x86/mm/extable.c
---- linux-3.0.3/arch/x86/mm/extable.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/extable.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/extable.c linux-3.0.4/arch/x86/mm/extable.c
+--- linux-3.0.4/arch/x86/mm/extable.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/extable.c  2011-08-23 21:47:55.000000000 -0400
 @@ -8,7 +8,7 @@ int fixup_exception(struct pt_regs *regs
        const struct exception_table_entry *fixup;
  
@@ -18402,9 +18406,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/extable.c linux-3.0.3/arch/x86/mm/extable.c
                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-3.0.3/arch/x86/mm/fault.c linux-3.0.3/arch/x86/mm/fault.c
---- linux-3.0.3/arch/x86/mm/fault.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/fault.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/fault.c linux-3.0.4/arch/x86/mm/fault.c
+--- linux-3.0.4/arch/x86/mm/fault.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/fault.c    2011-08-23 21:48:14.000000000 -0400
 @@ -13,10 +13,18 @@
  #include <linux/perf_event.h>         /* perf_sw_event                */
  #include <linux/hugetlb.h>            /* hstate_index_to_shift        */
@@ -19071,9 +19075,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/fault.c linux-3.0.3/arch/x86/mm/fault.c
 +
 +      return ret ? -EFAULT : 0;
 +}
-diff -urNp linux-3.0.3/arch/x86/mm/gup.c linux-3.0.3/arch/x86/mm/gup.c
---- linux-3.0.3/arch/x86/mm/gup.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/gup.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/gup.c linux-3.0.4/arch/x86/mm/gup.c
+--- linux-3.0.4/arch/x86/mm/gup.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/gup.c      2011-08-23 21:47:55.000000000 -0400
 @@ -263,7 +263,7 @@ int __get_user_pages_fast(unsigned long 
        addr = start;
        len = (unsigned long) nr_pages << PAGE_SHIFT;
@@ -19083,9 +19087,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/gup.c linux-3.0.3/arch/x86/mm/gup.c
                                        (void __user *)start, len)))
                return 0;
  
-diff -urNp linux-3.0.3/arch/x86/mm/highmem_32.c linux-3.0.3/arch/x86/mm/highmem_32.c
---- linux-3.0.3/arch/x86/mm/highmem_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/highmem_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/highmem_32.c linux-3.0.4/arch/x86/mm/highmem_32.c
+--- linux-3.0.4/arch/x86/mm/highmem_32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/highmem_32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,10 @@ void *kmap_atomic_prot(struct page *page
        idx = type + KM_TYPE_NR*smp_processor_id();
        vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);
@@ -19097,9 +19101,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/highmem_32.c linux-3.0.3/arch/x86/mm/highmem_
  
        return (void *)vaddr;
  }
-diff -urNp linux-3.0.3/arch/x86/mm/hugetlbpage.c linux-3.0.3/arch/x86/mm/hugetlbpage.c
---- linux-3.0.3/arch/x86/mm/hugetlbpage.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/hugetlbpage.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/hugetlbpage.c linux-3.0.4/arch/x86/mm/hugetlbpage.c
+--- linux-3.0.4/arch/x86/mm/hugetlbpage.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/hugetlbpage.c      2011-08-23 21:47:55.000000000 -0400
 @@ -266,13 +266,20 @@ static unsigned long hugetlb_get_unmappe
        struct hstate *h = hstate_file(file);
        struct mm_struct *mm = current->mm;
@@ -19307,9 +19311,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/hugetlbpage.c linux-3.0.3/arch/x86/mm/hugetlb
                        return addr;
        }
        if (mm->get_unmapped_area == arch_get_unmapped_area)
-diff -urNp linux-3.0.3/arch/x86/mm/init_32.c linux-3.0.3/arch/x86/mm/init_32.c
---- linux-3.0.3/arch/x86/mm/init_32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/init_32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/init_32.c linux-3.0.4/arch/x86/mm/init_32.c
+--- linux-3.0.4/arch/x86/mm/init_32.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/init_32.c  2011-08-23 21:47:55.000000000 -0400
 @@ -74,36 +74,6 @@ static __init void *alloc_low_page(void)
  }
  
@@ -19584,9 +19588,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/init_32.c linux-3.0.3/arch/x86/mm/init_32.c
        set_pages_ro(virt_to_page(start), size >> PAGE_SHIFT);
        printk(KERN_INFO "Write protecting the kernel text: %luk\n",
                size >> 10);
-diff -urNp linux-3.0.3/arch/x86/mm/init_64.c linux-3.0.3/arch/x86/mm/init_64.c
---- linux-3.0.3/arch/x86/mm/init_64.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/init_64.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/init_64.c linux-3.0.4/arch/x86/mm/init_64.c
+--- linux-3.0.4/arch/x86/mm/init_64.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/init_64.c  2011-08-23 21:47:55.000000000 -0400
 @@ -75,7 +75,7 @@ early_param("gbpages", parse_direct_gbpa
   * around without checking the pgd every time.
   */
@@ -19698,9 +19702,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/init_64.c linux-3.0.3/arch/x86/mm/init_64.c
                return "[vdso]";
        if (vma == &gate_vma)
                return "[vsyscall]";
-diff -urNp linux-3.0.3/arch/x86/mm/init.c linux-3.0.3/arch/x86/mm/init.c
---- linux-3.0.3/arch/x86/mm/init.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/init.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/init.c linux-3.0.4/arch/x86/mm/init.c
+--- linux-3.0.4/arch/x86/mm/init.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/init.c     2011-08-23 21:48:14.000000000 -0400
 @@ -31,7 +31,7 @@ int direct_gbpages
  static void __init find_early_table_space(unsigned long end, int use_pse,
                                          int use_gbpages)
@@ -19833,9 +19837,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/init.c linux-3.0.3/arch/x86/mm/init.c
        free_init_pages("unused kernel memory",
                        (unsigned long)(&__init_begin),
                        (unsigned long)(&__init_end));
-diff -urNp linux-3.0.3/arch/x86/mm/iomap_32.c linux-3.0.3/arch/x86/mm/iomap_32.c
---- linux-3.0.3/arch/x86/mm/iomap_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/iomap_32.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/iomap_32.c linux-3.0.4/arch/x86/mm/iomap_32.c
+--- linux-3.0.4/arch/x86/mm/iomap_32.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/iomap_32.c 2011-08-23 21:47:55.000000000 -0400
 @@ -64,7 +64,11 @@ void *kmap_atomic_prot_pfn(unsigned long
        type = kmap_atomic_idx_push();
        idx = type + KM_TYPE_NR * smp_processor_id();
@@ -19848,9 +19852,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/iomap_32.c linux-3.0.3/arch/x86/mm/iomap_32.c
        arch_flush_lazy_mmu_mode();
  
        return (void *)vaddr;
-diff -urNp linux-3.0.3/arch/x86/mm/ioremap.c linux-3.0.3/arch/x86/mm/ioremap.c
---- linux-3.0.3/arch/x86/mm/ioremap.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/ioremap.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/ioremap.c linux-3.0.4/arch/x86/mm/ioremap.c
+--- linux-3.0.4/arch/x86/mm/ioremap.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/ioremap.c  2011-08-23 21:47:55.000000000 -0400
 @@ -97,7 +97,7 @@ static void __iomem *__ioremap_caller(re
        for (pfn = phys_addr >> PAGE_SHIFT; pfn <= last_pfn; pfn++) {
                int is_ram = page_is_ram(pfn);
@@ -19879,9 +19883,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/ioremap.c linux-3.0.3/arch/x86/mm/ioremap.c
  
        /*
         * The boot-ioremap range spans multiple pmds, for which
-diff -urNp linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c
---- linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c
+--- linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/kmemcheck/kmemcheck.c      2011-08-23 21:47:55.000000000 -0400
 @@ -622,9 +622,9 @@ bool kmemcheck_fault(struct pt_regs *reg
         * memory (e.g. tracked pages)? For now, we need this to avoid
         * invoking kmemcheck for PnP BIOS calls.
@@ -19894,9 +19898,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/kmemcheck/kmemcheck.c linux-3.0.3/arch/x86/mm
                return false;
  
        pte = kmemcheck_pte_lookup(address);
-diff -urNp linux-3.0.3/arch/x86/mm/mmap.c linux-3.0.3/arch/x86/mm/mmap.c
---- linux-3.0.3/arch/x86/mm/mmap.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/mmap.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/mmap.c linux-3.0.4/arch/x86/mm/mmap.c
+--- linux-3.0.4/arch/x86/mm/mmap.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/mmap.c     2011-08-23 21:47:55.000000000 -0400
 @@ -49,7 +49,7 @@ static unsigned int stack_maxrandom_size
   * Leave an at least ~128 MB hole with possible stack randomization.
   */
@@ -19978,9 +19982,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/mmap.c linux-3.0.3/arch/x86/mm/mmap.c
                mm->get_unmapped_area = arch_get_unmapped_area_topdown;
                mm->unmap_area = arch_unmap_area_topdown;
        }
-diff -urNp linux-3.0.3/arch/x86/mm/mmio-mod.c linux-3.0.3/arch/x86/mm/mmio-mod.c
---- linux-3.0.3/arch/x86/mm/mmio-mod.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/mmio-mod.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/mmio-mod.c linux-3.0.4/arch/x86/mm/mmio-mod.c
+--- linux-3.0.4/arch/x86/mm/mmio-mod.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/mmio-mod.c 2011-08-23 21:47:55.000000000 -0400
 @@ -195,7 +195,7 @@ static void pre(struct kmmio_probe *p, s
                break;
        default:
@@ -20008,9 +20012,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/mmio-mod.c linux-3.0.3/arch/x86/mm/mmio-mod.c
        };
        map.map_id = trace->id;
  
-diff -urNp linux-3.0.3/arch/x86/mm/pageattr.c linux-3.0.3/arch/x86/mm/pageattr.c
---- linux-3.0.3/arch/x86/mm/pageattr.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pageattr.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pageattr.c linux-3.0.4/arch/x86/mm/pageattr.c
+--- linux-3.0.4/arch/x86/mm/pageattr.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pageattr.c 2011-08-23 21:47:55.000000000 -0400
 @@ -261,7 +261,7 @@ static inline pgprot_t static_protection
         */
  #ifdef CONFIG_PCI_BIOS
@@ -20095,9 +20099,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pageattr.c linux-3.0.3/arch/x86/mm/pageattr.c
  }
  
  static int
-diff -urNp linux-3.0.3/arch/x86/mm/pageattr-test.c linux-3.0.3/arch/x86/mm/pageattr-test.c
---- linux-3.0.3/arch/x86/mm/pageattr-test.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pageattr-test.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pageattr-test.c linux-3.0.4/arch/x86/mm/pageattr-test.c
+--- linux-3.0.4/arch/x86/mm/pageattr-test.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pageattr-test.c    2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@ enum {
  
  static int pte_testbit(pte_t pte)
@@ -20107,9 +20111,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pageattr-test.c linux-3.0.3/arch/x86/mm/pagea
  }
  
  struct split_state {
-diff -urNp linux-3.0.3/arch/x86/mm/pat.c linux-3.0.3/arch/x86/mm/pat.c
---- linux-3.0.3/arch/x86/mm/pat.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pat.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pat.c linux-3.0.4/arch/x86/mm/pat.c
+--- linux-3.0.4/arch/x86/mm/pat.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pat.c      2011-08-23 21:47:55.000000000 -0400
 @@ -361,7 +361,7 @@ int free_memtype(u64 start, u64 end)
  
        if (!entry) {
@@ -20157,9 +20161,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pat.c linux-3.0.3/arch/x86/mm/pat.c
                                cattr_name(want_flags),
                                (unsigned long long)paddr,
                                (unsigned long long)(paddr + size),
-diff -urNp linux-3.0.3/arch/x86/mm/pf_in.c linux-3.0.3/arch/x86/mm/pf_in.c
---- linux-3.0.3/arch/x86/mm/pf_in.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pf_in.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pf_in.c linux-3.0.4/arch/x86/mm/pf_in.c
+--- linux-3.0.4/arch/x86/mm/pf_in.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pf_in.c    2011-08-23 21:47:55.000000000 -0400
 @@ -148,7 +148,7 @@ enum reason_type get_ins_type(unsigned l
        int i;
        enum reason_type rv = OTHERS;
@@ -20205,9 +20209,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pf_in.c linux-3.0.3/arch/x86/mm/pf_in.c
        p += skip_prefix(p, &prf);
        p += get_opcode(p, &opcode);
        for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-diff -urNp linux-3.0.3/arch/x86/mm/pgtable_32.c linux-3.0.3/arch/x86/mm/pgtable_32.c
---- linux-3.0.3/arch/x86/mm/pgtable_32.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pgtable_32.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pgtable_32.c linux-3.0.4/arch/x86/mm/pgtable_32.c
+--- linux-3.0.4/arch/x86/mm/pgtable_32.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pgtable_32.c       2011-08-23 21:47:55.000000000 -0400
 @@ -48,10 +48,13 @@ void set_pte_vaddr(unsigned long vaddr, 
                return;
        }
@@ -20222,9 +20226,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pgtable_32.c linux-3.0.3/arch/x86/mm/pgtable_
  
        /*
         * It's enough to flush this one mapping.
-diff -urNp linux-3.0.3/arch/x86/mm/pgtable.c linux-3.0.3/arch/x86/mm/pgtable.c
---- linux-3.0.3/arch/x86/mm/pgtable.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/pgtable.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/pgtable.c linux-3.0.4/arch/x86/mm/pgtable.c
+--- linux-3.0.4/arch/x86/mm/pgtable.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/pgtable.c  2011-08-23 21:47:55.000000000 -0400
 @@ -84,10 +84,52 @@ static inline void pgd_list_del(pgd_t *p
        list_del(&page->lru);
  }
@@ -20470,9 +20474,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/pgtable.c linux-3.0.3/arch/x86/mm/pgtable.c
        pgd_dtor(pgd);
        paravirt_pgd_free(mm, pgd);
        free_page((unsigned long)pgd);
-diff -urNp linux-3.0.3/arch/x86/mm/setup_nx.c linux-3.0.3/arch/x86/mm/setup_nx.c
---- linux-3.0.3/arch/x86/mm/setup_nx.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/setup_nx.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/setup_nx.c linux-3.0.4/arch/x86/mm/setup_nx.c
+--- linux-3.0.4/arch/x86/mm/setup_nx.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/setup_nx.c 2011-08-23 21:47:55.000000000 -0400
 @@ -5,8 +5,10 @@
  #include <asm/pgtable.h>
  #include <asm/proto.h>
@@ -20502,9 +20506,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/setup_nx.c linux-3.0.3/arch/x86/mm/setup_nx.c
                __supported_pte_mask &= ~_PAGE_NX;
  }
  
-diff -urNp linux-3.0.3/arch/x86/mm/tlb.c linux-3.0.3/arch/x86/mm/tlb.c
---- linux-3.0.3/arch/x86/mm/tlb.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/mm/tlb.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/mm/tlb.c linux-3.0.4/arch/x86/mm/tlb.c
+--- linux-3.0.4/arch/x86/mm/tlb.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/mm/tlb.c      2011-08-23 21:47:55.000000000 -0400
 @@ -65,7 +65,11 @@ void leave_mm(int cpu)
                BUG();
        cpumask_clear_cpu(cpu,
@@ -20517,9 +20521,9 @@ diff -urNp linux-3.0.3/arch/x86/mm/tlb.c linux-3.0.3/arch/x86/mm/tlb.c
  }
  EXPORT_SYMBOL_GPL(leave_mm);
  
-diff -urNp linux-3.0.3/arch/x86/net/bpf_jit_comp.c linux-3.0.3/arch/x86/net/bpf_jit_comp.c
---- linux-3.0.3/arch/x86/net/bpf_jit_comp.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/net/bpf_jit_comp.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/net/bpf_jit_comp.c linux-3.0.4/arch/x86/net/bpf_jit_comp.c
+--- linux-3.0.4/arch/x86/net/bpf_jit_comp.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/net/bpf_jit_comp.c    2011-08-23 21:47:55.000000000 -0400
 @@ -589,7 +589,9 @@ cond_branch:                       f_offset = addrs[i + filt
                                        module_free(NULL, image);
                                        return;
@@ -20539,9 +20543,9 @@ diff -urNp linux-3.0.3/arch/x86/net/bpf_jit_comp.c linux-3.0.3/arch/x86/net/bpf_
                                                   proglen,
                                                   sizeof(struct work_struct)));
                        if (!image)
-diff -urNp linux-3.0.3/arch/x86/oprofile/backtrace.c linux-3.0.3/arch/x86/oprofile/backtrace.c
---- linux-3.0.3/arch/x86/oprofile/backtrace.c  2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/oprofile/backtrace.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/oprofile/backtrace.c linux-3.0.4/arch/x86/oprofile/backtrace.c
+--- linux-3.0.4/arch/x86/oprofile/backtrace.c  2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/x86/oprofile/backtrace.c  2011-08-23 21:47:55.000000000 -0400
 @@ -148,7 +148,7 @@ x86_backtrace(struct pt_regs * const reg
  {
        struct stack_frame *head = (struct stack_frame *)frame_pointer(regs);
@@ -20551,9 +20555,9 @@ diff -urNp linux-3.0.3/arch/x86/oprofile/backtrace.c linux-3.0.3/arch/x86/oprofi
                unsigned long stack = kernel_stack_pointer(regs);
                if (depth)
                        dump_trace(NULL, regs, (unsigned long *)stack, 0,
-diff -urNp linux-3.0.3/arch/x86/pci/mrst.c linux-3.0.3/arch/x86/pci/mrst.c
---- linux-3.0.3/arch/x86/pci/mrst.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/pci/mrst.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/pci/mrst.c linux-3.0.4/arch/x86/pci/mrst.c
+--- linux-3.0.4/arch/x86/pci/mrst.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/pci/mrst.c    2011-08-23 21:47:55.000000000 -0400
 @@ -234,7 +234,9 @@ int __init pci_mrst_init(void)
        printk(KERN_INFO "Moorestown platform detected, using MRST PCI ops\n");
        pci_mmcfg_late_init();
@@ -20565,9 +20569,9 @@ diff -urNp linux-3.0.3/arch/x86/pci/mrst.c linux-3.0.3/arch/x86/pci/mrst.c
        /* Continue with standard init */
        return 1;
  }
-diff -urNp linux-3.0.3/arch/x86/pci/pcbios.c linux-3.0.3/arch/x86/pci/pcbios.c
---- linux-3.0.3/arch/x86/pci/pcbios.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/pci/pcbios.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/pci/pcbios.c linux-3.0.4/arch/x86/pci/pcbios.c
+--- linux-3.0.4/arch/x86/pci/pcbios.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/pci/pcbios.c  2011-08-23 21:47:55.000000000 -0400
 @@ -79,50 +79,93 @@ union bios32 {
  static struct {
        unsigned long address;
@@ -20872,9 +20876,9 @@ diff -urNp linux-3.0.3/arch/x86/pci/pcbios.c linux-3.0.3/arch/x86/pci/pcbios.c
        return !(ret & 0xff00);
  }
  EXPORT_SYMBOL(pcibios_set_irq_routing);
-diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_32.c linux-3.0.3/arch/x86/platform/efi/efi_32.c
---- linux-3.0.3/arch/x86/platform/efi/efi_32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/efi/efi_32.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_32.c linux-3.0.4/arch/x86/platform/efi/efi_32.c
+--- linux-3.0.4/arch/x86/platform/efi/efi_32.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/efi/efi_32.c 2011-08-23 21:47:55.000000000 -0400
 @@ -38,70 +38,37 @@
   */
  
@@ -20955,9 +20959,9 @@ diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_32.c linux-3.0.3/arch/x86/platf
  
        /*
         * After the lock is released, the original page table is restored.
-diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S
---- linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S
+--- linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/efi/efi_stub_32.S    2011-08-23 21:47:55.000000000 -0400
 @@ -6,6 +6,7 @@
   */
  
@@ -21056,9 +21060,9 @@ diff -urNp linux-3.0.3/arch/x86/platform/efi/efi_stub_32.S linux-3.0.3/arch/x86/
  saved_return_addr:
        .long 0
  efi_rt_function_ptr:
-diff -urNp linux-3.0.3/arch/x86/platform/mrst/mrst.c linux-3.0.3/arch/x86/platform/mrst/mrst.c
---- linux-3.0.3/arch/x86/platform/mrst/mrst.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/mrst/mrst.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/mrst/mrst.c linux-3.0.4/arch/x86/platform/mrst/mrst.c
+--- linux-3.0.4/arch/x86/platform/mrst/mrst.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/mrst/mrst.c  2011-08-23 21:47:55.000000000 -0400
 @@ -239,14 +239,16 @@ static int mrst_i8042_detect(void)
  }
  
@@ -21078,9 +21082,21 @@ diff -urNp linux-3.0.3/arch/x86/platform/mrst/mrst.c linux-3.0.3/arch/x86/platfo
  }
  
  /*
-diff -urNp linux-3.0.3/arch/x86/platform/uv/tlb_uv.c linux-3.0.3/arch/x86/platform/uv/tlb_uv.c
---- linux-3.0.3/arch/x86/platform/uv/tlb_uv.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/platform/uv/tlb_uv.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c
+--- linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/olpc/olpc_dt.c       2011-08-29 22:31:19.000000000 -0400
+@@ -163,7 +163,7 @@ static struct of_pdt_ops prom_olpc_ops _
+       .getchild = olpc_dt_getchild,
+       .getsibling = olpc_dt_getsibling,
+       .pkg2path = olpc_dt_pkg2path,
+-};
++} __no_const;
+ 
+ void __init olpc_dt_build_devicetree(void)
+ {
+diff -urNp linux-3.0.4/arch/x86/platform/uv/tlb_uv.c linux-3.0.4/arch/x86/platform/uv/tlb_uv.c
+--- linux-3.0.4/arch/x86/platform/uv/tlb_uv.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/platform/uv/tlb_uv.c  2011-08-23 21:48:14.000000000 -0400
 @@ -373,6 +373,8 @@ static void reset_with_ipi(struct bau_ta
        cpumask_t mask;
        struct reset_args reset_args;
@@ -21090,9 +21106,9 @@ diff -urNp linux-3.0.3/arch/x86/platform/uv/tlb_uv.c linux-3.0.3/arch/x86/platfo
        reset_args.sender = sender;
        cpus_clear(mask);
        /* find a single cpu for each uvhub in this distribution mask */
-diff -urNp linux-3.0.3/arch/x86/power/cpu.c linux-3.0.3/arch/x86/power/cpu.c
---- linux-3.0.3/arch/x86/power/cpu.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/power/cpu.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/power/cpu.c linux-3.0.4/arch/x86/power/cpu.c
+--- linux-3.0.4/arch/x86/power/cpu.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/power/cpu.c   2011-08-23 21:47:55.000000000 -0400
 @@ -130,7 +130,7 @@ static void do_fpu_end(void)
  static void fix_processor_context(void)
  {
@@ -21112,9 +21128,9 @@ diff -urNp linux-3.0.3/arch/x86/power/cpu.c linux-3.0.3/arch/x86/power/cpu.c
  
        syscall_init();                         /* This sets MSR_*STAR and related */
  #endif
-diff -urNp linux-3.0.3/arch/x86/vdso/Makefile linux-3.0.3/arch/x86/vdso/Makefile
---- linux-3.0.3/arch/x86/vdso/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/vdso/Makefile 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/vdso/Makefile linux-3.0.4/arch/x86/vdso/Makefile
+--- linux-3.0.4/arch/x86/vdso/Makefile 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/vdso/Makefile 2011-08-23 21:47:55.000000000 -0400
 @@ -136,7 +136,7 @@ quiet_cmd_vdso = VDSO    $@
                       -Wl,-T,$(filter %.lds,$^) $(filter %.o,$^) && \
                 sh $(srctree)/$(src)/checkundef.sh '$(NM)' '$@'
@@ -21124,9 +21140,9 @@ diff -urNp linux-3.0.3/arch/x86/vdso/Makefile linux-3.0.3/arch/x86/vdso/Makefile
  GCOV_PROFILE := n
  
  #
-diff -urNp linux-3.0.3/arch/x86/vdso/vdso32-setup.c linux-3.0.3/arch/x86/vdso/vdso32-setup.c
---- linux-3.0.3/arch/x86/vdso/vdso32-setup.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/vdso/vdso32-setup.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/vdso/vdso32-setup.c linux-3.0.4/arch/x86/vdso/vdso32-setup.c
+--- linux-3.0.4/arch/x86/vdso/vdso32-setup.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/vdso/vdso32-setup.c   2011-08-23 21:47:55.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <asm/tlbflush.h>
  #include <asm/vdso.h>
@@ -21209,9 +21225,9 @@ diff -urNp linux-3.0.3/arch/x86/vdso/vdso32-setup.c linux-3.0.3/arch/x86/vdso/vd
                return &gate_vma;
        return NULL;
  }
-diff -urNp linux-3.0.3/arch/x86/vdso/vma.c linux-3.0.3/arch/x86/vdso/vma.c
---- linux-3.0.3/arch/x86/vdso/vma.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/vdso/vma.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/vdso/vma.c linux-3.0.4/arch/x86/vdso/vma.c
+--- linux-3.0.4/arch/x86/vdso/vma.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/vdso/vma.c    2011-08-23 21:47:55.000000000 -0400
 @@ -15,18 +15,19 @@
  #include <asm/proto.h>
  #include <asm/vdso.h>
@@ -21314,9 +21330,9 @@ diff -urNp linux-3.0.3/arch/x86/vdso/vma.c linux-3.0.3/arch/x86/vdso/vma.c
 -      return 0;
 -}
 -__setup("vdso=", vdso_setup);
-diff -urNp linux-3.0.3/arch/x86/xen/enlighten.c linux-3.0.3/arch/x86/xen/enlighten.c
---- linux-3.0.3/arch/x86/xen/enlighten.c       2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/enlighten.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/enlighten.c linux-3.0.4/arch/x86/xen/enlighten.c
+--- linux-3.0.4/arch/x86/xen/enlighten.c       2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/enlighten.c       2011-08-29 23:26:21.000000000 -0400
 @@ -85,8 +85,6 @@ EXPORT_SYMBOL_GPL(xen_start_info);
  
  struct shared_info xen_dummy_shared_info;
@@ -21389,10 +21405,10 @@ diff -urNp linux-3.0.3/arch/x86/xen/enlighten.c linux-3.0.3/arch/x86/xen/enlight
        xen_smp_init();
  
  #ifdef CONFIG_ACPI_NUMA
-diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
---- linux-3.0.3/arch/x86/xen/mmu.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/mmu.c     2011-08-24 18:10:12.000000000 -0400
-@@ -1679,6 +1679,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
+diff -urNp linux-3.0.4/arch/x86/xen/mmu.c linux-3.0.4/arch/x86/xen/mmu.c
+--- linux-3.0.4/arch/x86/xen/mmu.c     2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/mmu.c     2011-08-29 23:26:21.000000000 -0400
+@@ -1683,6 +1683,8 @@ pgd_t * __init xen_setup_kernel_pagetabl
        convert_pfn_mfn(init_level4_pgt);
        convert_pfn_mfn(level3_ident_pgt);
        convert_pfn_mfn(level3_kernel_pgt);
@@ -21401,7 +21417,7 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
  
        l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd);
        l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud);
-@@ -1697,7 +1699,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
+@@ -1701,7 +1703,10 @@ pgd_t * __init xen_setup_kernel_pagetabl
        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);
@@ -21412,7 +21428,7 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
        set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO);
        set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO);
  
-@@ -1909,6 +1914,7 @@ static void __init xen_post_allocator_in
+@@ -1913,6 +1918,7 @@ static void __init xen_post_allocator_in
        pv_mmu_ops.set_pud = xen_set_pud;
  #if PAGETABLE_LEVELS == 4
        pv_mmu_ops.set_pgd = xen_set_pgd;
@@ -21420,7 +21436,7 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
  #endif
  
        /* This will work as long as patching hasn't happened yet
-@@ -1990,6 +1996,7 @@ static const struct pv_mmu_ops xen_mmu_o
+@@ -1994,6 +2000,7 @@ static const struct pv_mmu_ops xen_mmu_o
        .pud_val = PV_CALLEE_SAVE(xen_pud_val),
        .make_pud = PV_CALLEE_SAVE(xen_make_pud),
        .set_pgd = xen_set_pgd_hyper,
@@ -21428,9 +21444,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/mmu.c linux-3.0.3/arch/x86/xen/mmu.c
  
        .alloc_pud = xen_alloc_pmd_init,
        .release_pud = xen_release_pmd_init,
-diff -urNp linux-3.0.3/arch/x86/xen/smp.c linux-3.0.3/arch/x86/xen/smp.c
---- linux-3.0.3/arch/x86/xen/smp.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/smp.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/smp.c linux-3.0.4/arch/x86/xen/smp.c
+--- linux-3.0.4/arch/x86/xen/smp.c     2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/smp.c     2011-08-29 23:26:21.000000000 -0400
 @@ -193,11 +193,6 @@ static void __init xen_smp_prepare_boot_
  {
        BUG_ON(smp_processor_id() != 0);
@@ -21475,9 +21491,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/smp.c linux-3.0.3/arch/x86/xen/smp.c
  #endif
        xen_setup_runstate_info(cpu);
        xen_setup_timer(cpu);
-diff -urNp linux-3.0.3/arch/x86/xen/xen-asm_32.S linux-3.0.3/arch/x86/xen/xen-asm_32.S
---- linux-3.0.3/arch/x86/xen/xen-asm_32.S      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/xen-asm_32.S      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/xen-asm_32.S linux-3.0.4/arch/x86/xen/xen-asm_32.S
+--- linux-3.0.4/arch/x86/xen/xen-asm_32.S      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/xen-asm_32.S      2011-08-23 21:47:55.000000000 -0400
 @@ -83,14 +83,14 @@ ENTRY(xen_iret)
        ESP_OFFSET=4    # bytes pushed onto stack
  
@@ -21499,9 +21515,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/xen-asm_32.S linux-3.0.3/arch/x86/xen/xen-as
  #else
        movl xen_vcpu, %eax
  #endif
-diff -urNp linux-3.0.3/arch/x86/xen/xen-head.S linux-3.0.3/arch/x86/xen/xen-head.S
---- linux-3.0.3/arch/x86/xen/xen-head.S        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/xen-head.S        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/xen-head.S linux-3.0.4/arch/x86/xen/xen-head.S
+--- linux-3.0.4/arch/x86/xen/xen-head.S        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/xen-head.S        2011-08-23 21:47:55.000000000 -0400
 @@ -19,6 +19,17 @@ ENTRY(startup_xen)
  #ifdef CONFIG_X86_32
        mov %esi,xen_start_info
@@ -21520,9 +21536,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/xen-head.S linux-3.0.3/arch/x86/xen/xen-head
  #else
        mov %rsi,xen_start_info
        mov $init_thread_union+THREAD_SIZE,%rsp
-diff -urNp linux-3.0.3/arch/x86/xen/xen-ops.h linux-3.0.3/arch/x86/xen/xen-ops.h
---- linux-3.0.3/arch/x86/xen/xen-ops.h 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/arch/x86/xen/xen-ops.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/arch/x86/xen/xen-ops.h linux-3.0.4/arch/x86/xen/xen-ops.h
+--- linux-3.0.4/arch/x86/xen/xen-ops.h 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/arch/x86/xen/xen-ops.h 2011-08-23 21:47:55.000000000 -0400
 @@ -10,8 +10,6 @@
  extern const char xen_hypervisor_callback[];
  extern const char xen_failsafe_callback[];
@@ -21532,9 +21548,9 @@ diff -urNp linux-3.0.3/arch/x86/xen/xen-ops.h linux-3.0.3/arch/x86/xen/xen-ops.h
  struct trap_info;
  void xen_copy_trap_info(struct trap_info *traps);
  
-diff -urNp linux-3.0.3/block/blk-iopoll.c linux-3.0.3/block/blk-iopoll.c
---- linux-3.0.3/block/blk-iopoll.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/blk-iopoll.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/blk-iopoll.c linux-3.0.4/block/blk-iopoll.c
+--- linux-3.0.4/block/blk-iopoll.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/blk-iopoll.c     2011-08-23 21:47:55.000000000 -0400
 @@ -77,7 +77,7 @@ void blk_iopoll_complete(struct blk_iopo
  }
  EXPORT_SYMBOL(blk_iopoll_complete);
@@ -21544,9 +21560,9 @@ diff -urNp linux-3.0.3/block/blk-iopoll.c linux-3.0.3/block/blk-iopoll.c
  {
        struct list_head *list = &__get_cpu_var(blk_cpu_iopoll);
        int rearm = 0, budget = blk_iopoll_budget;
-diff -urNp linux-3.0.3/block/blk-map.c linux-3.0.3/block/blk-map.c
---- linux-3.0.3/block/blk-map.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/blk-map.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/blk-map.c linux-3.0.4/block/blk-map.c
+--- linux-3.0.4/block/blk-map.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/blk-map.c        2011-08-23 21:47:55.000000000 -0400
 @@ -301,7 +301,7 @@ int blk_rq_map_kern(struct request_queue
        if (!len || !kbuf)
                return -EINVAL;
@@ -21556,9 +21572,9 @@ diff -urNp linux-3.0.3/block/blk-map.c linux-3.0.3/block/blk-map.c
        if (do_copy)
                bio = bio_copy_kern(q, kbuf, len, gfp_mask, reading);
        else
-diff -urNp linux-3.0.3/block/blk-softirq.c linux-3.0.3/block/blk-softirq.c
---- linux-3.0.3/block/blk-softirq.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/blk-softirq.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/blk-softirq.c linux-3.0.4/block/blk-softirq.c
+--- linux-3.0.4/block/blk-softirq.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/blk-softirq.c    2011-08-23 21:47:55.000000000 -0400
 @@ -17,7 +17,7 @@ static DEFINE_PER_CPU(struct list_head, 
   * Softirq action handler - move entries to local list and loop over them
   * while passing them to the queue registered handler.
@@ -21568,9 +21584,9 @@ diff -urNp linux-3.0.3/block/blk-softirq.c linux-3.0.3/block/blk-softirq.c
  {
        struct list_head *cpu_list, local_list;
  
-diff -urNp linux-3.0.3/block/bsg.c linux-3.0.3/block/bsg.c
---- linux-3.0.3/block/bsg.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/bsg.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/bsg.c linux-3.0.4/block/bsg.c
+--- linux-3.0.4/block/bsg.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/bsg.c    2011-08-23 21:47:55.000000000 -0400
 @@ -176,16 +176,24 @@ static int blk_fill_sgv4_hdr_rq(struct r
                                struct sg_io_v4 *hdr, struct bsg_device *bd,
                                fmode_t has_write_perm)
@@ -21598,9 +21614,9 @@ diff -urNp linux-3.0.3/block/bsg.c linux-3.0.3/block/bsg.c
        if (hdr->subprotocol == BSG_SUB_PROTOCOL_SCSI_CMD) {
                if (blk_verify_command(rq->cmd, has_write_perm))
                        return -EPERM;
-diff -urNp linux-3.0.3/block/scsi_ioctl.c linux-3.0.3/block/scsi_ioctl.c
---- linux-3.0.3/block/scsi_ioctl.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/block/scsi_ioctl.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/block/scsi_ioctl.c linux-3.0.4/block/scsi_ioctl.c
+--- linux-3.0.4/block/scsi_ioctl.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/block/scsi_ioctl.c     2011-08-23 21:47:55.000000000 -0400
 @@ -222,8 +222,20 @@ EXPORT_SYMBOL(blk_verify_command);
  static int blk_fill_sghdr_rq(struct request_queue *q, struct request *rq,
                             struct sg_io_hdr *hdr, fmode_t mode)
@@ -21652,9 +21668,9 @@ diff -urNp linux-3.0.3/block/scsi_ioctl.c linux-3.0.3/block/scsi_ioctl.c
        if (in_len && copy_from_user(buffer, sic->data + cmdlen, in_len))
                goto error;
  
-diff -urNp linux-3.0.3/crypto/cryptd.c linux-3.0.3/crypto/cryptd.c
---- linux-3.0.3/crypto/cryptd.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/crypto/cryptd.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/crypto/cryptd.c linux-3.0.4/crypto/cryptd.c
+--- linux-3.0.4/crypto/cryptd.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/crypto/cryptd.c        2011-08-23 21:47:55.000000000 -0400
 @@ -63,7 +63,7 @@ struct cryptd_blkcipher_ctx {
  
  struct cryptd_blkcipher_request_ctx {
@@ -21673,9 +21689,9 @@ diff -urNp linux-3.0.3/crypto/cryptd.c linux-3.0.3/crypto/cryptd.c
  
  static void cryptd_queue_worker(struct work_struct *work);
  
-diff -urNp linux-3.0.3/crypto/gf128mul.c linux-3.0.3/crypto/gf128mul.c
---- linux-3.0.3/crypto/gf128mul.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/crypto/gf128mul.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/crypto/gf128mul.c linux-3.0.4/crypto/gf128mul.c
+--- linux-3.0.4/crypto/gf128mul.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/crypto/gf128mul.c      2011-08-23 21:47:55.000000000 -0400
 @@ -182,7 +182,7 @@ void gf128mul_lle(be128 *r, const be128 
        for (i = 0; i < 7; ++i)
                gf128mul_x_lle(&p[i + 1], &p[i]);
@@ -21694,9 +21710,9 @@ diff -urNp linux-3.0.3/crypto/gf128mul.c linux-3.0.3/crypto/gf128mul.c
        for (i = 0;;) {
                u8 ch = ((u8 *)b)[i];
  
-diff -urNp linux-3.0.3/crypto/serpent.c linux-3.0.3/crypto/serpent.c
---- linux-3.0.3/crypto/serpent.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/crypto/serpent.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/crypto/serpent.c linux-3.0.4/crypto/serpent.c
+--- linux-3.0.4/crypto/serpent.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/crypto/serpent.c       2011-08-23 21:48:14.000000000 -0400
 @@ -224,6 +224,8 @@ static int serpent_setkey(struct crypto_
        u32 r0,r1,r2,r3,r4;
        int i;
@@ -21706,9 +21722,9 @@ diff -urNp linux-3.0.3/crypto/serpent.c linux-3.0.3/crypto/serpent.c
        /* Copy key, add padding */
  
        for (i = 0; i < keylen; ++i)
-diff -urNp linux-3.0.3/Documentation/dontdiff linux-3.0.3/Documentation/dontdiff
---- linux-3.0.3/Documentation/dontdiff 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/Documentation/dontdiff 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/Documentation/dontdiff linux-3.0.4/Documentation/dontdiff
+--- linux-3.0.4/Documentation/dontdiff 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/Documentation/dontdiff 2011-08-23 21:47:55.000000000 -0400
 @@ -5,6 +5,7 @@
  *.cis
  *.cpio
@@ -21819,9 +21835,9 @@ diff -urNp linux-3.0.3/Documentation/dontdiff linux-3.0.3/Documentation/dontdiff
  wakeup.bin
  wakeup.elf
  wakeup.lds
-diff -urNp linux-3.0.3/Documentation/kernel-parameters.txt linux-3.0.3/Documentation/kernel-parameters.txt
---- linux-3.0.3/Documentation/kernel-parameters.txt    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/Documentation/kernel-parameters.txt    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/Documentation/kernel-parameters.txt linux-3.0.4/Documentation/kernel-parameters.txt
+--- linux-3.0.4/Documentation/kernel-parameters.txt    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/Documentation/kernel-parameters.txt    2011-08-23 21:47:55.000000000 -0400
 @@ -1883,6 +1883,13 @@ bytes respectively. Such letter suffixes
                        the specified number of seconds.  This is to be used if
                        your oopses keep scrolling off the screen.
@@ -21836,9 +21852,9 @@ diff -urNp linux-3.0.3/Documentation/kernel-parameters.txt linux-3.0.3/Documenta
        pcbit=          [HW,ISDN]
  
        pcd.            [PARIDE]
-diff -urNp linux-3.0.3/drivers/acpi/apei/cper.c linux-3.0.3/drivers/acpi/apei/cper.c
---- linux-3.0.3/drivers/acpi/apei/cper.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/apei/cper.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/apei/cper.c linux-3.0.4/drivers/acpi/apei/cper.c
+--- linux-3.0.4/drivers/acpi/apei/cper.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/apei/cper.c       2011-08-23 21:47:55.000000000 -0400
 @@ -38,12 +38,12 @@
   */
  u64 cper_next_record_id(void)
@@ -21856,9 +21872,9 @@ diff -urNp linux-3.0.3/drivers/acpi/apei/cper.c linux-3.0.3/drivers/acpi/apei/cp
  }
  EXPORT_SYMBOL_GPL(cper_next_record_id);
  
-diff -urNp linux-3.0.3/drivers/acpi/ec_sys.c linux-3.0.3/drivers/acpi/ec_sys.c
---- linux-3.0.3/drivers/acpi/ec_sys.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/ec_sys.c  2011-08-24 19:06:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/ec_sys.c linux-3.0.4/drivers/acpi/ec_sys.c
+--- linux-3.0.4/drivers/acpi/ec_sys.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/ec_sys.c  2011-08-24 19:06:55.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/kernel.h>
  #include <linux/acpi.h>
@@ -21908,9 +21924,9 @@ diff -urNp linux-3.0.3/drivers/acpi/ec_sys.c linux-3.0.3/drivers/acpi/ec_sys.c
                err = ec_write(*off, byte_write);
                if (err)
                        return err;
-diff -urNp linux-3.0.3/drivers/acpi/proc.c linux-3.0.3/drivers/acpi/proc.c
---- linux-3.0.3/drivers/acpi/proc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/proc.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/proc.c linux-3.0.4/drivers/acpi/proc.c
+--- linux-3.0.4/drivers/acpi/proc.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/proc.c    2011-08-23 21:47:55.000000000 -0400
 @@ -342,19 +342,13 @@ acpi_system_write_wakeup_device(struct f
                                size_t count, loff_t * ppos)
  {
@@ -21945,9 +21961,9 @@ diff -urNp linux-3.0.3/drivers/acpi/proc.c linux-3.0.3/drivers/acpi/proc.c
                        if (device_can_wakeup(&dev->dev)) {
                                bool enable = !device_may_wakeup(&dev->dev);
                                device_set_wakeup_enable(&dev->dev, enable);
-diff -urNp linux-3.0.3/drivers/acpi/processor_driver.c linux-3.0.3/drivers/acpi/processor_driver.c
---- linux-3.0.3/drivers/acpi/processor_driver.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/acpi/processor_driver.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/acpi/processor_driver.c linux-3.0.4/drivers/acpi/processor_driver.c
+--- linux-3.0.4/drivers/acpi/processor_driver.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/acpi/processor_driver.c        2011-08-23 21:47:55.000000000 -0400
 @@ -473,7 +473,7 @@ static int __cpuinit acpi_processor_add(
                return 0;
  #endif
@@ -21957,9 +21973,9 @@ diff -urNp linux-3.0.3/drivers/acpi/processor_driver.c linux-3.0.3/drivers/acpi/
  
        /*
         * Buggy BIOS check
-diff -urNp linux-3.0.3/drivers/ata/libata-core.c linux-3.0.3/drivers/ata/libata-core.c
---- linux-3.0.3/drivers/ata/libata-core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ata/libata-core.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ata/libata-core.c linux-3.0.4/drivers/ata/libata-core.c
+--- linux-3.0.4/drivers/ata/libata-core.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ata/libata-core.c      2011-08-23 21:47:55.000000000 -0400
 @@ -4753,7 +4753,7 @@ void ata_qc_free(struct ata_queued_cmd *
        struct ata_port *ap;
        unsigned int tag;
@@ -21997,9 +22013,9 @@ diff -urNp linux-3.0.3/drivers/ata/libata-core.c linux-3.0.3/drivers/ata/libata-
        spin_unlock(&lock);
  }
  
-diff -urNp linux-3.0.3/drivers/ata/libata-eh.c linux-3.0.3/drivers/ata/libata-eh.c
---- linux-3.0.3/drivers/ata/libata-eh.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ata/libata-eh.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ata/libata-eh.c linux-3.0.4/drivers/ata/libata-eh.c
+--- linux-3.0.4/drivers/ata/libata-eh.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ata/libata-eh.c        2011-08-23 21:48:14.000000000 -0400
 @@ -2518,6 +2518,8 @@ void ata_eh_report(struct ata_port *ap)
  {
        struct ata_link *link;
@@ -22009,9 +22025,9 @@ diff -urNp linux-3.0.3/drivers/ata/libata-eh.c linux-3.0.3/drivers/ata/libata-eh
        ata_for_each_link(link, ap, HOST_FIRST)
                ata_eh_link_report(link);
  }
-diff -urNp linux-3.0.3/drivers/ata/pata_arasan_cf.c linux-3.0.3/drivers/ata/pata_arasan_cf.c
---- linux-3.0.3/drivers/ata/pata_arasan_cf.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ata/pata_arasan_cf.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ata/pata_arasan_cf.c linux-3.0.4/drivers/ata/pata_arasan_cf.c
+--- linux-3.0.4/drivers/ata/pata_arasan_cf.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ata/pata_arasan_cf.c   2011-08-23 21:47:55.000000000 -0400
 @@ -862,7 +862,9 @@ static int __devinit arasan_cf_probe(str
        /* Handle platform specific quirks */
        if (pdata->quirk) {
@@ -22023,9 +22039,9 @@ diff -urNp linux-3.0.3/drivers/ata/pata_arasan_cf.c linux-3.0.3/drivers/ata/pata
                        ap->pio_mask = 0;
                }
                if (pdata->quirk & CF_BROKEN_MWDMA)
-diff -urNp linux-3.0.3/drivers/atm/adummy.c linux-3.0.3/drivers/atm/adummy.c
---- linux-3.0.3/drivers/atm/adummy.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/adummy.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/adummy.c linux-3.0.4/drivers/atm/adummy.c
+--- linux-3.0.4/drivers/atm/adummy.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/adummy.c   2011-08-23 21:47:55.000000000 -0400
 @@ -114,7 +114,7 @@ adummy_send(struct atm_vcc *vcc, struct 
                vcc->pop(vcc, skb);
        else
@@ -22035,9 +22051,9 @@ diff -urNp linux-3.0.3/drivers/atm/adummy.c linux-3.0.3/drivers/atm/adummy.c
  
        return 0;
  }
-diff -urNp linux-3.0.3/drivers/atm/ambassador.c linux-3.0.3/drivers/atm/ambassador.c
---- linux-3.0.3/drivers/atm/ambassador.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/ambassador.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/ambassador.c linux-3.0.4/drivers/atm/ambassador.c
+--- linux-3.0.4/drivers/atm/ambassador.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/ambassador.c       2011-08-23 21:47:55.000000000 -0400
 @@ -454,7 +454,7 @@ static void tx_complete (amb_dev * dev, 
    PRINTD (DBG_FLOW|DBG_TX, "tx_complete %p %p", dev, tx);
    
@@ -22074,9 +22090,9 @@ diff -urNp linux-3.0.3/drivers/atm/ambassador.c linux-3.0.3/drivers/atm/ambassad
      return -ENOMEM; // ?
    }
    
-diff -urNp linux-3.0.3/drivers/atm/atmtcp.c linux-3.0.3/drivers/atm/atmtcp.c
---- linux-3.0.3/drivers/atm/atmtcp.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/atmtcp.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/atmtcp.c linux-3.0.4/drivers/atm/atmtcp.c
+--- linux-3.0.4/drivers/atm/atmtcp.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/atmtcp.c   2011-08-23 21:47:55.000000000 -0400
 @@ -207,7 +207,7 @@ static int atmtcp_v_send(struct atm_vcc 
                if (vcc->pop) vcc->pop(vcc,skb);
                else dev_kfree_skb(skb);
@@ -22126,9 +22142,9 @@ diff -urNp linux-3.0.3/drivers/atm/atmtcp.c linux-3.0.3/drivers/atm/atmtcp.c
  done:
        if (vcc->pop) vcc->pop(vcc,skb);
        else dev_kfree_skb(skb);
-diff -urNp linux-3.0.3/drivers/atm/eni.c linux-3.0.3/drivers/atm/eni.c
---- linux-3.0.3/drivers/atm/eni.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/eni.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/eni.c linux-3.0.4/drivers/atm/eni.c
+--- linux-3.0.4/drivers/atm/eni.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/eni.c      2011-08-23 21:47:55.000000000 -0400
 @@ -526,7 +526,7 @@ static int rx_aal0(struct atm_vcc *vcc)
                DPRINTK(DEV_LABEL "(itf %d): trashing empty cell\n",
                    vcc->dev->number);
@@ -22174,9 +22190,9 @@ diff -urNp linux-3.0.3/drivers/atm/eni.c linux-3.0.3/drivers/atm/eni.c
                wake_up(&eni_dev->tx_wait);
  dma_complete++;
        }
-diff -urNp linux-3.0.3/drivers/atm/firestream.c linux-3.0.3/drivers/atm/firestream.c
---- linux-3.0.3/drivers/atm/firestream.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/firestream.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/firestream.c linux-3.0.4/drivers/atm/firestream.c
+--- linux-3.0.4/drivers/atm/firestream.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/firestream.c       2011-08-23 21:47:55.000000000 -0400
 @@ -749,7 +749,7 @@ static void process_txdone_queue (struct
                                }
                        }
@@ -22210,9 +22226,9 @@ diff -urNp linux-3.0.3/drivers/atm/firestream.c linux-3.0.3/drivers/atm/firestre
                        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-3.0.3/drivers/atm/fore200e.c linux-3.0.3/drivers/atm/fore200e.c
---- linux-3.0.3/drivers/atm/fore200e.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/fore200e.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/fore200e.c linux-3.0.4/drivers/atm/fore200e.c
+--- linux-3.0.4/drivers/atm/fore200e.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/fore200e.c 2011-08-23 21:47:55.000000000 -0400
 @@ -933,9 +933,9 @@ fore200e_tx_irq(struct fore200e* fore200
  #endif
                /* check error condition */
@@ -22269,9 +22285,9 @@ diff -urNp linux-3.0.3/drivers/atm/fore200e.c linux-3.0.3/drivers/atm/fore200e.c
  
            fore200e->tx_sat++;
            DPRINTK(2, "tx queue of device %s is saturated, PDU dropped - heartbeat is %08x\n",
-diff -urNp linux-3.0.3/drivers/atm/he.c linux-3.0.3/drivers/atm/he.c
---- linux-3.0.3/drivers/atm/he.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/he.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/he.c linux-3.0.4/drivers/atm/he.c
+--- linux-3.0.4/drivers/atm/he.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/he.c       2011-08-23 21:47:55.000000000 -0400
 @@ -1709,7 +1709,7 @@ he_service_rbrq(struct he_dev *he_dev, i
  
                if (RBRQ_HBUF_ERR(he_dev->rbrq_head)) {
@@ -22353,9 +22369,9 @@ diff -urNp linux-3.0.3/drivers/atm/he.c linux-3.0.3/drivers/atm/he.c
  
        return 0;
  }
-diff -urNp linux-3.0.3/drivers/atm/horizon.c linux-3.0.3/drivers/atm/horizon.c
---- linux-3.0.3/drivers/atm/horizon.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/horizon.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/horizon.c linux-3.0.4/drivers/atm/horizon.c
+--- linux-3.0.4/drivers/atm/horizon.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/horizon.c  2011-08-23 21:47:55.000000000 -0400
 @@ -1034,7 +1034,7 @@ static void rx_schedule (hrz_dev * dev, 
        {
          struct atm_vcc * vcc = ATM_SKB(skb)->vcc;
@@ -22374,9 +22390,9 @@ diff -urNp linux-3.0.3/drivers/atm/horizon.c linux-3.0.3/drivers/atm/horizon.c
        
        // free the skb
        hrz_kfree_skb (skb);
-diff -urNp linux-3.0.3/drivers/atm/idt77252.c linux-3.0.3/drivers/atm/idt77252.c
---- linux-3.0.3/drivers/atm/idt77252.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/idt77252.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/idt77252.c linux-3.0.4/drivers/atm/idt77252.c
+--- linux-3.0.4/drivers/atm/idt77252.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/idt77252.c 2011-08-23 21:47:55.000000000 -0400
 @@ -811,7 +811,7 @@ drain_scq(struct idt77252_dev *card, str
                else
                        dev_kfree_skb(skb);
@@ -22531,9 +22547,9 @@ diff -urNp linux-3.0.3/drivers/atm/idt77252.c linux-3.0.3/drivers/atm/idt77252.c
                return -ENOMEM;
        }
        atomic_add(skb->truesize, &sk_atm(vcc)->sk_wmem_alloc);
-diff -urNp linux-3.0.3/drivers/atm/iphase.c linux-3.0.3/drivers/atm/iphase.c
---- linux-3.0.3/drivers/atm/iphase.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/iphase.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/iphase.c linux-3.0.4/drivers/atm/iphase.c
+--- linux-3.0.4/drivers/atm/iphase.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/iphase.c   2011-08-23 21:47:55.000000000 -0400
 @@ -1120,7 +1120,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))  
@@ -22630,9 +22646,9 @@ diff -urNp linux-3.0.3/drivers/atm/iphase.c linux-3.0.3/drivers/atm/iphase.c
            if (iavcc->vc_desc_cnt > 10) {
               vcc->tx_quota =  vcc->tx_quota * 3 / 4;
              printk("Tx1:  vcc->tx_quota = %d \n", (u32)vcc->tx_quota );
-diff -urNp linux-3.0.3/drivers/atm/lanai.c linux-3.0.3/drivers/atm/lanai.c
---- linux-3.0.3/drivers/atm/lanai.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/lanai.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/lanai.c linux-3.0.4/drivers/atm/lanai.c
+--- linux-3.0.4/drivers/atm/lanai.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/lanai.c    2011-08-23 21:47:55.000000000 -0400
 @@ -1303,7 +1303,7 @@ static void lanai_send_one_aal5(struct l
        vcc_tx_add_aal5_trailer(lvcc, skb->len, 0, 0);
        lanai_endtx(lanai, lvcc);
@@ -22687,9 +22703,9 @@ diff -urNp linux-3.0.3/drivers/atm/lanai.c linux-3.0.3/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-3.0.3/drivers/atm/nicstar.c linux-3.0.3/drivers/atm/nicstar.c
---- linux-3.0.3/drivers/atm/nicstar.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/nicstar.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/nicstar.c linux-3.0.4/drivers/atm/nicstar.c
+--- linux-3.0.4/drivers/atm/nicstar.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/nicstar.c  2011-08-23 21:47:55.000000000 -0400
 @@ -1654,7 +1654,7 @@ static int ns_send(struct atm_vcc *vcc, 
        if ((vc = (vc_map *) vcc->dev_data) == NULL) {
                printk("nicstar%d: vcc->dev_data == NULL on ns_send().\n",
@@ -22891,9 +22907,9 @@ diff -urNp linux-3.0.3/drivers/atm/nicstar.c linux-3.0.3/drivers/atm/nicstar.c
                        }
                }
  
-diff -urNp linux-3.0.3/drivers/atm/solos-pci.c linux-3.0.3/drivers/atm/solos-pci.c
---- linux-3.0.3/drivers/atm/solos-pci.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/solos-pci.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/solos-pci.c linux-3.0.4/drivers/atm/solos-pci.c
+--- linux-3.0.4/drivers/atm/solos-pci.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/solos-pci.c        2011-08-23 21:48:14.000000000 -0400
 @@ -714,7 +714,7 @@ void solos_bh(unsigned long card_arg)
                                }
                                atm_charge(vcc, skb->truesize);
@@ -22921,9 +22937,9 @@ diff -urNp linux-3.0.3/drivers/atm/solos-pci.c linux-3.0.3/drivers/atm/solos-pci
                                solos_pop(vcc, oldskb);
                        } else
                                dev_kfree_skb_irq(oldskb);
-diff -urNp linux-3.0.3/drivers/atm/suni.c linux-3.0.3/drivers/atm/suni.c
---- linux-3.0.3/drivers/atm/suni.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/suni.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/suni.c linux-3.0.4/drivers/atm/suni.c
+--- linux-3.0.4/drivers/atm/suni.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/suni.c     2011-08-23 21:47:55.000000000 -0400
 @@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(sunis_lock);
  
  
@@ -22935,9 +22951,9 @@ diff -urNp linux-3.0.3/drivers/atm/suni.c linux-3.0.3/drivers/atm/suni.c
  
  
  static void suni_hz(unsigned long from_timer)
-diff -urNp linux-3.0.3/drivers/atm/uPD98402.c linux-3.0.3/drivers/atm/uPD98402.c
---- linux-3.0.3/drivers/atm/uPD98402.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/uPD98402.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/uPD98402.c linux-3.0.4/drivers/atm/uPD98402.c
+--- linux-3.0.4/drivers/atm/uPD98402.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/uPD98402.c 2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@ static int fetch_stats(struct atm_dev *d
        struct sonet_stats tmp;
        int error = 0;
@@ -22982,9 +22998,9 @@ diff -urNp linux-3.0.3/drivers/atm/uPD98402.c linux-3.0.3/drivers/atm/uPD98402.c
        return 0;
  }
  
-diff -urNp linux-3.0.3/drivers/atm/zatm.c linux-3.0.3/drivers/atm/zatm.c
---- linux-3.0.3/drivers/atm/zatm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/atm/zatm.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/atm/zatm.c linux-3.0.4/drivers/atm/zatm.c
+--- linux-3.0.4/drivers/atm/zatm.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/atm/zatm.c     2011-08-23 21:47:55.000000000 -0400
 @@ -459,7 +459,7 @@ printk("dummy: 0x%08lx, 0x%08lx\n",dummy
                }
                if (!size) {
@@ -23012,9 +23028,9 @@ diff -urNp linux-3.0.3/drivers/atm/zatm.c linux-3.0.3/drivers/atm/zatm.c
        wake_up(&zatm_vcc->tx_wait);
  }
  
-diff -urNp linux-3.0.3/drivers/base/power/wakeup.c linux-3.0.3/drivers/base/power/wakeup.c
---- linux-3.0.3/drivers/base/power/wakeup.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/base/power/wakeup.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/base/power/wakeup.c linux-3.0.4/drivers/base/power/wakeup.c
+--- linux-3.0.4/drivers/base/power/wakeup.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/base/power/wakeup.c    2011-08-23 21:47:55.000000000 -0400
 @@ -29,14 +29,14 @@ bool events_check_enabled;
   * They need to be modified together atomically, so it's better to use one
   * atomic variable to hold them both.
@@ -23050,9 +23066,9 @@ diff -urNp linux-3.0.3/drivers/base/power/wakeup.c linux-3.0.3/drivers/base/powe
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/block/cciss.c linux-3.0.3/drivers/block/cciss.c
---- linux-3.0.3/drivers/block/cciss.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/cciss.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cciss.c linux-3.0.4/drivers/block/cciss.c
+--- linux-3.0.4/drivers/block/cciss.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/cciss.c  2011-08-23 21:48:14.000000000 -0400
 @@ -1179,6 +1179,8 @@ static int cciss_ioctl32_passthru(struct
        int err;
        u32 cp;
@@ -23176,9 +23192,9 @@ diff -urNp linux-3.0.3/drivers/block/cciss.c linux-3.0.3/drivers/block/cciss.c
        free_irq(h->intr[PERF_MODE_INT], h);
  }
  
-diff -urNp linux-3.0.3/drivers/block/cciss.h linux-3.0.3/drivers/block/cciss.h
---- linux-3.0.3/drivers/block/cciss.h  2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/block/cciss.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cciss.h linux-3.0.4/drivers/block/cciss.h
+--- linux-3.0.4/drivers/block/cciss.h  2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/block/cciss.h  2011-08-23 21:47:55.000000000 -0400
 @@ -100,7 +100,7 @@ struct ctlr_info
        /* information about each logical volume */
        drive_info_struct *drv[CISS_MAX_LUN];
@@ -23188,9 +23204,9 @@ diff -urNp linux-3.0.3/drivers/block/cciss.h linux-3.0.3/drivers/block/cciss.h
  
        /* queue and queue Info */ 
        struct list_head reqQ;
-diff -urNp linux-3.0.3/drivers/block/cpqarray.c linux-3.0.3/drivers/block/cpqarray.c
---- linux-3.0.3/drivers/block/cpqarray.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/cpqarray.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cpqarray.c linux-3.0.4/drivers/block/cpqarray.c
+--- linux-3.0.4/drivers/block/cpqarray.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/cpqarray.c       2011-08-23 21:48:14.000000000 -0400
 @@ -404,7 +404,7 @@ static int __devinit cpqarray_register_c
        if (register_blkdev(COMPAQ_SMART2_MAJOR+i, hba[i]->devname)) {
                goto Enomem4;
@@ -23316,9 +23332,9 @@ diff -urNp linux-3.0.3/drivers/block/cpqarray.c linux-3.0.3/drivers/block/cpqarr
                if (done == 0) {
                        udelay(10);     /* a short fixed delay */
                } else
-diff -urNp linux-3.0.3/drivers/block/cpqarray.h linux-3.0.3/drivers/block/cpqarray.h
---- linux-3.0.3/drivers/block/cpqarray.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/cpqarray.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/cpqarray.h linux-3.0.4/drivers/block/cpqarray.h
+--- linux-3.0.4/drivers/block/cpqarray.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/cpqarray.h       2011-08-23 21:47:55.000000000 -0400
 @@ -99,7 +99,7 @@ struct ctlr_info {
        drv_info_t      drv[NWD];
        struct proc_dir_entry *proc;
@@ -23328,9 +23344,9 @@ diff -urNp linux-3.0.3/drivers/block/cpqarray.h linux-3.0.3/drivers/block/cpqarr
  
        cmdlist_t *reqQ;
        cmdlist_t *cmpQ;
-diff -urNp linux-3.0.3/drivers/block/DAC960.c linux-3.0.3/drivers/block/DAC960.c
---- linux-3.0.3/drivers/block/DAC960.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/DAC960.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/DAC960.c linux-3.0.4/drivers/block/DAC960.c
+--- linux-3.0.4/drivers/block/DAC960.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/DAC960.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1980,6 +1980,8 @@ static bool DAC960_V1_ReadDeviceConfigur
    unsigned long flags;
    int Channel, TargetID;
@@ -23340,9 +23356,9 @@ diff -urNp linux-3.0.3/drivers/block/DAC960.c linux-3.0.3/drivers/block/DAC960.c
    if (!init_dma_loaf(Controller->PCIDevice, &local_dma, 
                DAC960_V1_MaxChannels*(sizeof(DAC960_V1_DCDB_T) +
                        sizeof(DAC960_SCSI_Inquiry_T) +
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_int.h linux-3.0.3/drivers/block/drbd/drbd_int.h
---- linux-3.0.3/drivers/block/drbd/drbd_int.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_int.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_int.h linux-3.0.4/drivers/block/drbd/drbd_int.h
+--- linux-3.0.4/drivers/block/drbd/drbd_int.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_int.h  2011-08-23 21:47:55.000000000 -0400
 @@ -737,7 +737,7 @@ struct drbd_request;
  struct drbd_epoch {
        struct list_head list;
@@ -23361,9 +23377,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_int.h linux-3.0.3/drivers/block/d
        unsigned int peer_seq;
        spinlock_t peer_seq_lock;
        unsigned int minor;
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_main.c linux-3.0.3/drivers/block/drbd/drbd_main.c
---- linux-3.0.3/drivers/block/drbd/drbd_main.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_main.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_main.c linux-3.0.4/drivers/block/drbd/drbd_main.c
+--- linux-3.0.4/drivers/block/drbd/drbd_main.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_main.c 2011-08-23 21:47:55.000000000 -0400
 @@ -2397,7 +2397,7 @@ static int _drbd_send_ack(struct drbd_co
        p.sector   = sector;
        p.block_id = block_id;
@@ -23402,9 +23418,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_main.c linux-3.0.3/drivers/block/
        mdev->al_writ_cnt  =
        mdev->bm_writ_cnt  =
        mdev->read_cnt     =
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_nl.c linux-3.0.3/drivers/block/drbd/drbd_nl.c
---- linux-3.0.3/drivers/block/drbd/drbd_nl.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_nl.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_nl.c linux-3.0.4/drivers/block/drbd/drbd_nl.c
+--- linux-3.0.4/drivers/block/drbd/drbd_nl.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_nl.c   2011-08-23 21:47:55.000000000 -0400
 @@ -2359,7 +2359,7 @@ static void drbd_connector_callback(stru
        module_put(THIS_MODULE);
  }
@@ -23450,9 +23466,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_nl.c linux-3.0.3/drivers/block/dr
        cn_reply->ack = 0; /* not used here. */
        cn_reply->len = sizeof(struct drbd_nl_cfg_reply) +
                (int)((char *)tl - (char *)reply->tag_list);
-diff -urNp linux-3.0.3/drivers/block/drbd/drbd_receiver.c linux-3.0.3/drivers/block/drbd/drbd_receiver.c
---- linux-3.0.3/drivers/block/drbd/drbd_receiver.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/drbd/drbd_receiver.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/drbd/drbd_receiver.c linux-3.0.4/drivers/block/drbd/drbd_receiver.c
+--- linux-3.0.4/drivers/block/drbd/drbd_receiver.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/drbd/drbd_receiver.c     2011-08-23 21:47:55.000000000 -0400
 @@ -894,7 +894,7 @@ retry:
        sock->sk->sk_sndtimeo = mdev->net_conf->timeout*HZ/10;
        sock->sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT;
@@ -23538,9 +23554,9 @@ diff -urNp linux-3.0.3/drivers/block/drbd/drbd_receiver.c linux-3.0.3/drivers/bl
        D_ASSERT(list_empty(&mdev->current_epoch->list));
  }
  
-diff -urNp linux-3.0.3/drivers/block/nbd.c linux-3.0.3/drivers/block/nbd.c
---- linux-3.0.3/drivers/block/nbd.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/block/nbd.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/block/nbd.c linux-3.0.4/drivers/block/nbd.c
+--- linux-3.0.4/drivers/block/nbd.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/block/nbd.c    2011-08-23 21:48:14.000000000 -0400
 @@ -157,6 +157,8 @@ static int sock_xmit(struct nbd_device *
        struct kvec iov;
        sigset_t blocked, oldset;
@@ -23559,9 +23575,9 @@ diff -urNp linux-3.0.3/drivers/block/nbd.c linux-3.0.3/drivers/block/nbd.c
        switch (cmd) {
        case NBD_DISCONNECT: {
                struct request sreq;
-diff -urNp linux-3.0.3/drivers/char/agp/frontend.c linux-3.0.3/drivers/char/agp/frontend.c
---- linux-3.0.3/drivers/char/agp/frontend.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/agp/frontend.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/agp/frontend.c linux-3.0.4/drivers/char/agp/frontend.c
+--- linux-3.0.4/drivers/char/agp/frontend.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/agp/frontend.c    2011-08-23 21:47:55.000000000 -0400
 @@ -817,7 +817,7 @@ static int agpioc_reserve_wrap(struct ag
        if (copy_from_user(&reserve, arg, sizeof(struct agp_region)))
                return -EFAULT;
@@ -23571,9 +23587,9 @@ diff -urNp linux-3.0.3/drivers/char/agp/frontend.c linux-3.0.3/drivers/char/agp/
                return -EFAULT;
  
        client = agp_find_client_by_pid(reserve.pid);
-diff -urNp linux-3.0.3/drivers/char/briq_panel.c linux-3.0.3/drivers/char/briq_panel.c
---- linux-3.0.3/drivers/char/briq_panel.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/briq_panel.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/briq_panel.c linux-3.0.4/drivers/char/briq_panel.c
+--- linux-3.0.4/drivers/char/briq_panel.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/briq_panel.c      2011-08-23 21:48:14.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/types.h>
  #include <linux/errno.h>
@@ -23615,9 +23631,9 @@ diff -urNp linux-3.0.3/drivers/char/briq_panel.c linux-3.0.3/drivers/char/briq_p
  
        return len;
  }
-diff -urNp linux-3.0.3/drivers/char/genrtc.c linux-3.0.3/drivers/char/genrtc.c
---- linux-3.0.3/drivers/char/genrtc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/genrtc.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/genrtc.c linux-3.0.4/drivers/char/genrtc.c
+--- linux-3.0.4/drivers/char/genrtc.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/genrtc.c  2011-08-23 21:48:14.000000000 -0400
 @@ -273,6 +273,7 @@ static int gen_rtc_ioctl(struct file *fi
        switch (cmd) {
  
@@ -23626,9 +23642,9 @@ diff -urNp linux-3.0.3/drivers/char/genrtc.c linux-3.0.3/drivers/char/genrtc.c
            if (get_rtc_pll(&pll))
                    return -EINVAL;
            else
-diff -urNp linux-3.0.3/drivers/char/hpet.c linux-3.0.3/drivers/char/hpet.c
---- linux-3.0.3/drivers/char/hpet.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/hpet.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/hpet.c linux-3.0.4/drivers/char/hpet.c
+--- linux-3.0.4/drivers/char/hpet.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/hpet.c    2011-08-23 21:47:55.000000000 -0400
 @@ -572,7 +572,7 @@ static inline unsigned long hpet_time_di
  }
  
@@ -23638,9 +23654,9 @@ diff -urNp linux-3.0.3/drivers/char/hpet.c linux-3.0.3/drivers/char/hpet.c
                  struct hpet_info *info)
  {
        struct hpet_timer __iomem *timer;
-diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c
---- linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c
+--- linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/ipmi/ipmi_msghandler.c    2011-08-23 21:48:14.000000000 -0400
 @@ -415,7 +415,7 @@ struct ipmi_smi {
        struct proc_dir_entry *proc_dir;
        char                  proc_dir_name[10];
@@ -23680,9 +23696,9 @@ diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_msghandler.c linux-3.0.3/drivers/c
        si = (struct ipmi_system_interface_addr *) &addr;
        si->addr_type = IPMI_SYSTEM_INTERFACE_ADDR_TYPE;
        si->channel = IPMI_BMC_CHANNEL;
-diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c
---- linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c
+--- linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/ipmi/ipmi_si_intf.c       2011-08-23 21:47:55.000000000 -0400
 @@ -277,7 +277,7 @@ struct smi_info {
        unsigned char slave_addr;
  
@@ -23713,9 +23729,9 @@ diff -urNp linux-3.0.3/drivers/char/ipmi/ipmi_si_intf.c linux-3.0.3/drivers/char
  
        new_smi->interrupt_disabled = 1;
        atomic_set(&new_smi->stop_operation, 0);
-diff -urNp linux-3.0.3/drivers/char/Kconfig linux-3.0.3/drivers/char/Kconfig
---- linux-3.0.3/drivers/char/Kconfig   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/Kconfig   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/Kconfig linux-3.0.4/drivers/char/Kconfig
+--- linux-3.0.4/drivers/char/Kconfig   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/Kconfig   2011-08-23 21:48:14.000000000 -0400
 @@ -8,7 +8,8 @@ source "drivers/tty/Kconfig"
  
  config DEVKMEM
@@ -23734,9 +23750,9 @@ diff -urNp linux-3.0.3/drivers/char/Kconfig linux-3.0.3/drivers/char/Kconfig
        default y
  
  source "drivers/s390/char/Kconfig"
-diff -urNp linux-3.0.3/drivers/char/mem.c linux-3.0.3/drivers/char/mem.c
---- linux-3.0.3/drivers/char/mem.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/mem.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/mem.c linux-3.0.4/drivers/char/mem.c
+--- linux-3.0.4/drivers/char/mem.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/mem.c     2011-08-23 21:48:14.000000000 -0400
 @@ -18,6 +18,7 @@
  #include <linux/raw.h>
  #include <linux/tty.h>
@@ -23869,9 +23885,9 @@ diff -urNp linux-3.0.3/drivers/char/mem.c linux-3.0.3/drivers/char/mem.c
  };
  
  static int memory_open(struct inode *inode, struct file *filp)
-diff -urNp linux-3.0.3/drivers/char/nvram.c linux-3.0.3/drivers/char/nvram.c
---- linux-3.0.3/drivers/char/nvram.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/nvram.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/nvram.c linux-3.0.4/drivers/char/nvram.c
+--- linux-3.0.4/drivers/char/nvram.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/nvram.c   2011-08-23 21:47:55.000000000 -0400
 @@ -246,7 +246,7 @@ static ssize_t nvram_read(struct file *f
  
        spin_unlock_irq(&rtc_lock);
@@ -23881,9 +23897,9 @@ diff -urNp linux-3.0.3/drivers/char/nvram.c linux-3.0.3/drivers/char/nvram.c
                return -EFAULT;
  
        *ppos = i;
-diff -urNp linux-3.0.3/drivers/char/random.c linux-3.0.3/drivers/char/random.c
---- linux-3.0.3/drivers/char/random.c  2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/char/random.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/random.c linux-3.0.4/drivers/char/random.c
+--- linux-3.0.4/drivers/char/random.c  2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/char/random.c  2011-08-23 21:48:14.000000000 -0400
 @@ -261,8 +261,13 @@
  /*
   * Configuration information
@@ -23934,9 +23950,9 @@ diff -urNp linux-3.0.3/drivers/char/random.c linux-3.0.3/drivers/char/random.c
  static int max_write_thresh = INPUT_POOL_WORDS * 32;
  static char sysctl_bootid[16];
  
-diff -urNp linux-3.0.3/drivers/char/sonypi.c linux-3.0.3/drivers/char/sonypi.c
---- linux-3.0.3/drivers/char/sonypi.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/sonypi.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/sonypi.c linux-3.0.4/drivers/char/sonypi.c
+--- linux-3.0.4/drivers/char/sonypi.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/sonypi.c  2011-08-23 21:47:55.000000000 -0400
 @@ -55,6 +55,7 @@
  #include <asm/uaccess.h>
  #include <asm/io.h>
@@ -23975,9 +23991,9 @@ diff -urNp linux-3.0.3/drivers/char/sonypi.c linux-3.0.3/drivers/char/sonypi.c
        mutex_unlock(&sonypi_device.lock);
  
        return 0;
-diff -urNp linux-3.0.3/drivers/char/tpm/tpm_bios.c linux-3.0.3/drivers/char/tpm/tpm_bios.c
---- linux-3.0.3/drivers/char/tpm/tpm_bios.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/tpm/tpm_bios.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/tpm/tpm_bios.c linux-3.0.4/drivers/char/tpm/tpm_bios.c
+--- linux-3.0.4/drivers/char/tpm/tpm_bios.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/tpm/tpm_bios.c    2011-08-23 21:47:55.000000000 -0400
 @@ -173,7 +173,7 @@ static void *tpm_bios_measurements_start
        event = addr;
  
@@ -24018,9 +24034,9 @@ diff -urNp linux-3.0.3/drivers/char/tpm/tpm_bios.c linux-3.0.3/drivers/char/tpm/
  
        memcpy(log->bios_event_log, virt, len);
  
-diff -urNp linux-3.0.3/drivers/char/tpm/tpm.c linux-3.0.3/drivers/char/tpm/tpm.c
---- linux-3.0.3/drivers/char/tpm/tpm.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/char/tpm/tpm.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/char/tpm/tpm.c linux-3.0.4/drivers/char/tpm/tpm.c
+--- linux-3.0.4/drivers/char/tpm/tpm.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/char/tpm/tpm.c 2011-08-23 21:48:14.000000000 -0400
 @@ -411,7 +411,7 @@ static ssize_t tpm_transmit(struct tpm_c
                    chip->vendor.req_complete_val)
                        goto out_recv;
@@ -24039,9 +24055,9 @@ diff -urNp linux-3.0.3/drivers/char/tpm/tpm.c linux-3.0.3/drivers/char/tpm/tpm.c
        tpm_cmd.header.in = tpm_readpubek_header;
        err = transmit_cmd(chip, &tpm_cmd, READ_PUBEK_RESULT_SIZE,
                        "attempting to read the PUBEK");
-diff -urNp linux-3.0.3/drivers/crypto/hifn_795x.c linux-3.0.3/drivers/crypto/hifn_795x.c
---- linux-3.0.3/drivers/crypto/hifn_795x.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/crypto/hifn_795x.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/crypto/hifn_795x.c linux-3.0.4/drivers/crypto/hifn_795x.c
+--- linux-3.0.4/drivers/crypto/hifn_795x.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/crypto/hifn_795x.c     2011-08-23 21:48:14.000000000 -0400
 @@ -1655,6 +1655,8 @@ static int hifn_test(struct hifn_device 
                0xCA, 0x34, 0x2B, 0x2E};
        struct scatterlist sg;
@@ -24051,9 +24067,9 @@ diff -urNp linux-3.0.3/drivers/crypto/hifn_795x.c linux-3.0.3/drivers/crypto/hif
        memset(src, 0, sizeof(src));
        memset(ctx.key, 0, sizeof(ctx.key));
  
-diff -urNp linux-3.0.3/drivers/crypto/padlock-aes.c linux-3.0.3/drivers/crypto/padlock-aes.c
---- linux-3.0.3/drivers/crypto/padlock-aes.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/crypto/padlock-aes.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/crypto/padlock-aes.c linux-3.0.4/drivers/crypto/padlock-aes.c
+--- linux-3.0.4/drivers/crypto/padlock-aes.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/crypto/padlock-aes.c   2011-08-23 21:48:14.000000000 -0400
 @@ -109,6 +109,8 @@ static int aes_set_key(struct crypto_tfm
        struct crypto_aes_ctx gen_aes;
        int cpu;
@@ -24063,9 +24079,9 @@ diff -urNp linux-3.0.3/drivers/crypto/padlock-aes.c linux-3.0.3/drivers/crypto/p
        if (key_len % 8) {
                *flags |= CRYPTO_TFM_RES_BAD_KEY_LEN;
                return -EINVAL;
-diff -urNp linux-3.0.3/drivers/edac/edac_pci_sysfs.c linux-3.0.3/drivers/edac/edac_pci_sysfs.c
---- linux-3.0.3/drivers/edac/edac_pci_sysfs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/edac/edac_pci_sysfs.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/edac/edac_pci_sysfs.c linux-3.0.4/drivers/edac/edac_pci_sysfs.c
+--- linux-3.0.4/drivers/edac/edac_pci_sysfs.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/edac/edac_pci_sysfs.c  2011-08-23 21:47:55.000000000 -0400
 @@ -26,8 +26,8 @@ static int edac_pci_log_pe = 1;              /* log 
  static int edac_pci_log_npe = 1;      /* log PCI non-parity error errors */
  static int edac_pci_poll_msec = 1000; /* one second workq period */
@@ -24149,9 +24165,9 @@ diff -urNp linux-3.0.3/drivers/edac/edac_pci_sysfs.c linux-3.0.3/drivers/edac/ed
                        panic("EDAC: PCI Parity Error");
        }
  }
-diff -urNp linux-3.0.3/drivers/edac/mce_amd.h linux-3.0.3/drivers/edac/mce_amd.h
---- linux-3.0.3/drivers/edac/mce_amd.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/edac/mce_amd.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/edac/mce_amd.h linux-3.0.4/drivers/edac/mce_amd.h
+--- linux-3.0.4/drivers/edac/mce_amd.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/edac/mce_amd.h 2011-08-23 21:47:55.000000000 -0400
 @@ -83,7 +83,7 @@ struct amd_decoder_ops {
        bool (*dc_mce)(u16, u8);
        bool (*ic_mce)(u16, u8);
@@ -24161,9 +24177,9 @@ diff -urNp linux-3.0.3/drivers/edac/mce_amd.h linux-3.0.3/drivers/edac/mce_amd.h
  
  void amd_report_gart_errors(bool);
  void amd_register_ecc_decoder(void (*f)(int, struct mce *, u32));
-diff -urNp linux-3.0.3/drivers/firewire/core-card.c linux-3.0.3/drivers/firewire/core-card.c
---- linux-3.0.3/drivers/firewire/core-card.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core-card.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core-card.c linux-3.0.4/drivers/firewire/core-card.c
+--- linux-3.0.4/drivers/firewire/core-card.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core-card.c   2011-08-23 21:47:55.000000000 -0400
 @@ -657,7 +657,7 @@ void fw_card_release(struct kref *kref)
  
  void fw_core_remove_card(struct fw_card *card)
@@ -24173,9 +24189,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core-card.c linux-3.0.3/drivers/firewire
  
        card->driver->update_phy_reg(card, 4,
                                     PHY_LINK_ACTIVE | PHY_CONTENDER, 0);
-diff -urNp linux-3.0.3/drivers/firewire/core-cdev.c linux-3.0.3/drivers/firewire/core-cdev.c
---- linux-3.0.3/drivers/firewire/core-cdev.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core-cdev.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core-cdev.c linux-3.0.4/drivers/firewire/core-cdev.c
+--- linux-3.0.4/drivers/firewire/core-cdev.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core-cdev.c   2011-08-23 21:47:55.000000000 -0400
 @@ -1313,8 +1313,7 @@ static int init_iso_resource(struct clie
        int ret;
  
@@ -24186,9 +24202,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core-cdev.c linux-3.0.3/drivers/firewire
                return -EINVAL;
  
        r  = kmalloc(sizeof(*r), GFP_KERNEL);
-diff -urNp linux-3.0.3/drivers/firewire/core.h linux-3.0.3/drivers/firewire/core.h
---- linux-3.0.3/drivers/firewire/core.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core.h linux-3.0.4/drivers/firewire/core.h
+--- linux-3.0.4/drivers/firewire/core.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core.h        2011-08-23 21:47:55.000000000 -0400
 @@ -101,6 +101,7 @@ struct fw_card_driver {
  
        int (*stop_iso)(struct fw_iso_context *ctx);
@@ -24197,9 +24213,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core.h linux-3.0.3/drivers/firewire/core
  
  void fw_card_initialize(struct fw_card *card,
                const struct fw_card_driver *driver, struct device *device);
-diff -urNp linux-3.0.3/drivers/firewire/core-transaction.c linux-3.0.3/drivers/firewire/core-transaction.c
---- linux-3.0.3/drivers/firewire/core-transaction.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firewire/core-transaction.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firewire/core-transaction.c linux-3.0.4/drivers/firewire/core-transaction.c
+--- linux-3.0.4/drivers/firewire/core-transaction.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firewire/core-transaction.c    2011-08-23 21:48:14.000000000 -0400
 @@ -37,6 +37,7 @@
  #include <linux/timer.h>
  #include <linux/types.h>
@@ -24217,9 +24233,9 @@ diff -urNp linux-3.0.3/drivers/firewire/core-transaction.c linux-3.0.3/drivers/f
        init_timer_on_stack(&t.split_timeout_timer);
        init_completion(&d.done);
        d.payload = payload;
-diff -urNp linux-3.0.3/drivers/firmware/dmi_scan.c linux-3.0.3/drivers/firmware/dmi_scan.c
---- linux-3.0.3/drivers/firmware/dmi_scan.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/firmware/dmi_scan.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/firmware/dmi_scan.c linux-3.0.4/drivers/firmware/dmi_scan.c
+--- linux-3.0.4/drivers/firmware/dmi_scan.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/firmware/dmi_scan.c    2011-08-23 21:47:55.000000000 -0400
 @@ -449,11 +449,6 @@ void __init dmi_scan_machine(void)
                }
        }
@@ -24232,9 +24248,9 @@ diff -urNp linux-3.0.3/drivers/firmware/dmi_scan.c linux-3.0.3/drivers/firmware/
                p = dmi_ioremap(0xF0000, 0x10000);
                if (p == NULL)
                        goto error;
-diff -urNp linux-3.0.3/drivers/gpio/vr41xx_giu.c linux-3.0.3/drivers/gpio/vr41xx_giu.c
---- linux-3.0.3/drivers/gpio/vr41xx_giu.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpio/vr41xx_giu.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpio/vr41xx_giu.c linux-3.0.4/drivers/gpio/vr41xx_giu.c
+--- linux-3.0.4/drivers/gpio/vr41xx_giu.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpio/vr41xx_giu.c      2011-08-23 21:47:55.000000000 -0400
 @@ -204,7 +204,7 @@ static int giu_get_irq(unsigned int irq)
        printk(KERN_ERR "spurious GIU interrupt: %04x(%04x),%04x(%04x)\n",
               maskl, pendl, maskh, pendh);
@@ -24244,9 +24260,9 @@ diff -urNp linux-3.0.3/drivers/gpio/vr41xx_giu.c linux-3.0.3/drivers/gpio/vr41xx
  
        return -EINVAL;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c
---- linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c
+--- linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_crtc_helper.c      2011-08-23 21:48:14.000000000 -0400
 @@ -276,7 +276,7 @@ static bool drm_encoder_crtc_ok(struct d
        struct drm_crtc *tmp;
        int crtc_mask = 1;
@@ -24265,9 +24281,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_crtc_helper.c linux-3.0.3/drivers/gpu
        crtc->enabled = drm_helper_crtc_in_use(crtc);
        if (!crtc->enabled)
                return true;
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_drv.c linux-3.0.3/drivers/gpu/drm/drm_drv.c
---- linux-3.0.3/drivers/gpu/drm/drm_drv.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_drv.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_drv.c linux-3.0.4/drivers/gpu/drm/drm_drv.c
+--- linux-3.0.4/drivers/gpu/drm/drm_drv.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_drv.c      2011-08-23 21:47:55.000000000 -0400
 @@ -386,7 +386,7 @@ long drm_ioctl(struct file *filp,
  
        dev = file_priv->minor->dev;
@@ -24277,9 +24293,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_drv.c linux-3.0.3/drivers/gpu/drm/drm
        ++file_priv->ioctl_count;
  
        DRM_DEBUG("pid=%d, cmd=0x%02x, nr=0x%02x, dev 0x%lx, auth=%d\n",
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_fops.c linux-3.0.3/drivers/gpu/drm/drm_fops.c
---- linux-3.0.3/drivers/gpu/drm/drm_fops.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_fops.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_fops.c linux-3.0.4/drivers/gpu/drm/drm_fops.c
+--- linux-3.0.4/drivers/gpu/drm/drm_fops.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_fops.c     2011-08-23 21:47:55.000000000 -0400
 @@ -70,7 +70,7 @@ static int drm_setup(struct drm_device *
        }
  
@@ -24329,9 +24345,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_fops.c linux-3.0.3/drivers/gpu/drm/dr
                if (atomic_read(&dev->ioctl_count)) {
                        DRM_ERROR("Device busy: %d\n",
                                  atomic_read(&dev->ioctl_count));
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_global.c linux-3.0.3/drivers/gpu/drm/drm_global.c
---- linux-3.0.3/drivers/gpu/drm/drm_global.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_global.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_global.c linux-3.0.4/drivers/gpu/drm/drm_global.c
+--- linux-3.0.4/drivers/gpu/drm/drm_global.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_global.c   2011-08-23 21:47:55.000000000 -0400
 @@ -36,7 +36,7 @@
  struct drm_global_item {
        struct mutex mutex;
@@ -24389,9 +24405,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_global.c linux-3.0.3/drivers/gpu/drm/
                ref->release(ref);
                item->object = NULL;
        }
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_info.c linux-3.0.3/drivers/gpu/drm/drm_info.c
---- linux-3.0.3/drivers/gpu/drm/drm_info.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_info.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_info.c linux-3.0.4/drivers/gpu/drm/drm_info.c
+--- linux-3.0.4/drivers/gpu/drm/drm_info.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_info.c     2011-08-23 21:48:14.000000000 -0400
 @@ -75,10 +75,14 @@ int drm_vm_info(struct seq_file *m, void
        struct drm_local_map *map;
        struct drm_map_list *r_list;
@@ -24432,9 +24448,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_info.c linux-3.0.3/drivers/gpu/drm/dr
  
  #if defined(__i386__)
                pgprot = pgprot_val(vma->vm_page_prot);
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_ioctl.c linux-3.0.3/drivers/gpu/drm/drm_ioctl.c
---- linux-3.0.3/drivers/gpu/drm/drm_ioctl.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_ioctl.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_ioctl.c linux-3.0.4/drivers/gpu/drm/drm_ioctl.c
+--- linux-3.0.4/drivers/gpu/drm/drm_ioctl.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_ioctl.c    2011-08-23 21:47:55.000000000 -0400
 @@ -256,7 +256,7 @@ int drm_getstats(struct drm_device *dev,
                        stats->data[i].value =
                            (file_priv->master->lock.hw_lock ? file_priv->master->lock.hw_lock->lock : 0);
@@ -24444,9 +24460,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_ioctl.c linux-3.0.3/drivers/gpu/drm/d
                stats->data[i].type = dev->types[i];
        }
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/drm_lock.c linux-3.0.3/drivers/gpu/drm/drm_lock.c
---- linux-3.0.3/drivers/gpu/drm/drm_lock.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/drm_lock.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/drm_lock.c linux-3.0.4/drivers/gpu/drm/drm_lock.c
+--- linux-3.0.4/drivers/gpu/drm/drm_lock.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/drm_lock.c     2011-08-23 21:47:55.000000000 -0400
 @@ -89,7 +89,7 @@ int drm_lock(struct drm_device *dev, voi
                if (drm_lock_take(&master->lock, lock->context)) {
                        master->lock.file_priv = file_priv;
@@ -24465,9 +24481,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/drm_lock.c linux-3.0.3/drivers/gpu/drm/dr
  
        if (drm_lock_free(&master->lock, lock->context)) {
                /* FIXME: Should really bail out here. */
-diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c
---- linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c
+--- linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i810/i810_dma.c        2011-08-23 21:47:55.000000000 -0400
 @@ -950,8 +950,8 @@ static int i810_dma_vertex(struct drm_de
                                 dma->buflist[vertex->idx],
                                 vertex->discard, vertex->used);
@@ -24490,9 +24506,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_dma.c linux-3.0.3/drivers/gpu/d
        sarea_priv->last_enqueue = dev_priv->counter - 1;
        sarea_priv->last_dispatch = (int)hw_status[5];
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h
---- linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h
+--- linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i810/i810_drv.h        2011-08-23 21:47:55.000000000 -0400
 @@ -108,8 +108,8 @@ typedef struct drm_i810_private {
        int page_flipping;
  
@@ -24504,9 +24520,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i810/i810_drv.h linux-3.0.3/drivers/gpu/d
  
        int front_offset;
  } drm_i810_private_t;
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_debugfs.c    2011-08-23 21:47:55.000000000 -0400
 @@ -497,7 +497,7 @@ static int i915_interrupt_info(struct se
                           I915_READ(GTIMR));
        }
@@ -24516,9 +24532,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_debugfs.c linux-3.0.3/drivers/g
        for (i = 0; i < I915_NUM_RINGS; i++) {
                if (IS_GEN6(dev)) {
                        seq_printf(m, "Graphics Interrupt mask (%s):    %08x\n",
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_dma.c        2011-08-23 21:47:55.000000000 -0400
 @@ -1169,7 +1169,7 @@ static bool i915_switcheroo_can_switch(s
        bool can_switch;
  
@@ -24528,9 +24544,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_dma.c linux-3.0.3/drivers/gpu/d
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h
---- linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_drv.h        2011-08-23 21:47:55.000000000 -0400
 @@ -219,7 +219,7 @@ struct drm_i915_display_funcs {
        /* render clock increase/decrease */
        /* display clock increase/decrease */
@@ -24567,9 +24583,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_drv.h linux-3.0.3/drivers/gpu/d
  {
        return container_of(adapter, struct intel_gmbus, adapter)->force_bit;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_gem_execbuffer.c     2011-08-23 21:47:55.000000000 -0400
 @@ -188,7 +188,7 @@ i915_gem_object_set_to_gpu_domain(struct
                i915_gem_clflush_object(obj);
  
@@ -24579,9 +24595,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_gem_execbuffer.c linux-3.0.3/dr
  
        /* The actual obj->write_domain will be updated with
         * pending_write_domain after we emit the accumulated flush for all
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c
---- linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c
+--- linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/i915_irq.c        2011-08-23 21:47:55.000000000 -0400
 @@ -473,7 +473,7 @@ static irqreturn_t ivybridge_irq_handler
        u32 de_iir, gt_iir, de_ier, pch_iir, pm_iir;
        struct drm_i915_master_private *master_priv;
@@ -24627,9 +24643,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/i915_irq.c linux-3.0.3/drivers/gpu/d
  
        INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);
        INIT_WORK(&dev_priv->error_work, i915_error_work_func);
-diff -urNp linux-3.0.3/drivers/gpu/drm/i915/intel_display.c linux-3.0.3/drivers/gpu/drm/i915/intel_display.c
---- linux-3.0.3/drivers/gpu/drm/i915/intel_display.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/i915/intel_display.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/i915/intel_display.c linux-3.0.4/drivers/gpu/drm/i915/intel_display.c
+--- linux-3.0.4/drivers/gpu/drm/i915/intel_display.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/i915/intel_display.c   2011-08-23 21:47:55.000000000 -0400
 @@ -1961,7 +1961,7 @@ intel_pipe_set_base(struct drm_crtc *crt
  
                wait_event(dev_priv->pending_flip_queue,
@@ -24675,9 +24691,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/i915/intel_display.c linux-3.0.3/drivers/
  cleanup_objs:
        drm_gem_object_unreference(&work->old_fb_obj->base);
        drm_gem_object_unreference(&obj->base);
-diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h
---- linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h
+--- linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/mga/mga_drv.h  2011-08-23 21:47:55.000000000 -0400
 @@ -120,9 +120,9 @@ typedef struct drm_mga_private {
        u32 clear_cmd;
        u32 maccess;
@@ -24690,9 +24706,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_drv.h linux-3.0.3/drivers/gpu/drm
        u32 next_fence_to_post;
  
        unsigned int fb_cpp;
-diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c
---- linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c
+--- linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/mga/mga_irq.c  2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,7 @@ u32 mga_get_vblank_counter(struct drm_de
        if (crtc != 0)
                return 0;
@@ -24729,9 +24745,18 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/mga/mga_irq.c linux-3.0.3/drivers/gpu/drm
                      - *sequence) <= (1 << 23)));
  
        *sequence = cur_fence;
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_bios.c 2011-08-26 19:49:56.000000000 -0400
+@@ -200,7 +200,7 @@ struct methods {
+       const char desc[8];
+       void (*loadbios)(struct drm_device *, uint8_t *);
+       const bool rw;
+-};
++} __do_const;
+ 
+ static struct methods shadow_methods[] = {
+       { "PRAMIN", load_vbios_pramin, true },
 @@ -5488,7 +5488,7 @@ parse_bit_displayport_tbl_entry(struct d
  struct bit_table {
        const char id;
@@ -24741,9 +24766,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_bios.c linux-3.0.3/driver
  
  #define BIT_TABLE(id, funcid) ((struct bit_table){ id, parse_bit_##funcid##_tbl_entry })
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_drv.h  2011-08-23 21:47:55.000000000 -0400
 @@ -227,7 +227,7 @@ struct nouveau_channel {
                struct list_head pending;
                uint32_t sequence;
@@ -24796,9 +24821,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_drv.h linux-3.0.3/drivers
        } ttm;
  
        struct {
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_fence.c        2011-08-23 21:47:55.000000000 -0400
 @@ -85,7 +85,7 @@ nouveau_fence_update(struct nouveau_chan
                if (USE_REFCNT(dev))
                        sequence = nvchan_rd32(chan, 0x48);
@@ -24817,9 +24842,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_fence.c linux-3.0.3/drive
        return 0;
  }
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_gem.c  2011-08-23 21:47:55.000000000 -0400
 @@ -249,7 +249,7 @@ validate_init(struct nouveau_channel *ch
        int trycnt = 0;
        int ret, i;
@@ -24829,9 +24854,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_gem.c linux-3.0.3/drivers
  retry:
        if (++trycnt > 100000) {
                NV_ERROR(dev, "%s failed and gave up.\n", __func__);
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nouveau_state.c        2011-08-23 21:47:55.000000000 -0400
 @@ -488,7 +488,7 @@ static bool nouveau_switcheroo_can_switc
        bool can_switch;
  
@@ -24841,9 +24866,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nouveau_state.c linux-3.0.3/drive
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c
---- linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c
+--- linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/nouveau/nv04_graph.c   2011-08-23 21:47:55.000000000 -0400
 @@ -560,7 +560,7 @@ static int
  nv04_graph_mthd_set_ref(struct nouveau_channel *chan,
                        u32 class, u32 mthd, u32 data)
@@ -24853,9 +24878,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/nouveau/nv04_graph.c linux-3.0.3/drivers/
        return 0;
  }
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c
---- linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_cce.c        2011-08-23 21:47:55.000000000 -0400
 @@ -377,7 +377,7 @@ static int r128_do_init_cce(struct drm_d
  
        /* GH: Simple idle check.
@@ -24865,9 +24890,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_cce.c linux-3.0.3/drivers/gpu/d
  
        /* We don't support anything other than bus-mastering ring mode,
         * but the ring can be in either AGP or PCI space for the ring
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h
---- linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_drv.h        2011-08-23 21:47:55.000000000 -0400
 @@ -90,14 +90,14 @@ typedef struct drm_r128_private {
        int is_pci;
        unsigned long cce_buffers_offset;
@@ -24885,9 +24910,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_drv.h linux-3.0.3/drivers/gpu/d
  
        u32 color_fmt;
        unsigned int front_offset;
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c
---- linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_irq.c        2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@ u32 r128_get_vblank_counter(struct drm_d
        if (crtc != 0)
                return 0;
@@ -24906,9 +24931,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_irq.c linux-3.0.3/drivers/gpu/d
                drm_handle_vblank(dev, 0);
                return IRQ_HANDLED;
        }
-diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_state.c linux-3.0.3/drivers/gpu/drm/r128/r128_state.c
---- linux-3.0.3/drivers/gpu/drm/r128/r128_state.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/r128/r128_state.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/r128/r128_state.c linux-3.0.4/drivers/gpu/drm/r128/r128_state.c
+--- linux-3.0.4/drivers/gpu/drm/r128/r128_state.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/r128/r128_state.c      2011-08-23 21:47:55.000000000 -0400
 @@ -321,10 +321,10 @@ static void r128_clear_box(drm_r128_priv
  
  static void r128_cce_performance_boxes(drm_r128_private_t *dev_priv)
@@ -24922,9 +24947,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/r128/r128_state.c linux-3.0.3/drivers/gpu
  }
  
  #endif
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/atom.c linux-3.0.3/drivers/gpu/drm/radeon/atom.c
---- linux-3.0.3/drivers/gpu/drm/radeon/atom.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/atom.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/atom.c linux-3.0.4/drivers/gpu/drm/radeon/atom.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/atom.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/atom.c  2011-08-23 21:48:14.000000000 -0400
 @@ -1245,6 +1245,8 @@ struct atom_context *atom_parse(struct c
        char name[512];
        int i;
@@ -24934,9 +24959,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/atom.c linux-3.0.3/drivers/gpu/drm
        ctx->card = card;
        ctx->bios = bios;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c
---- linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/mkregtable.c    2011-08-23 21:47:55.000000000 -0400
 @@ -637,14 +637,14 @@ static int parser_auth(struct table *t, 
        regex_t mask_rex;
        regmatch_t match[4];
@@ -24954,9 +24979,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/mkregtable.c linux-3.0.3/drivers/g
  
        if (regcomp
            (&mask_rex, "(0x[0-9a-fA-F]*) *([_a-zA-Z0-9]*)", REG_EXTENDED)) {
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_atombios.c       2011-08-23 21:48:14.000000000 -0400
 @@ -545,6 +545,8 @@ bool radeon_get_atom_connector_info_from
        struct radeon_gpio_rec gpio;
        struct radeon_hpd hpd;
@@ -24966,9 +24991,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_atombios.c linux-3.0.3/driv
        if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset))
                return false;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_device.c 2011-08-23 21:47:55.000000000 -0400
 @@ -678,7 +678,7 @@ static bool radeon_switcheroo_can_switch
        bool can_switch;
  
@@ -24978,9 +25003,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_device.c linux-3.0.3/driver
        spin_unlock(&dev->count_lock);
        return can_switch;
  }
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_display.c        2011-08-23 21:48:14.000000000 -0400
 @@ -946,6 +946,8 @@ void radeon_compute_pll_legacy(struct ra
        uint32_t post_div;
        u32 pll_out_min, pll_out_max;
@@ -24990,9 +25015,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_display.c linux-3.0.3/drive
        DRM_DEBUG_KMS("PLL freq %llu %u %u\n", freq, pll->min_ref_div, pll->max_ref_div);
        freq = freq * 1000;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_drv.h    2011-08-23 21:47:55.000000000 -0400
 @@ -255,7 +255,7 @@ typedef struct drm_radeon_private {
  
        /* SW interrupt */
@@ -25002,9 +25027,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_drv.h linux-3.0.3/drivers/g
        int vblank_crtc;
        uint32_t irq_enable_reg;
        uint32_t r500_disp_irq_reg;
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_fence.c  2011-08-23 21:47:55.000000000 -0400
 @@ -78,7 +78,7 @@ int radeon_fence_emit(struct radeon_devi
                write_unlock_irqrestore(&rdev->fence_drv.lock, irq_flags);
                return 0;
@@ -25023,9 +25048,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_fence.c linux-3.0.3/drivers
        INIT_LIST_HEAD(&rdev->fence_drv.created);
        INIT_LIST_HEAD(&rdev->fence_drv.emited);
        INIT_LIST_HEAD(&rdev->fence_drv.signaled);
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon.h linux-3.0.3/drivers/gpu/drm/radeon/radeon.h
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon.h linux-3.0.4/drivers/gpu/drm/radeon/radeon.h
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon.h        2011-08-23 21:47:55.000000000 -0400
 @@ -191,7 +191,7 @@ extern int sumo_get_temp(struct radeon_d
   */
  struct radeon_fence_driver {
@@ -25044,9 +25069,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon.h linux-3.0.3/drivers/gpu/d
  
  /*
   * Asic structures
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_ioc32.c  2011-08-23 21:47:55.000000000 -0400
 @@ -359,7 +359,7 @@ static int compat_radeon_cp_setparam(str
        request = compat_alloc_user_space(sizeof(*request));
        if (!access_ok(VERIFY_WRITE, request, sizeof(*request))
@@ -25056,9 +25081,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ioc32.c linux-3.0.3/drivers
                          &request->value))
                return -EFAULT;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_irq.c    2011-08-23 21:47:55.000000000 -0400
 @@ -225,8 +225,8 @@ static int radeon_emit_irq(struct drm_de
        unsigned int ret;
        RING_LOCALS;
@@ -25079,9 +25104,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_irq.c linux-3.0.3/drivers/g
        DRM_INIT_WAITQUEUE(&dev_priv->swi_queue);
  
        dev->max_vblank_count = 0x001fffff;
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_state.c  2011-08-23 21:47:55.000000000 -0400
 @@ -2168,7 +2168,7 @@ static int radeon_cp_clear(struct drm_de
        if (sarea_priv->nbox > RADEON_NR_SAREA_CLIPRECTS)
                sarea_priv->nbox = RADEON_NR_SAREA_CLIPRECTS;
@@ -25100,9 +25125,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_state.c linux-3.0.3/drivers
  
        DRM_DEBUG("pid=%d\n", DRM_CURRENTPID);
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c
---- linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/radeon_ttm.c    2011-08-23 21:47:55.000000000 -0400
 @@ -644,8 +644,10 @@ int radeon_mmap(struct file *filp, struc
        }
        if (unlikely(ttm_vm_ops == NULL)) {
@@ -25116,9 +25141,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/radeon_ttm.c linux-3.0.3/drivers/g
        }
        vma->vm_ops = &radeon_ttm_vm_ops;
        return 0;
-diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/rs690.c linux-3.0.3/drivers/gpu/drm/radeon/rs690.c
---- linux-3.0.3/drivers/gpu/drm/radeon/rs690.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/radeon/rs690.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/radeon/rs690.c linux-3.0.4/drivers/gpu/drm/radeon/rs690.c
+--- linux-3.0.4/drivers/gpu/drm/radeon/rs690.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/radeon/rs690.c 2011-08-23 21:47:55.000000000 -0400
 @@ -304,9 +304,11 @@ void rs690_crtc_bandwidth_compute(struct
                if (rdev->pm.max_bandwidth.full > rdev->pm.sideport_bandwidth.full &&
                        rdev->pm.sideport_bandwidth.full)
@@ -25132,9 +25157,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/radeon/rs690.c linux-3.0.3/drivers/gpu/dr
        } else {
                if (rdev->pm.max_bandwidth.full > rdev->pm.k8_bandwidth.full &&
                        rdev->pm.k8_bandwidth.full)
-diff -urNp linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c
---- linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c
+--- linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/ttm/ttm_page_alloc.c   2011-08-23 21:47:55.000000000 -0400
 @@ -398,9 +398,9 @@ static int ttm_pool_get_num_unused_pages
  static int ttm_pool_mm_shrink(struct shrinker *shrink,
                              struct shrink_control *sc)
@@ -25147,9 +25172,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/ttm/ttm_page_alloc.c linux-3.0.3/drivers/
        struct ttm_page_pool *pool;
        int shrink_pages = sc->nr_to_scan;
  
-diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_drv.h linux-3.0.3/drivers/gpu/drm/via/via_drv.h
---- linux-3.0.3/drivers/gpu/drm/via/via_drv.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/via/via_drv.h  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_drv.h linux-3.0.4/drivers/gpu/drm/via/via_drv.h
+--- linux-3.0.4/drivers/gpu/drm/via/via_drv.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/via/via_drv.h  2011-08-23 21:47:55.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct drm_via_ring_buffer {
  typedef uint32_t maskarray_t[5];
  
@@ -25168,9 +25193,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_drv.h linux-3.0.3/drivers/gpu/drm
        drm_via_state_t hc_state;
        char pci_buf[VIA_PCI_BUF_SIZE];
        const uint32_t *fire_offsets[VIA_FIRE_BUF_SIZE];
-diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_irq.c linux-3.0.3/drivers/gpu/drm/via/via_irq.c
---- linux-3.0.3/drivers/gpu/drm/via/via_irq.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/via/via_irq.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/via/via_irq.c linux-3.0.4/drivers/gpu/drm/via/via_irq.c
+--- linux-3.0.4/drivers/gpu/drm/via/via_irq.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/via/via_irq.c  2011-08-23 21:47:55.000000000 -0400
 @@ -102,7 +102,7 @@ u32 via_get_vblank_counter(struct drm_de
        if (crtc != 0)
                return 0;
@@ -25241,9 +25266,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/via/via_irq.c linux-3.0.3/drivers/gpu/drm
                irqwait->request.type &= ~_DRM_VBLANK_RELATIVE;
        case VIA_IRQ_ABSOLUTE:
                break;
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h    2011-08-23 21:47:55.000000000 -0400
 @@ -240,7 +240,7 @@ struct vmw_private {
         * Fencing and IRQs.
         */
@@ -25253,9 +25278,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_drv.h linux-3.0.3/drivers/g
        wait_queue_head_t fence_queue;
        wait_queue_head_t fifo_queue;
        atomic_t fence_queue_waiters;
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c  2011-08-23 21:47:55.000000000 -0400
 @@ -151,7 +151,7 @@ int vmw_wait_lag(struct vmw_private *dev
        while (!vmw_lag_lt(queue, us)) {
                spin_lock(&queue->lock);
@@ -25265,9 +25290,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fence.c linux-3.0.3/drivers
                else {
                        fence = list_first_entry(&queue->head,
                                                 struct vmw_fence, head);
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c   2011-08-23 21:47:55.000000000 -0400
 @@ -137,7 +137,7 @@ int vmw_fifo_init(struct vmw_private *de
                 (unsigned int) min,
                 (unsigned int) fifo->capabilities);
@@ -25295,9 +25320,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_fifo.c linux-3.0.3/drivers/
        } while (*sequence == 0);
  
        if (!(fifo_state->capabilities & SVGA_FIFO_CAP_FENCE)) {
-diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
---- linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c
+--- linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c    2011-08-23 21:47:55.000000000 -0400
 @@ -100,7 +100,7 @@ bool vmw_fence_signaled(struct vmw_priva
         * emitted. Then the fence is stale and signaled.
         */
@@ -25316,9 +25341,9 @@ diff -urNp linux-3.0.3/drivers/gpu/drm/vmwgfx/vmwgfx_irq.c linux-3.0.3/drivers/g
        ret = 0;
  
        for (;;) {
-diff -urNp linux-3.0.3/drivers/hid/hid-core.c linux-3.0.3/drivers/hid/hid-core.c
---- linux-3.0.3/drivers/hid/hid-core.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hid/hid-core.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hid/hid-core.c linux-3.0.4/drivers/hid/hid-core.c
+--- linux-3.0.4/drivers/hid/hid-core.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hid/hid-core.c 2011-08-23 21:47:55.000000000 -0400
 @@ -1923,7 +1923,7 @@ static bool hid_ignore(struct hid_device
  
  int hid_add_device(struct hid_device *hdev)
@@ -25337,9 +25362,9 @@ diff -urNp linux-3.0.3/drivers/hid/hid-core.c linux-3.0.3/drivers/hid/hid-core.c
  
        hid_debug_register(hdev, dev_name(&hdev->dev));
        ret = device_add(&hdev->dev);
-diff -urNp linux-3.0.3/drivers/hid/usbhid/hiddev.c linux-3.0.3/drivers/hid/usbhid/hiddev.c
---- linux-3.0.3/drivers/hid/usbhid/hiddev.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hid/usbhid/hiddev.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hid/usbhid/hiddev.c linux-3.0.4/drivers/hid/usbhid/hiddev.c
+--- linux-3.0.4/drivers/hid/usbhid/hiddev.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hid/usbhid/hiddev.c    2011-08-23 21:47:55.000000000 -0400
 @@ -624,7 +624,7 @@ static long hiddev_ioctl(struct file *fi
                break;
  
@@ -25349,9 +25374,9 @@ diff -urNp linux-3.0.3/drivers/hid/usbhid/hiddev.c linux-3.0.3/drivers/hid/usbhi
                        break;
  
                for (i = 0; i < hid->maxcollection; i++)
-diff -urNp linux-3.0.3/drivers/hwmon/acpi_power_meter.c linux-3.0.3/drivers/hwmon/acpi_power_meter.c
---- linux-3.0.3/drivers/hwmon/acpi_power_meter.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hwmon/acpi_power_meter.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hwmon/acpi_power_meter.c linux-3.0.4/drivers/hwmon/acpi_power_meter.c
+--- linux-3.0.4/drivers/hwmon/acpi_power_meter.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hwmon/acpi_power_meter.c       2011-08-23 21:47:55.000000000 -0400
 @@ -316,8 +316,6 @@ static ssize_t set_trip(struct device *d
                return res;
  
@@ -25361,9 +25386,9 @@ diff -urNp linux-3.0.3/drivers/hwmon/acpi_power_meter.c linux-3.0.3/drivers/hwmo
  
        mutex_lock(&resource->lock);
        resource->trip[attr->index - 7] = temp;
-diff -urNp linux-3.0.3/drivers/hwmon/sht15.c linux-3.0.3/drivers/hwmon/sht15.c
---- linux-3.0.3/drivers/hwmon/sht15.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hwmon/sht15.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hwmon/sht15.c linux-3.0.4/drivers/hwmon/sht15.c
+--- linux-3.0.4/drivers/hwmon/sht15.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hwmon/sht15.c  2011-08-23 21:47:55.000000000 -0400
 @@ -166,7 +166,7 @@ struct sht15_data {
        int                             supply_uV;
        bool                            supply_uV_valid;
@@ -25412,9 +25437,9 @@ diff -urNp linux-3.0.3/drivers/hwmon/sht15.c linux-3.0.3/drivers/hwmon/sht15.c
                        return;
        }
  
-diff -urNp linux-3.0.3/drivers/hwmon/w83791d.c linux-3.0.3/drivers/hwmon/w83791d.c
---- linux-3.0.3/drivers/hwmon/w83791d.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/hwmon/w83791d.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/hwmon/w83791d.c linux-3.0.4/drivers/hwmon/w83791d.c
+--- linux-3.0.4/drivers/hwmon/w83791d.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/hwmon/w83791d.c        2011-08-23 21:47:55.000000000 -0400
 @@ -329,8 +329,8 @@ static int w83791d_detect(struct i2c_cli
                          struct i2c_board_info *info);
  static int w83791d_remove(struct i2c_client *client);
@@ -25426,9 +25451,9 @@ diff -urNp linux-3.0.3/drivers/hwmon/w83791d.c linux-3.0.3/drivers/hwmon/w83791d
  static struct w83791d_data *w83791d_update_device(struct device *dev);
  
  #ifdef DEBUG
-diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c
---- linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c
+--- linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/i2c/busses/i2c-amd756-s4882.c  2011-08-23 21:47:55.000000000 -0400
 @@ -43,7 +43,7 @@
  extern struct i2c_adapter amd756_smbus;
  
@@ -25438,9 +25463,9 @@ diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-amd756-s4882.c linux-3.0.3/drivers
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(amd756_lock);
-diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c
---- linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c
+--- linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/i2c/busses/i2c-nforce2-s4985.c 2011-08-23 21:47:55.000000000 -0400
 @@ -41,7 +41,7 @@
  extern struct i2c_adapter *nforce2_smbus;
  
@@ -25450,9 +25475,9 @@ diff -urNp linux-3.0.3/drivers/i2c/busses/i2c-nforce2-s4985.c linux-3.0.3/driver
  
  /* Wrapper access functions for multiplexed SMBus */
  static DEFINE_MUTEX(nforce2_lock);
-diff -urNp linux-3.0.3/drivers/i2c/i2c-mux.c linux-3.0.3/drivers/i2c/i2c-mux.c
---- linux-3.0.3/drivers/i2c/i2c-mux.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/i2c/i2c-mux.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/i2c/i2c-mux.c linux-3.0.4/drivers/i2c/i2c-mux.c
+--- linux-3.0.4/drivers/i2c/i2c-mux.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/i2c/i2c-mux.c  2011-08-23 21:47:55.000000000 -0400
 @@ -28,7 +28,7 @@
  /* multiplexer per channel data */
  struct i2c_mux_priv {
@@ -25462,9 +25487,9 @@ diff -urNp linux-3.0.3/drivers/i2c/i2c-mux.c linux-3.0.3/drivers/i2c/i2c-mux.c
  
        struct i2c_adapter *parent;
        void *mux_dev;  /* the mux chip/device */
-diff -urNp linux-3.0.3/drivers/ide/ide-cd.c linux-3.0.3/drivers/ide/ide-cd.c
---- linux-3.0.3/drivers/ide/ide-cd.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ide/ide-cd.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ide/ide-cd.c linux-3.0.4/drivers/ide/ide-cd.c
+--- linux-3.0.4/drivers/ide/ide-cd.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ide/ide-cd.c   2011-08-23 21:47:55.000000000 -0400
 @@ -769,7 +769,7 @@ static void cdrom_do_block_pc(ide_drive_
                alignment = queue_dma_alignment(q) | q->dma_pad_mask;
                if ((unsigned long)buf & alignment
@@ -25474,9 +25499,9 @@ diff -urNp linux-3.0.3/drivers/ide/ide-cd.c linux-3.0.3/drivers/ide/ide-cd.c
                        drive->dma = 0;
        }
  }
-diff -urNp linux-3.0.3/drivers/ide/ide-floppy.c linux-3.0.3/drivers/ide/ide-floppy.c
---- linux-3.0.3/drivers/ide/ide-floppy.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ide/ide-floppy.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ide/ide-floppy.c linux-3.0.4/drivers/ide/ide-floppy.c
+--- linux-3.0.4/drivers/ide/ide-floppy.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ide/ide-floppy.c       2011-08-23 21:48:14.000000000 -0400
 @@ -379,6 +379,8 @@ static int ide_floppy_get_capacity(ide_d
        u8 pc_buf[256], header_len, desc_cnt;
        int i, rc = 1, blocks, length;
@@ -25486,9 +25511,9 @@ diff -urNp linux-3.0.3/drivers/ide/ide-floppy.c linux-3.0.3/drivers/ide/ide-flop
        ide_debug_log(IDE_DBG_FUNC, "enter");
  
        drive->bios_cyl = 0;
-diff -urNp linux-3.0.3/drivers/ide/setup-pci.c linux-3.0.3/drivers/ide/setup-pci.c
---- linux-3.0.3/drivers/ide/setup-pci.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/ide/setup-pci.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/ide/setup-pci.c linux-3.0.4/drivers/ide/setup-pci.c
+--- linux-3.0.4/drivers/ide/setup-pci.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/ide/setup-pci.c        2011-08-23 21:48:14.000000000 -0400
 @@ -542,6 +542,8 @@ int ide_pci_init_two(struct pci_dev *dev
        int ret, i, n_ports = dev2 ? 4 : 2;
        struct ide_hw hw[4], *hws[] = { NULL, NULL, NULL, NULL };
@@ -25498,9 +25523,9 @@ diff -urNp linux-3.0.3/drivers/ide/setup-pci.c linux-3.0.3/drivers/ide/setup-pci
        for (i = 0; i < n_ports / 2; i++) {
                ret = ide_setup_pci_controller(pdev[i], d, !i);
                if (ret < 0)
-diff -urNp linux-3.0.3/drivers/infiniband/core/cm.c linux-3.0.3/drivers/infiniband/core/cm.c
---- linux-3.0.3/drivers/infiniband/core/cm.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/core/cm.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/core/cm.c linux-3.0.4/drivers/infiniband/core/cm.c
+--- linux-3.0.4/drivers/infiniband/core/cm.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/core/cm.c   2011-08-23 21:47:55.000000000 -0400
 @@ -113,7 +113,7 @@ static char const counter_group_names[CM
  
  struct cm_counter_group {
@@ -25640,9 +25665,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/core/cm.c linux-3.0.3/drivers/infiniba
  }
  
  static const struct sysfs_ops cm_counter_ops = {
-diff -urNp linux-3.0.3/drivers/infiniband/core/fmr_pool.c linux-3.0.3/drivers/infiniband/core/fmr_pool.c
---- linux-3.0.3/drivers/infiniband/core/fmr_pool.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/core/fmr_pool.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/core/fmr_pool.c linux-3.0.4/drivers/infiniband/core/fmr_pool.c
+--- linux-3.0.4/drivers/infiniband/core/fmr_pool.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/core/fmr_pool.c     2011-08-23 21:47:55.000000000 -0400
 @@ -97,8 +97,8 @@ struct ib_fmr_pool {
  
        struct task_struct       *thread;
@@ -25710,9 +25735,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/core/fmr_pool.c linux-3.0.3/drivers/in
                                wake_up_process(pool->thread);
                        }
                }
-diff -urNp linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c
---- linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c
+--- linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/cxgb4/mem.c      2011-08-23 21:47:55.000000000 -0400
 @@ -122,7 +122,7 @@ static int write_tpt_entry(struct c4iw_r
        int err;
        struct fw_ri_tpte tpt;
@@ -25731,9 +25756,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/cxgb4/mem.c linux-3.0.3/drivers/inf
        }
        PDBG("%s stag_state 0x%0x type 0x%0x pdid 0x%0x, stag_idx 0x%x\n",
             __func__, stag_state, type, pdid, stag_idx);
-diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c
---- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c
+--- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_fs.c 2011-08-23 21:48:14.000000000 -0400
 @@ -113,6 +113,8 @@ static ssize_t atomic_counters_read(stru
        struct infinipath_counters counters;
        struct ipath_devdata *dd;
@@ -25743,9 +25768,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_fs.c linux-3.0.3/driver
        dd = file->f_path.dentry->d_inode->i_private;
        dd->ipath_f_read_counters(dd, &counters);
  
-diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c
---- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c
+--- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_rc.c 2011-08-23 21:47:55.000000000 -0400
 @@ -1868,7 +1868,7 @@ void ipath_rc_rcv(struct ipath_ibdev *de
                struct ib_atomic_eth *ateth;
                struct ipath_ack_entry *e;
@@ -25769,9 +25794,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_rc.c linux-3.0.3/driver
                        (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
                                      be64_to_cpu(ateth->compare_data),
                                      sdata);
-diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c
---- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c
+--- linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/ipath/ipath_ruc.c        2011-08-23 21:47:55.000000000 -0400
 @@ -266,7 +266,7 @@ static void ipath_ruc_loopback(struct ip
        unsigned long flags;
        struct ib_wc wc;
@@ -25795,9 +25820,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/ipath/ipath_ruc.c linux-3.0.3/drive
                        (u64) cmpxchg((u64 *) qp->r_sge.sge.vaddr,
                                      sdata, wqe->wr.wr.atomic.swap);
                goto send_comp;
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.c linux-3.0.3/drivers/infiniband/hw/nes/nes.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.c linux-3.0.4/drivers/infiniband/hw/nes/nes.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes.c        2011-08-23 21:47:55.000000000 -0400
 @@ -103,7 +103,7 @@ MODULE_PARM_DESC(limit_maxrdreqsz, "Limi
  LIST_HEAD(nes_adapter_list);
  static LIST_HEAD(nes_dev_list);
@@ -25816,9 +25841,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.c linux-3.0.3/drivers/infin
  
        /* Free the control structures */
  
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes_cm.c     2011-08-23 21:47:55.000000000 -0400
 @@ -68,14 +68,14 @@ u32 cm_packets_dropped;
  u32 cm_packets_retrans;
  u32 cm_packets_created;
@@ -26015,9 +26040,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_cm.c linux-3.0.3/drivers/in
        nes_debug(NES_DBG_CM, "cm_node = %p - cm_id = %p, jiffies = %lu\n",
                        cm_node, cm_id, jiffies);
  
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.h linux-3.0.3/drivers/infiniband/hw/nes/nes.h
---- linux-3.0.3/drivers/infiniband/hw/nes/nes.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes.h linux-3.0.4/drivers/infiniband/hw/nes/nes.h
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes.h        2011-08-23 21:47:55.000000000 -0400
 @@ -175,17 +175,17 @@ extern unsigned int nes_debug_level;
  extern unsigned int wqm_quanta;
  extern struct list_head nes_adapter_list;
@@ -26069,9 +26094,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes.h linux-3.0.3/drivers/infin
  
  extern u32 int_mod_timer_init;
  extern u32 int_mod_cq_depth_256;
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes_nic.c    2011-08-23 21:47:55.000000000 -0400
 @@ -1274,31 +1274,31 @@ static void nes_netdev_get_ethtool_stats
        target_stat_values[++index] = mh_detected;
        target_stat_values[++index] = mh_pauses_sent;
@@ -26122,9 +26147,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_nic.c linux-3.0.3/drivers/i
        target_stat_values[++index] = nesadapter->free_4kpbl;
        target_stat_values[++index] = nesadapter->free_256pbl;
        target_stat_values[++index] = int_mod_timer_init;
-diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c
---- linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c
+--- linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/nes/nes_verbs.c  2011-08-23 21:47:55.000000000 -0400
 @@ -46,9 +46,9 @@
  
  #include <rdma/ib_umem.h>
@@ -26156,9 +26181,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/nes/nes_verbs.c linux-3.0.3/drivers
        nesqp->destroyed = 1;
  
        /* Blow away the connection if it exists. */
-diff -urNp linux-3.0.3/drivers/infiniband/hw/qib/qib.h linux-3.0.3/drivers/infiniband/hw/qib/qib.h
---- linux-3.0.3/drivers/infiniband/hw/qib/qib.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/infiniband/hw/qib/qib.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/infiniband/hw/qib/qib.h linux-3.0.4/drivers/infiniband/hw/qib/qib.h
+--- linux-3.0.4/drivers/infiniband/hw/qib/qib.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/infiniband/hw/qib/qib.h        2011-08-23 21:47:55.000000000 -0400
 @@ -51,6 +51,7 @@
  #include <linux/completion.h>
  #include <linux/kref.h>
@@ -26167,9 +26192,9 @@ diff -urNp linux-3.0.3/drivers/infiniband/hw/qib/qib.h linux-3.0.3/drivers/infin
  
  #include "qib_common.h"
  #include "qib_verbs.h"
-diff -urNp linux-3.0.3/drivers/input/gameport/gameport.c linux-3.0.3/drivers/input/gameport/gameport.c
---- linux-3.0.3/drivers/input/gameport/gameport.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/gameport/gameport.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/gameport/gameport.c linux-3.0.4/drivers/input/gameport/gameport.c
+--- linux-3.0.4/drivers/input/gameport/gameport.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/gameport/gameport.c      2011-08-23 21:47:55.000000000 -0400
 @@ -488,14 +488,14 @@ EXPORT_SYMBOL(gameport_set_phys);
   */
  static void gameport_init_port(struct gameport *gameport)
@@ -26187,9 +26212,9 @@ diff -urNp linux-3.0.3/drivers/input/gameport/gameport.c linux-3.0.3/drivers/inp
        gameport->dev.bus = &gameport_bus;
        gameport->dev.release = gameport_release_port;
        if (gameport->parent)
-diff -urNp linux-3.0.3/drivers/input/input.c linux-3.0.3/drivers/input/input.c
---- linux-3.0.3/drivers/input/input.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/input.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/input.c linux-3.0.4/drivers/input/input.c
+--- linux-3.0.4/drivers/input/input.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/input.c  2011-08-23 21:47:55.000000000 -0400
 @@ -1814,7 +1814,7 @@ static void input_cleanse_bitmasks(struc
   */
  int input_register_device(struct input_dev *dev)
@@ -26208,9 +26233,9 @@ diff -urNp linux-3.0.3/drivers/input/input.c linux-3.0.3/drivers/input/input.c
  
        error = device_add(&dev->dev);
        if (error)
-diff -urNp linux-3.0.3/drivers/input/joystick/sidewinder.c linux-3.0.3/drivers/input/joystick/sidewinder.c
---- linux-3.0.3/drivers/input/joystick/sidewinder.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/joystick/sidewinder.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/joystick/sidewinder.c linux-3.0.4/drivers/input/joystick/sidewinder.c
+--- linux-3.0.4/drivers/input/joystick/sidewinder.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/joystick/sidewinder.c    2011-08-23 21:48:14.000000000 -0400
 @@ -30,6 +30,7 @@
  #include <linux/kernel.h>
  #include <linux/module.h>
@@ -26228,9 +26253,9 @@ diff -urNp linux-3.0.3/drivers/input/joystick/sidewinder.c linux-3.0.3/drivers/i
        i = sw_read_packet(sw->gameport, buf, sw->length, 0);
  
        if (sw->type == SW_ID_3DP && sw->length == 66 && i != 66) {             /* Broken packet, try to fix */
-diff -urNp linux-3.0.3/drivers/input/joystick/xpad.c linux-3.0.3/drivers/input/joystick/xpad.c
---- linux-3.0.3/drivers/input/joystick/xpad.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/joystick/xpad.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/joystick/xpad.c linux-3.0.4/drivers/input/joystick/xpad.c
+--- linux-3.0.4/drivers/input/joystick/xpad.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/joystick/xpad.c  2011-08-23 21:47:55.000000000 -0400
 @@ -689,7 +689,7 @@ static void xpad_led_set(struct led_clas
  
  static int xpad_led_probe(struct usb_xpad *xpad)
@@ -26249,9 +26274,9 @@ diff -urNp linux-3.0.3/drivers/input/joystick/xpad.c linux-3.0.3/drivers/input/j
  
        snprintf(led->name, sizeof(led->name), "xpad%ld", led_no);
        led->xpad = xpad;
-diff -urNp linux-3.0.3/drivers/input/mousedev.c linux-3.0.3/drivers/input/mousedev.c
---- linux-3.0.3/drivers/input/mousedev.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/mousedev.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/mousedev.c linux-3.0.4/drivers/input/mousedev.c
+--- linux-3.0.4/drivers/input/mousedev.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/mousedev.c       2011-08-23 21:47:55.000000000 -0400
 @@ -763,7 +763,7 @@ static ssize_t mousedev_read(struct file
  
        spin_unlock_irq(&client->packet_lock);
@@ -26261,9 +26286,9 @@ diff -urNp linux-3.0.3/drivers/input/mousedev.c linux-3.0.3/drivers/input/moused
                return -EFAULT;
  
        return count;
-diff -urNp linux-3.0.3/drivers/input/serio/serio.c linux-3.0.3/drivers/input/serio/serio.c
---- linux-3.0.3/drivers/input/serio/serio.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/input/serio/serio.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/input/serio/serio.c linux-3.0.4/drivers/input/serio/serio.c
+--- linux-3.0.4/drivers/input/serio/serio.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/input/serio/serio.c    2011-08-23 21:47:55.000000000 -0400
 @@ -497,7 +497,7 @@ static void serio_release_port(struct de
   */
  static void serio_init_port(struct serio *serio)
@@ -26282,9 +26307,9 @@ diff -urNp linux-3.0.3/drivers/input/serio/serio.c linux-3.0.3/drivers/input/ser
        serio->dev.bus = &serio_bus;
        serio->dev.release = serio_release_port;
        serio->dev.groups = serio_device_attr_groups;
-diff -urNp linux-3.0.3/drivers/isdn/capi/capi.c linux-3.0.3/drivers/isdn/capi/capi.c
---- linux-3.0.3/drivers/isdn/capi/capi.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/capi/capi.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/capi/capi.c linux-3.0.4/drivers/isdn/capi/capi.c
+--- linux-3.0.4/drivers/isdn/capi/capi.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/capi/capi.c       2011-08-23 21:47:55.000000000 -0400
 @@ -83,8 +83,8 @@ struct capiminor {
  
        struct capi20_appl      *ap;
@@ -26322,9 +26347,9 @@ diff -urNp linux-3.0.3/drivers/isdn/capi/capi.c linux-3.0.3/drivers/isdn/capi/ca
                capimsg_setu32(skb->data, 8, mp->ncci); /* NCCI */
                capimsg_setu32(skb->data, 12, (u32)(long)skb->data);/* Data32 */
                capimsg_setu16(skb->data, 16, len);     /* Data length */
-diff -urNp linux-3.0.3/drivers/isdn/gigaset/common.c linux-3.0.3/drivers/isdn/gigaset/common.c
---- linux-3.0.3/drivers/isdn/gigaset/common.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/gigaset/common.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/gigaset/common.c linux-3.0.4/drivers/isdn/gigaset/common.c
+--- linux-3.0.4/drivers/isdn/gigaset/common.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/gigaset/common.c  2011-08-23 21:47:55.000000000 -0400
 @@ -723,7 +723,7 @@ struct cardstate *gigaset_initcs(struct 
        cs->commands_pending = 0;
        cs->cur_at_seq = 0;
@@ -26334,9 +26359,9 @@ diff -urNp linux-3.0.3/drivers/isdn/gigaset/common.c linux-3.0.3/drivers/isdn/gi
        cs->dev = NULL;
        cs->tty = NULL;
        cs->tty_dev = NULL;
-diff -urNp linux-3.0.3/drivers/isdn/gigaset/gigaset.h linux-3.0.3/drivers/isdn/gigaset/gigaset.h
---- linux-3.0.3/drivers/isdn/gigaset/gigaset.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/gigaset/gigaset.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/gigaset/gigaset.h linux-3.0.4/drivers/isdn/gigaset/gigaset.h
+--- linux-3.0.4/drivers/isdn/gigaset/gigaset.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/gigaset/gigaset.h 2011-08-23 21:47:55.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/tty_driver.h>
  #include <linux/list.h>
@@ -26354,9 +26379,9 @@ diff -urNp linux-3.0.3/drivers/isdn/gigaset/gigaset.h linux-3.0.3/drivers/isdn/g
        struct tty_struct *tty;
        struct tasklet_struct if_wake_tasklet;
        unsigned control_state;
-diff -urNp linux-3.0.3/drivers/isdn/gigaset/interface.c linux-3.0.3/drivers/isdn/gigaset/interface.c
---- linux-3.0.3/drivers/isdn/gigaset/interface.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/gigaset/interface.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/gigaset/interface.c linux-3.0.4/drivers/isdn/gigaset/interface.c
+--- linux-3.0.4/drivers/isdn/gigaset/interface.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/gigaset/interface.c       2011-08-23 21:47:55.000000000 -0400
 @@ -162,9 +162,7 @@ static int if_open(struct tty_struct *tt
        }
        tty->driver_data = cs;
@@ -26444,9 +26469,9 @@ diff -urNp linux-3.0.3/drivers/isdn/gigaset/interface.c linux-3.0.3/drivers/isdn
                dev_warn(cs->dev, "%s: device not opened\n", __func__);
                goto out;
        }
-diff -urNp linux-3.0.3/drivers/isdn/hardware/avm/b1.c linux-3.0.3/drivers/isdn/hardware/avm/b1.c
---- linux-3.0.3/drivers/isdn/hardware/avm/b1.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/avm/b1.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/avm/b1.c linux-3.0.4/drivers/isdn/hardware/avm/b1.c
+--- linux-3.0.4/drivers/isdn/hardware/avm/b1.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/avm/b1.c 2011-08-23 21:47:55.000000000 -0400
 @@ -176,7 +176,7 @@ int b1_load_t4file(avmcard *card, capilo
        }
        if (left) {
@@ -26465,9 +26490,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/avm/b1.c linux-3.0.3/drivers/isdn/h
                                return -EFAULT;
                } else {
                        memcpy(buf, dp, left);
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/capidtmf.c 2011-08-23 21:48:14.000000000 -0400
 @@ -498,6 +498,7 @@ void capidtmf_recv_block (t_capidtmf_sta
    byte goertzel_result_buffer[CAPIDTMF_RECV_TOTAL_FREQUENCY_COUNT];
      short windowed_sample_buffer[CAPIDTMF_RECV_WINDOWED_SAMPLES];
@@ -26476,9 +26501,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capidtmf.c linux-3.0.3/driver
  
    if (p_state->recv.state & CAPIDTMF_RECV_STATE_DTMF_ACTIVE)
    {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/capifunc.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1055,6 +1055,8 @@ static int divacapi_connect_didd(void)
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26488,9 +26513,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/capifunc.c linux-3.0.3/driver
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/diddfunc.c 2011-08-23 21:48:14.000000000 -0400
 @@ -54,6 +54,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26500,9 +26525,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/diddfunc.c linux-3.0.3/driver
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/divasfunc.c        2011-08-23 21:48:14.000000000 -0400
 @@ -160,6 +160,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26512,9 +26537,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasfunc.c linux-3.0.3/drive
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h
---- linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h
+--- linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/divasync.h 2011-08-23 21:47:55.000000000 -0400
 @@ -146,7 +146,7 @@ typedef struct _diva_didd_add_adapter {
  } diva_didd_add_adapter_t;
  typedef struct _diva_didd_remove_adapter {
@@ -26524,9 +26549,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/divasync.h linux-3.0.3/driver
  typedef struct _diva_didd_read_adapter_array {
   void   * buffer;
   dword length;
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/idifunc.c  2011-08-23 21:48:14.000000000 -0400
 @@ -188,6 +188,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26536,9 +26561,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/idifunc.c linux-3.0.3/drivers
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/message.c linux-3.0.3/drivers/isdn/hardware/eicon/message.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/message.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/message.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/message.c linux-3.0.4/drivers/isdn/hardware/eicon/message.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/message.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/message.c  2011-08-23 21:48:14.000000000 -0400
 @@ -4886,6 +4886,8 @@ static void sig_ind(PLCI *plci)
    dword d;
    word w;
@@ -26575,9 +26600,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/message.c linux-3.0.3/drivers
    set_group_ind_mask (plci); /* all APPLs within this inc. call are allowed to dial in */
  
    if(!a->group_optimization_enabled)
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c
---- linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c
+--- linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/mntfunc.c  2011-08-23 21:48:14.000000000 -0400
 @@ -79,6 +79,8 @@ static int DIVA_INIT_FUNCTION connect_di
        IDI_SYNC_REQ req;
        DESCRIPTOR DIDD_Table[MAX_DESCRIPTORS];
@@ -26587,9 +26612,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/mntfunc.c linux-3.0.3/drivers
        DIVA_DIDD_Read(DIDD_Table, sizeof(DIDD_Table));
  
        for (x = 0; x < MAX_DESCRIPTORS; x++) {
-diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h
---- linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h
+--- linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/hardware/eicon/xdi_adapter.h      2011-08-23 21:47:55.000000000 -0400
 @@ -44,7 +44,7 @@ typedef struct _xdi_mbox_t {
  typedef struct _diva_os_idi_adapter_interface {
        diva_init_card_proc_t cleanup_adapter_proc;
@@ -26599,9 +26624,9 @@ diff -urNp linux-3.0.3/drivers/isdn/hardware/eicon/xdi_adapter.h linux-3.0.3/dri
  
  typedef struct _diva_os_xdi_adapter {
        struct list_head link;
-diff -urNp linux-3.0.3/drivers/isdn/i4l/isdn_common.c linux-3.0.3/drivers/isdn/i4l/isdn_common.c
---- linux-3.0.3/drivers/isdn/i4l/isdn_common.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/i4l/isdn_common.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/i4l/isdn_common.c linux-3.0.4/drivers/isdn/i4l/isdn_common.c
+--- linux-3.0.4/drivers/isdn/i4l/isdn_common.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/i4l/isdn_common.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1286,6 +1286,8 @@ isdn_ioctl(struct file *file, uint cmd, 
        } iocpar;
        void __user *argp = (void __user *)arg;
@@ -26611,9 +26636,9 @@ diff -urNp linux-3.0.3/drivers/isdn/i4l/isdn_common.c linux-3.0.3/drivers/isdn/i
  #define name  iocpar.name
  #define bname iocpar.bname
  #define iocts iocpar.iocts
-diff -urNp linux-3.0.3/drivers/isdn/icn/icn.c linux-3.0.3/drivers/isdn/icn/icn.c
---- linux-3.0.3/drivers/isdn/icn/icn.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/isdn/icn/icn.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/isdn/icn/icn.c linux-3.0.4/drivers/isdn/icn/icn.c
+--- linux-3.0.4/drivers/isdn/icn/icn.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/isdn/icn/icn.c 2011-08-23 21:47:55.000000000 -0400
 @@ -1045,7 +1045,7 @@ icn_writecmd(const u_char * buf, int len
                if (count > len)
                        count = len;
@@ -26623,9 +26648,9 @@ diff -urNp linux-3.0.3/drivers/isdn/icn/icn.c linux-3.0.3/drivers/isdn/icn/icn.c
                                return -EFAULT;
                } else
                        memcpy(msg, buf, count);
-diff -urNp linux-3.0.3/drivers/lguest/core.c linux-3.0.3/drivers/lguest/core.c
---- linux-3.0.3/drivers/lguest/core.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/lguest/core.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/lguest/core.c linux-3.0.4/drivers/lguest/core.c
+--- linux-3.0.4/drivers/lguest/core.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/lguest/core.c  2011-08-23 21:47:55.000000000 -0400
 @@ -92,9 +92,17 @@ static __init int map_switcher(void)
         * it's worked so far.  The end address needs +1 because __get_vm_area
         * allocates an extra guard page, so we need space for that.
@@ -26653,9 +26678,9 @@ diff -urNp linux-3.0.3/drivers/lguest/core.c linux-3.0.3/drivers/lguest/core.c
               end_switcher_text - start_switcher_text);
  
        printk(KERN_INFO "lguest: mapped switcher at %p\n",
-diff -urNp linux-3.0.3/drivers/lguest/x86/core.c linux-3.0.3/drivers/lguest/x86/core.c
---- linux-3.0.3/drivers/lguest/x86/core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/lguest/x86/core.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/lguest/x86/core.c linux-3.0.4/drivers/lguest/x86/core.c
+--- linux-3.0.4/drivers/lguest/x86/core.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/lguest/x86/core.c      2011-08-23 21:47:55.000000000 -0400
 @@ -59,7 +59,7 @@ static struct {
  /* Offset from where switcher.S was compiled to where we've copied it */
  static unsigned long switcher_offset(void)
@@ -26697,9 +26722,9 @@ diff -urNp linux-3.0.3/drivers/lguest/x86/core.c linux-3.0.3/drivers/lguest/x86/
        lguest_entry.segment = LGUEST_CS;
  
        /*
-diff -urNp linux-3.0.3/drivers/lguest/x86/switcher_32.S linux-3.0.3/drivers/lguest/x86/switcher_32.S
---- linux-3.0.3/drivers/lguest/x86/switcher_32.S       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/lguest/x86/switcher_32.S       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/lguest/x86/switcher_32.S linux-3.0.4/drivers/lguest/x86/switcher_32.S
+--- linux-3.0.4/drivers/lguest/x86/switcher_32.S       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/lguest/x86/switcher_32.S       2011-08-23 21:47:55.000000000 -0400
 @@ -87,6 +87,7 @@
  #include <asm/page.h>
  #include <asm/segment.h>
@@ -26758,9 +26783,9 @@ diff -urNp linux-3.0.3/drivers/lguest/x86/switcher_32.S linux-3.0.3/drivers/lgue
  
  // Every interrupt can come to us here
  // But we must truly tell each apart.
-diff -urNp linux-3.0.3/drivers/md/dm.c linux-3.0.3/drivers/md/dm.c
---- linux-3.0.3/drivers/md/dm.c        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm.c linux-3.0.4/drivers/md/dm.c
+--- linux-3.0.4/drivers/md/dm.c        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/md/dm.c        2011-08-23 21:47:55.000000000 -0400
 @@ -164,9 +164,9 @@ struct mapped_device {
        /*
         * Event handling.
@@ -26815,9 +26840,9 @@ diff -urNp linux-3.0.3/drivers/md/dm.c linux-3.0.3/drivers/md/dm.c
  }
  
  void dm_uevent_add(struct mapped_device *md, struct list_head *elist)
-diff -urNp linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3/drivers/md/dm-ioctl.c
---- linux-3.0.3/drivers/md/dm-ioctl.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-ioctl.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-ioctl.c linux-3.0.4/drivers/md/dm-ioctl.c
+--- linux-3.0.4/drivers/md/dm-ioctl.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-ioctl.c  2011-08-23 21:47:55.000000000 -0400
 @@ -1551,7 +1551,7 @@ static int validate_params(uint cmd, str
            cmd == DM_LIST_VERSIONS_CMD)
                return 0;
@@ -26827,9 +26852,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3/drivers/md/dm-ioctl.c
                if (!*param->name) {
                        DMWARN("name not supplied when creating device");
                        return -EINVAL;
-diff -urNp linux-3.0.3/drivers/md/dm-raid1.c linux-3.0.3/drivers/md/dm-raid1.c
---- linux-3.0.3/drivers/md/dm-raid1.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-raid1.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-raid1.c linux-3.0.4/drivers/md/dm-raid1.c
+--- linux-3.0.4/drivers/md/dm-raid1.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-raid1.c  2011-08-23 21:47:55.000000000 -0400
 @@ -40,7 +40,7 @@ enum dm_raid1_error {
  
  struct mirror {
@@ -26902,9 +26927,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-raid1.c linux-3.0.3/drivers/md/dm-raid1.c
                return 'A';
  
        return (test_bit(DM_RAID1_FLUSH_ERROR, &(m->error_type))) ? 'F' :
-diff -urNp linux-3.0.3/drivers/md/dm-stripe.c linux-3.0.3/drivers/md/dm-stripe.c
---- linux-3.0.3/drivers/md/dm-stripe.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-stripe.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-stripe.c linux-3.0.4/drivers/md/dm-stripe.c
+--- linux-3.0.4/drivers/md/dm-stripe.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-stripe.c 2011-08-23 21:47:55.000000000 -0400
 @@ -20,7 +20,7 @@ struct stripe {
        struct dm_dev *dev;
        sector_t physical_start;
@@ -26943,9 +26968,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-stripe.c linux-3.0.3/drivers/md/dm-stripe.c
                            DM_IO_ERROR_THRESHOLD)
                                schedule_work(&sc->trigger_event);
                }
-diff -urNp linux-3.0.3/drivers/md/dm-table.c linux-3.0.3/drivers/md/dm-table.c
---- linux-3.0.3/drivers/md/dm-table.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/dm-table.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/dm-table.c linux-3.0.4/drivers/md/dm-table.c
+--- linux-3.0.4/drivers/md/dm-table.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/dm-table.c  2011-08-23 21:47:55.000000000 -0400
 @@ -390,7 +390,7 @@ static int device_area_is_invalid(struct
        if (!dev_size)
                return 0;
@@ -26955,9 +26980,9 @@ diff -urNp linux-3.0.3/drivers/md/dm-table.c linux-3.0.3/drivers/md/dm-table.c
                DMWARN("%s: %s too small for target: "
                       "start=%llu, len=%llu, dev_size=%llu",
                       dm_device_name(ti->table->md), bdevname(bdev, b),
-diff -urNp linux-3.0.3/drivers/md/md.c linux-3.0.3/drivers/md/md.c
---- linux-3.0.3/drivers/md/md.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/md.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/md.c linux-3.0.4/drivers/md/md.c
+--- linux-3.0.4/drivers/md/md.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/md.c        2011-08-23 21:47:55.000000000 -0400
 @@ -226,10 +226,10 @@ EXPORT_SYMBOL_GPL(bio_clone_mddev);
   *  start build, activate spare
   */
@@ -27072,9 +27097,9 @@ diff -urNp linux-3.0.3/drivers/md/md.c linux-3.0.3/drivers/md/md.c
                /* sync IO will cause sync_io to increase before the disk_stats
                 * as sync_io is counted when a request starts, and
                 * disk_stats is counted when it completes.
-diff -urNp linux-3.0.3/drivers/md/md.h linux-3.0.3/drivers/md/md.h
---- linux-3.0.3/drivers/md/md.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/md.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/md.h linux-3.0.4/drivers/md/md.h
+--- linux-3.0.4/drivers/md/md.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/md.h        2011-08-23 21:47:55.000000000 -0400
 @@ -97,13 +97,13 @@ struct mdk_rdev_s
                                         * only maintained for arrays that
                                         * support hot removal
@@ -27100,9 +27125,9 @@ diff -urNp linux-3.0.3/drivers/md/md.h linux-3.0.3/drivers/md/md.h
  }
  
  struct mdk_personality
-diff -urNp linux-3.0.3/drivers/md/raid10.c linux-3.0.3/drivers/md/raid10.c
---- linux-3.0.3/drivers/md/raid10.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/raid10.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/raid10.c linux-3.0.4/drivers/md/raid10.c
+--- linux-3.0.4/drivers/md/raid10.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/raid10.c    2011-08-23 21:47:55.000000000 -0400
 @@ -1186,7 +1186,7 @@ static void end_sync_read(struct bio *bi
        if (test_bit(BIO_UPTODATE, &bio->bi_flags))
                set_bit(R10BIO_Uptodate, &r10_bio->state);
@@ -27162,9 +27187,9 @@ diff -urNp linux-3.0.3/drivers/md/raid10.c linux-3.0.3/drivers/md/raid10.c
                                if (sync_page_io(rdev,
                                                 r10_bio->devs[sl].addr +
                                                 sect,
-diff -urNp linux-3.0.3/drivers/md/raid1.c linux-3.0.3/drivers/md/raid1.c
---- linux-3.0.3/drivers/md/raid1.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/raid1.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/raid1.c linux-3.0.4/drivers/md/raid1.c
+--- linux-3.0.4/drivers/md/raid1.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/raid1.c     2011-08-23 21:47:55.000000000 -0400
 @@ -1263,7 +1263,7 @@ static int fix_sync_read_error(r1bio_t *
                                rdev_dec_pending(rdev, mddev);
                                md_error(mddev, rdev);
@@ -27183,9 +27208,9 @@ diff -urNp linux-3.0.3/drivers/md/raid1.c linux-3.0.3/drivers/md/raid1.c
                                        printk(KERN_INFO
                                               "md/raid1:%s: read error corrected "
                                               "(%d sectors at %llu on %s)\n",
-diff -urNp linux-3.0.3/drivers/md/raid5.c linux-3.0.3/drivers/md/raid5.c
---- linux-3.0.3/drivers/md/raid5.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/md/raid5.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/md/raid5.c linux-3.0.4/drivers/md/raid5.c
+--- linux-3.0.4/drivers/md/raid5.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/md/raid5.c     2011-08-23 21:48:14.000000000 -0400
 @@ -550,7 +550,7 @@ static void ops_run_io(struct stripe_hea
                        bi->bi_next = NULL;
                        if ((rw & WRITE) &&
@@ -27231,9 +27256,9 @@ diff -urNp linux-3.0.3/drivers/md/raid5.c linux-3.0.3/drivers/md/raid5.c
  
        chunk_offset = sector_div(new_sector, sectors_per_chunk);
        stripe = new_sector;
-diff -urNp linux-3.0.3/drivers/media/common/saa7146_hlp.c linux-3.0.3/drivers/media/common/saa7146_hlp.c
---- linux-3.0.3/drivers/media/common/saa7146_hlp.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/common/saa7146_hlp.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/common/saa7146_hlp.c linux-3.0.4/drivers/media/common/saa7146_hlp.c
+--- linux-3.0.4/drivers/media/common/saa7146_hlp.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/common/saa7146_hlp.c     2011-08-23 21:48:14.000000000 -0400
 @@ -353,6 +353,8 @@ static void calculate_clipping_registers
  
        int x[32], y[32], w[32], h[32];
@@ -27243,9 +27268,9 @@ diff -urNp linux-3.0.3/drivers/media/common/saa7146_hlp.c linux-3.0.3/drivers/me
        /* clear out memory */
        memset(&line_list[0],  0x00, sizeof(u32)*32);
        memset(&pixel_list[0], 0x00, sizeof(u32)*32);
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
---- linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c
+--- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_ca_en50221.c    2011-08-23 21:48:14.000000000 -0400
 @@ -590,6 +590,8 @@ static int dvb_ca_en50221_read_data(stru
        u8 buf[HOST_LINK_BUF_SIZE];
        int i;
@@ -27264,9 +27289,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_ca_en50221.c linux-3.0.3/d
        dprintk("%s\n", __func__);
  
        /* Incoming packet has a 2 byte header. hdr[0] = slot_id, hdr[1] = connection_id */
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h
---- linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-24 18:24:40.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h
+--- linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-core/dvb_demux.h 2011-08-24 18:24:40.000000000 -0400
 @@ -68,12 +68,12 @@ struct dvb_demux_feed {
        union {
                struct dmx_ts_feed ts;
@@ -27282,9 +27307,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvb_demux.h linux-3.0.3/driver
  
        struct dvb_demux *demux;
        void *priv;
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c
---- linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c    2011-08-24 18:24:19.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c
+--- linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-core/dvbdev.c    2011-08-24 18:24:19.000000000 -0400
 @@ -192,7 +192,7 @@ int dvb_register_device(struct dvb_adapt
                        const struct dvb_device *template, void *priv, int type)
  {
@@ -27294,9 +27319,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-core/dvbdev.c linux-3.0.3/drivers/m
        struct device *clsdev;
        int minor;
        int id;
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c      2011-08-24 18:26:33.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/cxusb.c      2011-08-24 18:26:33.000000000 -0400
 @@ -1059,7 +1059,7 @@ static struct dib0070_config dib7070p_di
  struct dib0700_adapter_state {
        int (*set_param_save) (struct dvb_frontend *,
@@ -27306,9 +27331,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/cxusb.c linux-3.0.3/drivers/med
  
  static int dib7070_set_param_override(struct dvb_frontend *fe,
                                      struct dvb_frontend_parameters *fep)
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/dib0700_core.c       2011-08-23 21:48:14.000000000 -0400
 @@ -434,6 +434,8 @@ int dib0700_download_firmware(struct usb
        if (!buf)
                return -ENOMEM;
@@ -27318,9 +27343,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dib0700_core.c linux-3.0.3/driv
        while ((ret = dvb_usb_get_hexline(fw, &hx, &pos)) > 0) {
                deb_fwdata("writing to address 0x%08x (buffer: 0x%02x %02x)\n",
                                hx.addr, hx.len, hx.chk);
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h
---- linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h     2011-08-24 18:27:27.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/dibusb.h     2011-08-24 18:27:27.000000000 -0400
 @@ -97,7 +97,7 @@
  #define DIBUSB_IOCTL_CMD_DISABLE_STREAM       0x02
  
@@ -27330,9 +27355,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dibusb.h linux-3.0.3/drivers/me
        int mt2060_present;
        u8 tuner_addr;
  };
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c     2011-08-24 18:27:45.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/dw2102.c     2011-08-24 18:27:45.000000000 -0400
 @@ -95,7 +95,7 @@ struct su3000_state {
  
  struct s6x0_state {
@@ -27342,9 +27367,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/dw2102.c linux-3.0.3/drivers/me
  
  /* debug */
  static int dvb_usb_dw2102_debug;
-diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c
---- linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c
+--- linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/dvb-usb/lmedm04.c    2011-08-23 21:48:14.000000000 -0400
 @@ -742,6 +742,7 @@ static int lme2510_download_firmware(str
        usb_control_msg(dev, usb_rcvctrlpipe(dev, 0),
                        0x06, 0x80, 0x0200, 0x00, data, 0x0109, 1000);
@@ -27362,9 +27387,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/dvb-usb/lmedm04.c linux-3.0.3/drivers/m
        data[0] = 0x0a;
        len_in = 1;
        info("FRM Firmware Cold Reset");
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000.h linux-3.0.3/drivers/media/dvb/frontends/dib3000.h
---- linux-3.0.3/drivers/media/dvb/frontends/dib3000.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/dib3000.h  2011-08-24 18:28:18.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000.h linux-3.0.4/drivers/media/dvb/frontends/dib3000.h
+--- linux-3.0.4/drivers/media/dvb/frontends/dib3000.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/dib3000.h  2011-08-24 18:28:18.000000000 -0400
 @@ -40,10 +40,11 @@ struct dib_fe_xfer_ops
        int (*pid_ctrl)(struct dvb_frontend *fe, int index, int pid, int onoff);
        int (*tuner_pass_ctrl)(struct dvb_frontend *fe, int onoff, u8 pll_ctrl);
@@ -27378,9 +27403,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000.h linux-3.0.3/drivers
  #else
  static inline struct dvb_frontend* dib3000mb_attach(const struct dib3000_config* config,
                                             struct i2c_adapter* i2c, struct dib_fe_xfer_ops *xfer_ops)
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c
---- linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c        2011-08-24 18:28:42.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c
+--- linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/dib3000mb.c        2011-08-24 18:28:42.000000000 -0400
 @@ -756,7 +756,7 @@ static int dib3000mb_tuner_pass_ctrl(str
  static struct dvb_frontend_ops dib3000mb_ops;
  
@@ -27390,9 +27415,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/dib3000mb.c linux-3.0.3/drive
  {
        struct dib3000_state* state = NULL;
  
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c
---- linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c
+--- linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/mb86a16.c  2011-08-23 21:48:14.000000000 -0400
 @@ -1060,6 +1060,8 @@ static int mb86a16_set_fe(struct mb86a16
        int ret = -1;
        int sync;
@@ -27402,9 +27427,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/mb86a16.c linux-3.0.3/drivers
        dprintk(verbose, MB86A16_INFO, 1, "freq=%d Mhz, symbrt=%d Ksps", state->frequency, state->srate);
  
        fcp = 3000;
-diff -urNp linux-3.0.3/drivers/media/dvb/frontends/or51211.c linux-3.0.3/drivers/media/dvb/frontends/or51211.c
---- linux-3.0.3/drivers/media/dvb/frontends/or51211.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/dvb/frontends/or51211.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/dvb/frontends/or51211.c linux-3.0.4/drivers/media/dvb/frontends/or51211.c
+--- linux-3.0.4/drivers/media/dvb/frontends/or51211.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/dvb/frontends/or51211.c  2011-08-23 21:48:14.000000000 -0400
 @@ -113,6 +113,8 @@ static int or51211_load_firmware (struct
        u8 tudata[585];
        int i;
@@ -27414,9 +27439,9 @@ diff -urNp linux-3.0.3/drivers/media/dvb/frontends/or51211.c linux-3.0.3/drivers
        dprintk("Firmware is %zd bytes\n",fw->size);
  
        /* Get eprom data */
-diff -urNp linux-3.0.3/drivers/media/video/cx18/cx18-driver.c linux-3.0.3/drivers/media/video/cx18/cx18-driver.c
---- linux-3.0.3/drivers/media/video/cx18/cx18-driver.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/cx18/cx18-driver.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/cx18/cx18-driver.c linux-3.0.4/drivers/media/video/cx18/cx18-driver.c
+--- linux-3.0.4/drivers/media/video/cx18/cx18-driver.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/cx18/cx18-driver.c 2011-08-23 21:48:14.000000000 -0400
 @@ -327,6 +327,8 @@ void cx18_read_eeprom(struct cx18 *cx, s
        struct i2c_client c;
        u8 eedata[256];
@@ -27426,9 +27451,9 @@ diff -urNp linux-3.0.3/drivers/media/video/cx18/cx18-driver.c linux-3.0.3/driver
        memset(&c, 0, sizeof(c));
        strlcpy(c.name, "cx18 tveeprom tmp", sizeof(c.name));
        c.adapter = &cx->i2c_adap[0];
-diff -urNp linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c
---- linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c
+--- linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/cx23885/cx23885-input.c    2011-08-23 21:48:14.000000000 -0400
 @@ -53,6 +53,8 @@ static void cx23885_input_process_measur
        bool handle = false;
        struct ir_raw_event ir_core_event[64];
@@ -27438,9 +27463,9 @@ diff -urNp linux-3.0.3/drivers/media/video/cx23885/cx23885-input.c linux-3.0.3/d
        do {
                num = 0;
                v4l2_subdev_call(dev->sd_ir, ir, rx_read, (u8 *) ir_core_event,
-diff -urNp linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
---- linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c
+--- linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/pvrusb2/pvrusb2-eeprom.c   2011-08-23 21:48:14.000000000 -0400
 @@ -120,6 +120,8 @@ int pvr2_eeprom_analyze(struct pvr2_hdw 
        u8 *eeprom;
        struct tveeprom tvdata;
@@ -27450,9 +27475,9 @@ diff -urNp linux-3.0.3/drivers/media/video/pvrusb2/pvrusb2-eeprom.c linux-3.0.3/
        memset(&tvdata,0,sizeof(tvdata));
  
        eeprom = pvr2_eeprom_fetch(hdw);
-diff -urNp linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c
---- linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c
+--- linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/saa7134/saa6752hs.c        2011-08-23 21:48:14.000000000 -0400
 @@ -682,6 +682,8 @@ static int saa6752hs_init(struct v4l2_su
        unsigned char localPAT[256];
        unsigned char localPMT[256];
@@ -27462,9 +27487,9 @@ diff -urNp linux-3.0.3/drivers/media/video/saa7134/saa6752hs.c linux-3.0.3/drive
        /* Set video format - must be done first as it resets other settings */
        set_reg8(client, 0x41, h->video_format);
  
-diff -urNp linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c
---- linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c
+--- linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/saa7164/saa7164-cmd.c      2011-08-23 21:48:14.000000000 -0400
 @@ -88,6 +88,8 @@ int saa7164_irq_dequeue(struct saa7164_d
        u8 tmp[512];
        dprintk(DBGLVL_CMD, "%s()\n", __func__);
@@ -27483,9 +27508,9 @@ diff -urNp linux-3.0.3/drivers/media/video/saa7164/saa7164-cmd.c linux-3.0.3/dri
        while (loop) {
  
                struct tmComResInfo tRsp = { 0, 0, 0, 0, 0, 0 };
-diff -urNp linux-3.0.3/drivers/media/video/timblogiw.c linux-3.0.3/drivers/media/video/timblogiw.c
---- linux-3.0.3/drivers/media/video/timblogiw.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/timblogiw.c        2011-08-24 18:29:20.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/timblogiw.c linux-3.0.4/drivers/media/video/timblogiw.c
+--- linux-3.0.4/drivers/media/video/timblogiw.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/timblogiw.c        2011-08-24 18:29:20.000000000 -0400
 @@ -745,7 +745,7 @@ static int timblogiw_mmap(struct file *f
  
  /* Platform device functions */
@@ -27495,9 +27520,9 @@ diff -urNp linux-3.0.3/drivers/media/video/timblogiw.c linux-3.0.3/drivers/media
        .vidioc_querycap                = timblogiw_querycap,
        .vidioc_enum_fmt_vid_cap        = timblogiw_enum_fmt,
        .vidioc_g_fmt_vid_cap           = timblogiw_g_fmt,
-diff -urNp linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c
---- linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c
+--- linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/usbvision/usbvision-core.c 2011-08-23 21:48:14.000000000 -0400
 @@ -707,6 +707,8 @@ static enum parse_state usbvision_parse_
        unsigned char rv, gv, bv;
        static unsigned char *Y, *U, *V;
@@ -27507,9 +27532,9 @@ diff -urNp linux-3.0.3/drivers/media/video/usbvision/usbvision-core.c linux-3.0.
        frame = usbvision->cur_frame;
        image_size = frame->frmwidth * frame->frmheight;
        if ((frame->v4l2_format.format == V4L2_PIX_FMT_YUV422P) ||
-diff -urNp linux-3.0.3/drivers/media/video/videobuf-dma-sg.c linux-3.0.3/drivers/media/video/videobuf-dma-sg.c
---- linux-3.0.3/drivers/media/video/videobuf-dma-sg.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/media/video/videobuf-dma-sg.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/media/video/videobuf-dma-sg.c linux-3.0.4/drivers/media/video/videobuf-dma-sg.c
+--- linux-3.0.4/drivers/media/video/videobuf-dma-sg.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/media/video/videobuf-dma-sg.c  2011-08-23 21:48:14.000000000 -0400
 @@ -606,6 +606,8 @@ void *videobuf_sg_alloc(size_t size)
  {
        struct videobuf_queue q;
@@ -27519,9 +27544,9 @@ diff -urNp linux-3.0.3/drivers/media/video/videobuf-dma-sg.c linux-3.0.3/drivers
        /* Required to make generic handler to call __videobuf_alloc */
        q.int_ops = &sg_ops;
  
-diff -urNp linux-3.0.3/drivers/message/fusion/mptbase.c linux-3.0.3/drivers/message/fusion/mptbase.c
---- linux-3.0.3/drivers/message/fusion/mptbase.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/fusion/mptbase.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/fusion/mptbase.c linux-3.0.4/drivers/message/fusion/mptbase.c
+--- linux-3.0.4/drivers/message/fusion/mptbase.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/fusion/mptbase.c       2011-08-23 21:48:14.000000000 -0400
 @@ -6681,8 +6681,13 @@ static int mpt_iocinfo_proc_show(struct 
        seq_printf(m, "  MaxChainDepth = 0x%02x frames\n", ioc->facts.MaxChainDepth);
        seq_printf(m, "  MinBlockSize = 0x%02x bytes\n", 4*ioc->facts.BlockSize);
@@ -27536,9 +27561,9 @@ diff -urNp linux-3.0.3/drivers/message/fusion/mptbase.c linux-3.0.3/drivers/mess
        /*
         *  Rounding UP to nearest 4-kB boundary here...
         */
-diff -urNp linux-3.0.3/drivers/message/fusion/mptsas.c linux-3.0.3/drivers/message/fusion/mptsas.c
---- linux-3.0.3/drivers/message/fusion/mptsas.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/fusion/mptsas.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/fusion/mptsas.c linux-3.0.4/drivers/message/fusion/mptsas.c
+--- linux-3.0.4/drivers/message/fusion/mptsas.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/fusion/mptsas.c        2011-08-23 21:47:55.000000000 -0400
 @@ -439,6 +439,23 @@ mptsas_is_end_device(struct mptsas_devin
                return 0;
  }
@@ -27587,9 +27612,9 @@ diff -urNp linux-3.0.3/drivers/message/fusion/mptsas.c linux-3.0.3/drivers/messa
  static inline struct sas_port *
  mptsas_get_port(struct mptsas_phyinfo *phy_info)
  {
-diff -urNp linux-3.0.3/drivers/message/fusion/mptscsih.c linux-3.0.3/drivers/message/fusion/mptscsih.c
---- linux-3.0.3/drivers/message/fusion/mptscsih.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/fusion/mptscsih.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/fusion/mptscsih.c linux-3.0.4/drivers/message/fusion/mptscsih.c
+--- linux-3.0.4/drivers/message/fusion/mptscsih.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/fusion/mptscsih.c      2011-08-23 21:47:55.000000000 -0400
 @@ -1268,15 +1268,16 @@ mptscsih_info(struct Scsi_Host *SChost)
  
        h = shost_priv(SChost);
@@ -27615,9 +27640,9 @@ diff -urNp linux-3.0.3/drivers/message/fusion/mptscsih.c linux-3.0.3/drivers/mes
  
        return h->info_kbuf;
  }
-diff -urNp linux-3.0.3/drivers/message/i2o/i2o_config.c linux-3.0.3/drivers/message/i2o/i2o_config.c
---- linux-3.0.3/drivers/message/i2o/i2o_config.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/i2o/i2o_config.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/i2o/i2o_config.c linux-3.0.4/drivers/message/i2o/i2o_config.c
+--- linux-3.0.4/drivers/message/i2o/i2o_config.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/i2o/i2o_config.c       2011-08-23 21:48:14.000000000 -0400
 @@ -781,6 +781,8 @@ static int i2o_cfg_passthru(unsigned lon
        struct i2o_message *msg;
        unsigned int iop;
@@ -27627,9 +27652,9 @@ diff -urNp linux-3.0.3/drivers/message/i2o/i2o_config.c linux-3.0.3/drivers/mess
        if (get_user(iop, &cmd->iop) || get_user(user_msg, &cmd->msg))
                return -EFAULT;
  
-diff -urNp linux-3.0.3/drivers/message/i2o/i2o_proc.c linux-3.0.3/drivers/message/i2o/i2o_proc.c
---- linux-3.0.3/drivers/message/i2o/i2o_proc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/i2o/i2o_proc.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/i2o/i2o_proc.c linux-3.0.4/drivers/message/i2o/i2o_proc.c
+--- linux-3.0.4/drivers/message/i2o/i2o_proc.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/i2o/i2o_proc.c 2011-08-23 21:47:55.000000000 -0400
 @@ -255,13 +255,6 @@ static char *scsi_devices[] = {
        "Array Controller Device"
  };
@@ -27716,9 +27741,9 @@ diff -urNp linux-3.0.3/drivers/message/i2o/i2o_proc.c linux-3.0.3/drivers/messag
  
        return 0;
  }
-diff -urNp linux-3.0.3/drivers/message/i2o/iop.c linux-3.0.3/drivers/message/i2o/iop.c
---- linux-3.0.3/drivers/message/i2o/iop.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/message/i2o/iop.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/message/i2o/iop.c linux-3.0.4/drivers/message/i2o/iop.c
+--- linux-3.0.4/drivers/message/i2o/iop.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/message/i2o/iop.c      2011-08-23 21:47:55.000000000 -0400
 @@ -111,10 +111,10 @@ u32 i2o_cntxt_list_add(struct i2o_contro
  
        spin_lock_irqsave(&c->context_list_lock, flags);
@@ -27742,9 +27767,9 @@ diff -urNp linux-3.0.3/drivers/message/i2o/iop.c linux-3.0.3/drivers/message/i2o
        INIT_LIST_HEAD(&c->context_list);
  #endif
  
-diff -urNp linux-3.0.3/drivers/mfd/abx500-core.c linux-3.0.3/drivers/mfd/abx500-core.c
---- linux-3.0.3/drivers/mfd/abx500-core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mfd/abx500-core.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mfd/abx500-core.c linux-3.0.4/drivers/mfd/abx500-core.c
+--- linux-3.0.4/drivers/mfd/abx500-core.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mfd/abx500-core.c      2011-08-23 21:47:55.000000000 -0400
 @@ -14,7 +14,7 @@ static LIST_HEAD(abx500_list);
  
  struct abx500_device_entry {
@@ -27754,9 +27779,9 @@ diff -urNp linux-3.0.3/drivers/mfd/abx500-core.c linux-3.0.3/drivers/mfd/abx500-
        struct device *dev;
  };
  
-diff -urNp linux-3.0.3/drivers/mfd/janz-cmodio.c linux-3.0.3/drivers/mfd/janz-cmodio.c
---- linux-3.0.3/drivers/mfd/janz-cmodio.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mfd/janz-cmodio.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mfd/janz-cmodio.c linux-3.0.4/drivers/mfd/janz-cmodio.c
+--- linux-3.0.4/drivers/mfd/janz-cmodio.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mfd/janz-cmodio.c      2011-08-23 21:47:55.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/kernel.h>
@@ -27765,9 +27790,9 @@ diff -urNp linux-3.0.3/drivers/mfd/janz-cmodio.c linux-3.0.3/drivers/mfd/janz-cm
  #include <linux/init.h>
  #include <linux/pci.h>
  #include <linux/interrupt.h>
-diff -urNp linux-3.0.3/drivers/mfd/wm8350-i2c.c linux-3.0.3/drivers/mfd/wm8350-i2c.c
---- linux-3.0.3/drivers/mfd/wm8350-i2c.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mfd/wm8350-i2c.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mfd/wm8350-i2c.c linux-3.0.4/drivers/mfd/wm8350-i2c.c
+--- linux-3.0.4/drivers/mfd/wm8350-i2c.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mfd/wm8350-i2c.c       2011-08-23 21:48:14.000000000 -0400
 @@ -44,6 +44,8 @@ static int wm8350_i2c_write_device(struc
        u8 msg[(WM8350_MAX_REGISTER << 1) + 1];
        int ret;
@@ -27777,9 +27802,9 @@ diff -urNp linux-3.0.3/drivers/mfd/wm8350-i2c.c linux-3.0.3/drivers/mfd/wm8350-i
        if (bytes > ((WM8350_MAX_REGISTER << 1) + 1))
                return -EINVAL;
  
-diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c
---- linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c
+--- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.c     2011-08-23 21:47:55.000000000 -0400
 @@ -435,7 +435,7 @@ static irqreturn_t lis302dl_interrupt(in
         * the lid is closed. This leads to interrupts as soon as a little move
         * is done.
@@ -27816,9 +27841,9 @@ diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.c linux-3.0.3/drivers/mi
                return POLLIN | POLLRDNORM;
        return 0;
  }
-diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h
---- linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h
+--- linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/lis3lv02d/lis3lv02d.h     2011-08-23 21:47:55.000000000 -0400
 @@ -265,7 +265,7 @@ struct lis3lv02d {
        struct input_polled_dev *idev;     /* input device */
        struct platform_device  *pdev;     /* platform device */
@@ -27828,9 +27853,9 @@ diff -urNp linux-3.0.3/drivers/misc/lis3lv02d/lis3lv02d.h linux-3.0.3/drivers/mi
        union axis_conversion   ac;        /* hw -> logical axis */
        int                     mapped_btns[3];
  
-diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c
---- linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c
+--- linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-gru/gruhandles.c      2011-08-23 21:47:55.000000000 -0400
 @@ -44,8 +44,8 @@ static void update_mcs_stats(enum mcs_op
        unsigned long nsec;
  
@@ -27842,9 +27867,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruhandles.c linux-3.0.3/drivers/mis
        if (mcs_op_statistics[op].max < nsec)
                mcs_op_statistics[op].max = nsec;
  }
-diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c
---- linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c
+--- linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-gru/gruprocfs.c       2011-08-23 21:47:55.000000000 -0400
 @@ -32,9 +32,9 @@
  
  #define printstat(s, f)               printstat_val(s, &gru_stats.f, #f)
@@ -27868,9 +27893,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-gru/gruprocfs.c linux-3.0.3/drivers/misc
                max = mcs_op_statistics[op].max;
                seq_printf(s, "%-20s%12ld%12ld%12ld\n", id[op], count,
                           count ? total / count : 0, max);
-diff -urNp linux-3.0.3/drivers/misc/sgi-gru/grutables.h linux-3.0.3/drivers/misc/sgi-gru/grutables.h
---- linux-3.0.3/drivers/misc/sgi-gru/grutables.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-gru/grutables.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-gru/grutables.h linux-3.0.4/drivers/misc/sgi-gru/grutables.h
+--- linux-3.0.4/drivers/misc/sgi-gru/grutables.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-gru/grutables.h       2011-08-23 21:47:55.000000000 -0400
 @@ -167,82 +167,82 @@ extern unsigned int gru_max_gids;
   * GRU statistics.
   */
@@ -28050,9 +28075,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-gru/grutables.h linux-3.0.3/drivers/misc
                        } while (0)
  
  #ifdef CONFIG_SGI_GRU_DEBUG
-diff -urNp linux-3.0.3/drivers/misc/sgi-xp/xp.h linux-3.0.3/drivers/misc/sgi-xp/xp.h
---- linux-3.0.3/drivers/misc/sgi-xp/xp.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/misc/sgi-xp/xp.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/misc/sgi-xp/xp.h linux-3.0.4/drivers/misc/sgi-xp/xp.h
+--- linux-3.0.4/drivers/misc/sgi-xp/xp.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/misc/sgi-xp/xp.h       2011-08-23 21:47:55.000000000 -0400
 @@ -289,7 +289,7 @@ struct xpc_interface {
                                        xpc_notify_func, void *);
        void (*received) (short, int, void *);
@@ -28062,9 +28087,9 @@ diff -urNp linux-3.0.3/drivers/misc/sgi-xp/xp.h linux-3.0.3/drivers/misc/sgi-xp/
  
  extern struct xpc_interface xpc_interface;
  
-diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c
---- linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c
+--- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0001.c    2011-08-23 21:48:14.000000000 -0400
 @@ -757,6 +757,8 @@ static int chip_ready (struct map_info *
        struct cfi_pri_intelext *cfip = cfi->cmdset_priv;
        unsigned long timeo = jiffies + HZ;
@@ -28092,9 +28117,9 @@ diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0001.c linux-3.0.3/drivers/m
        adr += chip->start;
  
   retry:
-diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c
---- linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c
+--- linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/chips/cfi_cmdset_0020.c    2011-08-23 21:48:14.000000000 -0400
 @@ -255,6 +255,8 @@ static inline int do_read_onechip(struct
        unsigned long cmd_addr;
        struct cfi_private *cfi = map->fldrv_priv;
@@ -28140,9 +28165,9 @@ diff -urNp linux-3.0.3/drivers/mtd/chips/cfi_cmdset_0020.c linux-3.0.3/drivers/m
        adr += chip->start;
  
        /* Let's determine this according to the interleave only once */
-diff -urNp linux-3.0.3/drivers/mtd/devices/doc2000.c linux-3.0.3/drivers/mtd/devices/doc2000.c
---- linux-3.0.3/drivers/mtd/devices/doc2000.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/devices/doc2000.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/devices/doc2000.c linux-3.0.4/drivers/mtd/devices/doc2000.c
+--- linux-3.0.4/drivers/mtd/devices/doc2000.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/devices/doc2000.c  2011-08-23 21:47:55.000000000 -0400
 @@ -776,7 +776,7 @@ static int doc_write(struct mtd_info *mt
  
                /* The ECC will not be calculated correctly if less than 512 is written */
@@ -28152,9 +28177,9 @@ diff -urNp linux-3.0.3/drivers/mtd/devices/doc2000.c linux-3.0.3/drivers/mtd/dev
                        printk(KERN_WARNING
                               "ECC needs a full sector write (adr: %lx size %lx)\n",
                               (long) to, (long) len);
-diff -urNp linux-3.0.3/drivers/mtd/devices/doc2001.c linux-3.0.3/drivers/mtd/devices/doc2001.c
---- linux-3.0.3/drivers/mtd/devices/doc2001.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/devices/doc2001.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/devices/doc2001.c linux-3.0.4/drivers/mtd/devices/doc2001.c
+--- linux-3.0.4/drivers/mtd/devices/doc2001.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/devices/doc2001.c  2011-08-23 21:47:55.000000000 -0400
 @@ -393,7 +393,7 @@ static int doc_read (struct mtd_info *mt
        struct Nand *mychip = &this->chips[from >> (this->chipshift)];
  
@@ -28164,9 +28189,9 @@ diff -urNp linux-3.0.3/drivers/mtd/devices/doc2001.c linux-3.0.3/drivers/mtd/dev
                return -EINVAL;
  
        /* Don't allow a single read to cross a 512-byte block boundary */
-diff -urNp linux-3.0.3/drivers/mtd/ftl.c linux-3.0.3/drivers/mtd/ftl.c
---- linux-3.0.3/drivers/mtd/ftl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/ftl.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/ftl.c linux-3.0.4/drivers/mtd/ftl.c
+--- linux-3.0.4/drivers/mtd/ftl.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/ftl.c      2011-08-23 21:48:14.000000000 -0400
 @@ -474,6 +474,8 @@ static int copy_erase_unit(partition_t *
      loff_t offset;
      uint16_t srcunitswap = cpu_to_le16(srcunit);
@@ -28176,9 +28201,9 @@ diff -urNp linux-3.0.3/drivers/mtd/ftl.c linux-3.0.3/drivers/mtd/ftl.c
      eun = &part->EUNInfo[srcunit];
      xfer = &part->XferInfo[xferunit];
      DEBUG(2, "ftl_cs: copying block 0x%x to 0x%x\n",
-diff -urNp linux-3.0.3/drivers/mtd/inftlcore.c linux-3.0.3/drivers/mtd/inftlcore.c
---- linux-3.0.3/drivers/mtd/inftlcore.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/inftlcore.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/inftlcore.c linux-3.0.4/drivers/mtd/inftlcore.c
+--- linux-3.0.4/drivers/mtd/inftlcore.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/inftlcore.c        2011-08-23 21:48:14.000000000 -0400
 @@ -259,6 +259,8 @@ static u16 INFTL_foldchain(struct INFTLr
        struct inftl_oob oob;
        size_t retlen;
@@ -28188,9 +28213,9 @@ diff -urNp linux-3.0.3/drivers/mtd/inftlcore.c linux-3.0.3/drivers/mtd/inftlcore
        DEBUG(MTD_DEBUG_LEVEL3, "INFTL: INFTL_foldchain(inftl=%p,thisVUC=%d,"
                "pending=%d)\n", inftl, thisVUC, pendingblock);
  
-diff -urNp linux-3.0.3/drivers/mtd/inftlmount.c linux-3.0.3/drivers/mtd/inftlmount.c
---- linux-3.0.3/drivers/mtd/inftlmount.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/inftlmount.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/inftlmount.c linux-3.0.4/drivers/mtd/inftlmount.c
+--- linux-3.0.4/drivers/mtd/inftlmount.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/inftlmount.c       2011-08-23 21:48:14.000000000 -0400
 @@ -53,6 +53,8 @@ static int find_boot_record(struct INFTL
        struct INFTLPartition *ip;
        size_t retlen;
@@ -28200,9 +28225,9 @@ diff -urNp linux-3.0.3/drivers/mtd/inftlmount.c linux-3.0.3/drivers/mtd/inftlmou
        DEBUG(MTD_DEBUG_LEVEL3, "INFTL: find_boot_record(inftl=%p)\n", inftl);
  
          /*
-diff -urNp linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c
---- linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c
+--- linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/lpddr/qinfo_probe.c        2011-08-23 21:48:14.000000000 -0400
 @@ -106,6 +106,8 @@ static int lpddr_pfow_present(struct map
  {
        map_word pfow_val[4];
@@ -28212,9 +28237,9 @@ diff -urNp linux-3.0.3/drivers/mtd/lpddr/qinfo_probe.c linux-3.0.3/drivers/mtd/l
        /* Check identification string */
        pfow_val[0] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_P);
        pfow_val[1] = map_read(map, map->pfow_base + PFOW_QUERY_STRING_F);
-diff -urNp linux-3.0.3/drivers/mtd/mtdchar.c linux-3.0.3/drivers/mtd/mtdchar.c
---- linux-3.0.3/drivers/mtd/mtdchar.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/mtdchar.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/mtdchar.c linux-3.0.4/drivers/mtd/mtdchar.c
+--- linux-3.0.4/drivers/mtd/mtdchar.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/mtdchar.c  2011-08-23 21:48:14.000000000 -0400
 @@ -553,6 +553,8 @@ static int mtd_ioctl(struct file *file, 
        u_long size;
        struct mtd_info_user info;
@@ -28224,9 +28249,9 @@ diff -urNp linux-3.0.3/drivers/mtd/mtdchar.c linux-3.0.3/drivers/mtd/mtdchar.c
        DEBUG(MTD_DEBUG_LEVEL0, "MTD_ioctl\n");
  
        size = (cmd & IOCSIZE_MASK) >> IOCSIZE_SHIFT;
-diff -urNp linux-3.0.3/drivers/mtd/nand/denali.c linux-3.0.3/drivers/mtd/nand/denali.c
---- linux-3.0.3/drivers/mtd/nand/denali.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/nand/denali.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/nand/denali.c linux-3.0.4/drivers/mtd/nand/denali.c
+--- linux-3.0.4/drivers/mtd/nand/denali.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/nand/denali.c      2011-08-23 21:47:55.000000000 -0400
 @@ -26,6 +26,7 @@
  #include <linux/pci.h>
  #include <linux/mtd/mtd.h>
@@ -28235,9 +28260,9 @@ diff -urNp linux-3.0.3/drivers/mtd/nand/denali.c linux-3.0.3/drivers/mtd/nand/de
  
  #include "denali.h"
  
-diff -urNp linux-3.0.3/drivers/mtd/nftlcore.c linux-3.0.3/drivers/mtd/nftlcore.c
---- linux-3.0.3/drivers/mtd/nftlcore.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/nftlcore.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/nftlcore.c linux-3.0.4/drivers/mtd/nftlcore.c
+--- linux-3.0.4/drivers/mtd/nftlcore.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/nftlcore.c 2011-08-23 21:48:14.000000000 -0400
 @@ -264,6 +264,8 @@ static u16 NFTL_foldchain (struct NFTLre
        int inplace = 1;
        size_t retlen;
@@ -28247,9 +28272,9 @@ diff -urNp linux-3.0.3/drivers/mtd/nftlcore.c linux-3.0.3/drivers/mtd/nftlcore.c
        memset(BlockMap, 0xff, sizeof(BlockMap));
        memset(BlockFreeFound, 0, sizeof(BlockFreeFound));
  
-diff -urNp linux-3.0.3/drivers/mtd/nftlmount.c linux-3.0.3/drivers/mtd/nftlmount.c
---- linux-3.0.3/drivers/mtd/nftlmount.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/nftlmount.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/nftlmount.c linux-3.0.4/drivers/mtd/nftlmount.c
+--- linux-3.0.4/drivers/mtd/nftlmount.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/nftlmount.c        2011-08-23 21:48:14.000000000 -0400
 @@ -24,6 +24,7 @@
  #include <asm/errno.h>
  #include <linux/delay.h>
@@ -28267,9 +28292,9 @@ diff -urNp linux-3.0.3/drivers/mtd/nftlmount.c linux-3.0.3/drivers/mtd/nftlmount
          /* Assume logical EraseSize == physical erasesize for starting the scan.
           We'll sort it out later if we find a MediaHeader which says otherwise */
        /* Actually, we won't.  The new DiskOnChip driver has already scanned
-diff -urNp linux-3.0.3/drivers/mtd/ubi/build.c linux-3.0.3/drivers/mtd/ubi/build.c
---- linux-3.0.3/drivers/mtd/ubi/build.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/mtd/ubi/build.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/mtd/ubi/build.c linux-3.0.4/drivers/mtd/ubi/build.c
+--- linux-3.0.4/drivers/mtd/ubi/build.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/mtd/ubi/build.c        2011-08-23 21:47:55.000000000 -0400
 @@ -1287,7 +1287,7 @@ module_exit(ubi_exit);
  static int __init bytes_str_to_int(const char *str)
  {
@@ -28309,9 +28334,9 @@ diff -urNp linux-3.0.3/drivers/mtd/ubi/build.c linux-3.0.3/drivers/mtd/ubi/build
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c
---- linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c
+--- linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bna/bfa_ioc_ct.c   2011-08-23 21:47:55.000000000 -0400
 @@ -48,7 +48,21 @@ static void bfa_ioc_ct_sync_ack(struct b
  static bool bfa_ioc_ct_sync_complete(struct bfa_ioc *ioc);
  static enum bfa_status bfa_ioc_ct_pll_init(void __iomem *rb, bool fcmode);
@@ -28356,9 +28381,9 @@ diff -urNp linux-3.0.3/drivers/net/bna/bfa_ioc_ct.c linux-3.0.3/drivers/net/bna/
        ioc->ioc_hwif = &nw_hwif_ct;
  }
  
-diff -urNp linux-3.0.3/drivers/net/bna/bnad.c linux-3.0.3/drivers/net/bna/bnad.c
---- linux-3.0.3/drivers/net/bna/bnad.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bna/bnad.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bna/bnad.c linux-3.0.4/drivers/net/bna/bnad.c
+--- linux-3.0.4/drivers/net/bna/bnad.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bna/bnad.c 2011-08-23 21:47:55.000000000 -0400
 @@ -1681,7 +1681,14 @@ bnad_setup_tx(struct bnad *bnad, uint tx
        struct bna_intr_info *intr_info =
                        &res_info[BNA_TX_RES_INTR_T_TXCMPL].res_u.intr_info;
@@ -28420,9 +28445,9 @@ diff -urNp linux-3.0.3/drivers/net/bna/bnad.c linux-3.0.3/drivers/net/bna/bnad.c
        /* Get BNA's resource requirement for one Rx object */
        spin_lock_irqsave(&bnad->bna_lock, flags);
        bna_rx_res_req(rx_config, res_info);
-diff -urNp linux-3.0.3/drivers/net/bnx2.c linux-3.0.3/drivers/net/bnx2.c
---- linux-3.0.3/drivers/net/bnx2.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bnx2.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bnx2.c linux-3.0.4/drivers/net/bnx2.c
+--- linux-3.0.4/drivers/net/bnx2.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bnx2.c     2011-08-23 21:48:14.000000000 -0400
 @@ -5828,6 +5828,8 @@ bnx2_test_nvram(struct bnx2 *bp)
        int rc = 0;
        u32 magic, csum;
@@ -28432,9 +28457,9 @@ diff -urNp linux-3.0.3/drivers/net/bnx2.c linux-3.0.3/drivers/net/bnx2.c
        if ((rc = bnx2_nvram_read(bp, 0, data, 4)) != 0)
                goto test_nvram_done;
  
-diff -urNp linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c
---- linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c
+--- linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/bnx2x/bnx2x_ethtool.c      2011-08-23 21:48:14.000000000 -0400
 @@ -1705,6 +1705,8 @@ static int bnx2x_test_nvram(struct bnx2x
        int i, rc;
        u32 magic, crc;
@@ -28444,9 +28469,9 @@ diff -urNp linux-3.0.3/drivers/net/bnx2x/bnx2x_ethtool.c linux-3.0.3/drivers/net
        if (BP_NOMCP(bp))
                return 0;
  
-diff -urNp linux-3.0.3/drivers/net/cxgb3/l2t.h linux-3.0.3/drivers/net/cxgb3/l2t.h
---- linux-3.0.3/drivers/net/cxgb3/l2t.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/cxgb3/l2t.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/cxgb3/l2t.h linux-3.0.4/drivers/net/cxgb3/l2t.h
+--- linux-3.0.4/drivers/net/cxgb3/l2t.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/cxgb3/l2t.h        2011-08-23 21:47:55.000000000 -0400
 @@ -86,7 +86,7 @@ typedef void (*arp_failure_handler_func)
   */
  struct l2t_skb_cb {
@@ -28456,9 +28481,9 @@ diff -urNp linux-3.0.3/drivers/net/cxgb3/l2t.h linux-3.0.3/drivers/net/cxgb3/l2t
  
  #define L2T_SKB_CB(skb) ((struct l2t_skb_cb *)(skb)->cb)
  
-diff -urNp linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c
---- linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c
+--- linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/cxgb4/cxgb4_main.c 2011-08-23 21:48:14.000000000 -0400
 @@ -3396,6 +3396,8 @@ static int __devinit enable_msix(struct 
        unsigned int nchan = adap->params.nports;
        struct msix_entry entries[MAX_INGQ + 1];
@@ -28468,9 +28493,9 @@ diff -urNp linux-3.0.3/drivers/net/cxgb4/cxgb4_main.c linux-3.0.3/drivers/net/cx
        for (i = 0; i < ARRAY_SIZE(entries); ++i)
                entries[i].entry = i;
  
-diff -urNp linux-3.0.3/drivers/net/cxgb4/t4_hw.c linux-3.0.3/drivers/net/cxgb4/t4_hw.c
---- linux-3.0.3/drivers/net/cxgb4/t4_hw.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/cxgb4/t4_hw.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/cxgb4/t4_hw.c linux-3.0.4/drivers/net/cxgb4/t4_hw.c
+--- linux-3.0.4/drivers/net/cxgb4/t4_hw.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/cxgb4/t4_hw.c      2011-08-23 21:48:14.000000000 -0400
 @@ -362,6 +362,8 @@ static int get_vpd_params(struct adapter
        u8 vpd[VPD_LEN], csum;
        unsigned int vpdr_len, kw_offset, id_len;
@@ -28480,9 +28505,9 @@ diff -urNp linux-3.0.3/drivers/net/cxgb4/t4_hw.c linux-3.0.3/drivers/net/cxgb4/t
        ret = pci_read_vpd(adapter->pdev, VPD_BASE, sizeof(vpd), vpd);
        if (ret < 0)
                return ret;
-diff -urNp linux-3.0.3/drivers/net/e1000e/82571.c linux-3.0.3/drivers/net/e1000e/82571.c
---- linux-3.0.3/drivers/net/e1000e/82571.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/e1000e/82571.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/e1000e/82571.c linux-3.0.4/drivers/net/e1000e/82571.c
+--- linux-3.0.4/drivers/net/e1000e/82571.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/e1000e/82571.c     2011-08-23 21:47:55.000000000 -0400
 @@ -239,7 +239,7 @@ static s32 e1000_init_mac_params_82571(s
  {
        struct e1000_hw *hw = &adapter->hw;
@@ -28492,9 +28517,9 @@ diff -urNp linux-3.0.3/drivers/net/e1000e/82571.c linux-3.0.3/drivers/net/e1000e
        u32 swsm = 0;
        u32 swsm2 = 0;
        bool force_clear_smbi = false;
-diff -urNp linux-3.0.3/drivers/net/e1000e/es2lan.c linux-3.0.3/drivers/net/e1000e/es2lan.c
---- linux-3.0.3/drivers/net/e1000e/es2lan.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/e1000e/es2lan.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/e1000e/es2lan.c linux-3.0.4/drivers/net/e1000e/es2lan.c
+--- linux-3.0.4/drivers/net/e1000e/es2lan.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/e1000e/es2lan.c    2011-08-23 21:47:55.000000000 -0400
 @@ -205,7 +205,7 @@ static s32 e1000_init_mac_params_80003es
  {
        struct e1000_hw *hw = &adapter->hw;
@@ -28504,9 +28529,9 @@ diff -urNp linux-3.0.3/drivers/net/e1000e/es2lan.c linux-3.0.3/drivers/net/e1000
  
        /* Set media type */
        switch (adapter->pdev->device) {
-diff -urNp linux-3.0.3/drivers/net/e1000e/hw.h linux-3.0.3/drivers/net/e1000e/hw.h
---- linux-3.0.3/drivers/net/e1000e/hw.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/e1000e/hw.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/e1000e/hw.h linux-3.0.4/drivers/net/e1000e/hw.h
+--- linux-3.0.4/drivers/net/e1000e/hw.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/e1000e/hw.h        2011-08-23 21:47:55.000000000 -0400
 @@ -776,6 +776,7 @@ struct e1000_mac_operations {
        void (*write_vfta)(struct e1000_hw *, u32, u32);
        s32  (*read_mac_addr)(struct e1000_hw *);
@@ -28553,9 +28578,9 @@ diff -urNp linux-3.0.3/drivers/net/e1000e/hw.h linux-3.0.3/drivers/net/e1000e/hw
  
        enum e1000_nvm_type type;
        enum e1000_nvm_override override;
-diff -urNp linux-3.0.3/drivers/net/hamradio/6pack.c linux-3.0.3/drivers/net/hamradio/6pack.c
---- linux-3.0.3/drivers/net/hamradio/6pack.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/hamradio/6pack.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/hamradio/6pack.c linux-3.0.4/drivers/net/hamradio/6pack.c
+--- linux-3.0.4/drivers/net/hamradio/6pack.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/hamradio/6pack.c   2011-08-23 21:48:14.000000000 -0400
 @@ -463,6 +463,8 @@ static void sixpack_receive_buf(struct t
        unsigned char buf[512];
        int count1;
@@ -28565,9 +28590,9 @@ diff -urNp linux-3.0.3/drivers/net/hamradio/6pack.c linux-3.0.3/drivers/net/hamr
        if (!count)
                return;
  
-diff -urNp linux-3.0.3/drivers/net/igb/e1000_hw.h linux-3.0.3/drivers/net/igb/e1000_hw.h
---- linux-3.0.3/drivers/net/igb/e1000_hw.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/igb/e1000_hw.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/igb/e1000_hw.h linux-3.0.4/drivers/net/igb/e1000_hw.h
+--- linux-3.0.4/drivers/net/igb/e1000_hw.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/igb/e1000_hw.h     2011-08-23 21:47:55.000000000 -0400
 @@ -314,6 +314,7 @@ struct e1000_mac_operations {
        s32  (*read_mac_addr)(struct e1000_hw *);
        s32  (*get_speed_and_duplex)(struct e1000_hw *, u16 *, u16 *);
@@ -28636,9 +28661,9 @@ diff -urNp linux-3.0.3/drivers/net/igb/e1000_hw.h linux-3.0.3/drivers/net/igb/e1
        struct e1000_mbx_stats stats;
        u32 timeout;
        u32 usec_delay;
-diff -urNp linux-3.0.3/drivers/net/igbvf/vf.h linux-3.0.3/drivers/net/igbvf/vf.h
---- linux-3.0.3/drivers/net/igbvf/vf.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/igbvf/vf.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/igbvf/vf.h linux-3.0.4/drivers/net/igbvf/vf.h
+--- linux-3.0.4/drivers/net/igbvf/vf.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/igbvf/vf.h 2011-08-23 21:47:55.000000000 -0400
 @@ -189,9 +189,10 @@ struct e1000_mac_operations {
        s32  (*read_mac_addr)(struct e1000_hw *);
        s32  (*set_vfta)(struct e1000_hw *, u16, bool);
@@ -28668,9 +28693,9 @@ diff -urNp linux-3.0.3/drivers/net/igbvf/vf.h linux-3.0.3/drivers/net/igbvf/vf.h
        struct e1000_mbx_stats stats;
        u32 timeout;
        u32 usec_delay;
-diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_main.c linux-3.0.3/drivers/net/ixgb/ixgb_main.c
---- linux-3.0.3/drivers/net/ixgb/ixgb_main.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgb/ixgb_main.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_main.c linux-3.0.4/drivers/net/ixgb/ixgb_main.c
+--- linux-3.0.4/drivers/net/ixgb/ixgb_main.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgb/ixgb_main.c   2011-08-23 21:48:14.000000000 -0400
 @@ -1070,6 +1070,8 @@ ixgb_set_multi(struct net_device *netdev
        u32 rctl;
        int i;
@@ -28680,9 +28705,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_main.c linux-3.0.3/drivers/net/ixgb
        /* Check for Promiscuous and All Multicast modes */
  
        rctl = IXGB_READ_REG(hw, RCTL);
-diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_param.c linux-3.0.3/drivers/net/ixgb/ixgb_param.c
---- linux-3.0.3/drivers/net/ixgb/ixgb_param.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgb/ixgb_param.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgb/ixgb_param.c linux-3.0.4/drivers/net/ixgb/ixgb_param.c
+--- linux-3.0.4/drivers/net/ixgb/ixgb_param.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgb/ixgb_param.c  2011-08-23 21:48:14.000000000 -0400
 @@ -261,6 +261,9 @@ void __devinit
  ixgb_check_options(struct ixgb_adapter *adapter)
  {
@@ -28693,9 +28718,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgb/ixgb_param.c linux-3.0.3/drivers/net/ixg
        if (bd >= IXGB_MAX_NIC) {
                pr_notice("Warning: no configuration for board #%i\n", bd);
                pr_notice("Using defaults for all values\n");
-diff -urNp linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h
---- linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h
+--- linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgbe/ixgbe_type.h 2011-08-23 21:47:55.000000000 -0400
 @@ -2584,6 +2584,7 @@ struct ixgbe_eeprom_operations {
        s32 (*update_checksum)(struct ixgbe_hw *);
        u16 (*calc_checksum)(struct ixgbe_hw *);
@@ -28759,9 +28784,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgbe/ixgbe_type.h linux-3.0.3/drivers/net/ix
        struct ixgbe_mbx_stats stats;
        u32 timeout;
        u32 usec_delay;
-diff -urNp linux-3.0.3/drivers/net/ixgbevf/vf.h linux-3.0.3/drivers/net/ixgbevf/vf.h
---- linux-3.0.3/drivers/net/ixgbevf/vf.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ixgbevf/vf.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ixgbevf/vf.h linux-3.0.4/drivers/net/ixgbevf/vf.h
+--- linux-3.0.4/drivers/net/ixgbevf/vf.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ixgbevf/vf.h       2011-08-23 21:47:55.000000000 -0400
 @@ -70,6 +70,7 @@ struct ixgbe_mac_operations {
        s32 (*clear_vfta)(struct ixgbe_hw *);
        s32 (*set_vfta)(struct ixgbe_hw *, u32, u32, bool);
@@ -28796,9 +28821,9 @@ diff -urNp linux-3.0.3/drivers/net/ixgbevf/vf.h linux-3.0.3/drivers/net/ixgbevf/
        struct ixgbe_mbx_stats stats;
        u32 timeout;
        u32 udelay;
-diff -urNp linux-3.0.3/drivers/net/ksz884x.c linux-3.0.3/drivers/net/ksz884x.c
---- linux-3.0.3/drivers/net/ksz884x.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ksz884x.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ksz884x.c linux-3.0.4/drivers/net/ksz884x.c
+--- linux-3.0.4/drivers/net/ksz884x.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ksz884x.c  2011-08-23 21:48:14.000000000 -0400
 @@ -6534,6 +6534,8 @@ static void netdev_get_ethtool_stats(str
        int rc;
        u64 counter[TOTAL_PORT_COUNTER_NUM];
@@ -28808,9 +28833,9 @@ diff -urNp linux-3.0.3/drivers/net/ksz884x.c linux-3.0.3/drivers/net/ksz884x.c
        mutex_lock(&hw_priv->lock);
        n = SWITCH_PORT_NUM;
        for (i = 0, p = port->first_port; i < port->mib_port_cnt; i++, p++) {
-diff -urNp linux-3.0.3/drivers/net/mlx4/main.c linux-3.0.3/drivers/net/mlx4/main.c
---- linux-3.0.3/drivers/net/mlx4/main.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/mlx4/main.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/mlx4/main.c linux-3.0.4/drivers/net/mlx4/main.c
+--- linux-3.0.4/drivers/net/mlx4/main.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/mlx4/main.c        2011-08-23 21:48:14.000000000 -0400
 @@ -40,6 +40,7 @@
  #include <linux/dma-mapping.h>
  #include <linux/slab.h>
@@ -28828,9 +28853,9 @@ diff -urNp linux-3.0.3/drivers/net/mlx4/main.c linux-3.0.3/drivers/net/mlx4/main
        err = mlx4_QUERY_FW(dev);
        if (err) {
                if (err == -EACCES)
-diff -urNp linux-3.0.3/drivers/net/niu.c linux-3.0.3/drivers/net/niu.c
---- linux-3.0.3/drivers/net/niu.c      2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/niu.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/niu.c linux-3.0.4/drivers/net/niu.c
+--- linux-3.0.4/drivers/net/niu.c      2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/niu.c      2011-08-23 21:48:14.000000000 -0400
 @@ -9056,6 +9056,8 @@ static void __devinit niu_try_msix(struc
        int i, num_irqs, err;
        u8 first_ldg;
@@ -28840,9 +28865,9 @@ diff -urNp linux-3.0.3/drivers/net/niu.c linux-3.0.3/drivers/net/niu.c
        first_ldg = (NIU_NUM_LDG / parent->num_ports) * np->port;
        for (i = 0; i < (NIU_NUM_LDG / parent->num_ports); i++)
                ldg_num_map[i] = first_ldg + i;
-diff -urNp linux-3.0.3/drivers/net/pcnet32.c linux-3.0.3/drivers/net/pcnet32.c
---- linux-3.0.3/drivers/net/pcnet32.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/pcnet32.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/pcnet32.c linux-3.0.4/drivers/net/pcnet32.c
+--- linux-3.0.4/drivers/net/pcnet32.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/pcnet32.c  2011-08-23 21:47:55.000000000 -0400
 @@ -82,7 +82,7 @@ static int cards_found;
  /*
   * VLB I/O addresses
@@ -29465,9 +29490,9 @@ diff -urNp linux-3.0.3/drivers/net/pcnet32.c linux-3.0.3/drivers/net/pcnet32.c
                        }
                } else {
                        netif_info(lp, link, dev, "link up\n");
-diff -urNp linux-3.0.3/drivers/net/ppp_generic.c linux-3.0.3/drivers/net/ppp_generic.c
---- linux-3.0.3/drivers/net/ppp_generic.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/ppp_generic.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/ppp_generic.c linux-3.0.4/drivers/net/ppp_generic.c
+--- linux-3.0.4/drivers/net/ppp_generic.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/ppp_generic.c      2011-08-23 21:47:55.000000000 -0400
 @@ -987,7 +987,6 @@ ppp_net_ioctl(struct net_device *dev, st
        void __user *addr = (void __user *) ifr->ifr_ifru.ifru_data;
        struct ppp_stats stats;
@@ -29486,9 +29511,9 @@ diff -urNp linux-3.0.3/drivers/net/ppp_generic.c linux-3.0.3/drivers/net/ppp_gen
                        break;
                err = 0;
                break;
-diff -urNp linux-3.0.3/drivers/net/r8169.c linux-3.0.3/drivers/net/r8169.c
---- linux-3.0.3/drivers/net/r8169.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/r8169.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/r8169.c linux-3.0.4/drivers/net/r8169.c
+--- linux-3.0.4/drivers/net/r8169.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/r8169.c    2011-08-23 21:47:55.000000000 -0400
 @@ -645,12 +645,12 @@ struct rtl8169_private {
        struct mdio_ops {
                void (*write)(void __iomem *, int, int);
@@ -29504,9 +29529,9 @@ diff -urNp linux-3.0.3/drivers/net/r8169.c linux-3.0.3/drivers/net/r8169.c
  
        int (*set_speed)(struct net_device *, u8 aneg, u16 sp, u8 dpx, u32 adv);
        int (*get_settings)(struct net_device *, struct ethtool_cmd *);
-diff -urNp linux-3.0.3/drivers/net/tg3.h linux-3.0.3/drivers/net/tg3.h
---- linux-3.0.3/drivers/net/tg3.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tg3.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tg3.h linux-3.0.4/drivers/net/tg3.h
+--- linux-3.0.4/drivers/net/tg3.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tg3.h      2011-08-23 21:47:55.000000000 -0400
 @@ -134,6 +134,7 @@
  #define  CHIPREV_ID_5750_A0            0x4000
  #define  CHIPREV_ID_5750_A1            0x4001
@@ -29515,9 +29540,9 @@ diff -urNp linux-3.0.3/drivers/net/tg3.h linux-3.0.3/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-3.0.3/drivers/net/tokenring/abyss.c linux-3.0.3/drivers/net/tokenring/abyss.c
---- linux-3.0.3/drivers/net/tokenring/abyss.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/abyss.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/abyss.c linux-3.0.4/drivers/net/tokenring/abyss.c
+--- linux-3.0.4/drivers/net/tokenring/abyss.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/abyss.c  2011-08-23 21:47:55.000000000 -0400
 @@ -451,10 +451,12 @@ static struct pci_driver abyss_driver = 
  
  static int __init abyss_init (void)
@@ -29534,9 +29559,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/abyss.c linux-3.0.3/drivers/net/tok
  
        return pci_register_driver(&abyss_driver);
  }
-diff -urNp linux-3.0.3/drivers/net/tokenring/madgemc.c linux-3.0.3/drivers/net/tokenring/madgemc.c
---- linux-3.0.3/drivers/net/tokenring/madgemc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/madgemc.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/madgemc.c linux-3.0.4/drivers/net/tokenring/madgemc.c
+--- linux-3.0.4/drivers/net/tokenring/madgemc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/madgemc.c        2011-08-23 21:47:55.000000000 -0400
 @@ -744,9 +744,11 @@ static struct mca_driver madgemc_driver 
  
  static int __init madgemc_init (void)
@@ -29552,9 +29577,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/madgemc.c linux-3.0.3/drivers/net/t
  
        return mca_register_driver (&madgemc_driver);
  }
-diff -urNp linux-3.0.3/drivers/net/tokenring/proteon.c linux-3.0.3/drivers/net/tokenring/proteon.c
---- linux-3.0.3/drivers/net/tokenring/proteon.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/proteon.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/proteon.c linux-3.0.4/drivers/net/tokenring/proteon.c
+--- linux-3.0.4/drivers/net/tokenring/proteon.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/proteon.c        2011-08-23 21:47:55.000000000 -0400
 @@ -353,9 +353,11 @@ static int __init proteon_init(void)
        struct platform_device *pdev;
        int i, num = 0, err = 0;
@@ -29570,9 +29595,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/proteon.c linux-3.0.3/drivers/net/t
  
        err = platform_driver_register(&proteon_driver);
        if (err)
-diff -urNp linux-3.0.3/drivers/net/tokenring/skisa.c linux-3.0.3/drivers/net/tokenring/skisa.c
---- linux-3.0.3/drivers/net/tokenring/skisa.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tokenring/skisa.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tokenring/skisa.c linux-3.0.4/drivers/net/tokenring/skisa.c
+--- linux-3.0.4/drivers/net/tokenring/skisa.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tokenring/skisa.c  2011-08-23 21:47:55.000000000 -0400
 @@ -363,9 +363,11 @@ static int __init sk_isa_init(void)
        struct platform_device *pdev;
        int i, num = 0, err = 0;
@@ -29588,9 +29613,9 @@ diff -urNp linux-3.0.3/drivers/net/tokenring/skisa.c linux-3.0.3/drivers/net/tok
  
        err = platform_driver_register(&sk_isa_driver);
        if (err)
-diff -urNp linux-3.0.3/drivers/net/tulip/de2104x.c linux-3.0.3/drivers/net/tulip/de2104x.c
---- linux-3.0.3/drivers/net/tulip/de2104x.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tulip/de2104x.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tulip/de2104x.c linux-3.0.4/drivers/net/tulip/de2104x.c
+--- linux-3.0.4/drivers/net/tulip/de2104x.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tulip/de2104x.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1794,6 +1794,8 @@ static void __devinit de21041_get_srom_i
        struct de_srom_info_leaf *il;
        void *bufp;
@@ -29600,9 +29625,9 @@ diff -urNp linux-3.0.3/drivers/net/tulip/de2104x.c linux-3.0.3/drivers/net/tulip
        /* download entire eeprom */
        for (i = 0; i < DE_EEPROM_WORDS; i++)
                ((__le16 *)ee_data)[i] =
-diff -urNp linux-3.0.3/drivers/net/tulip/de4x5.c linux-3.0.3/drivers/net/tulip/de4x5.c
---- linux-3.0.3/drivers/net/tulip/de4x5.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/tulip/de4x5.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/tulip/de4x5.c linux-3.0.4/drivers/net/tulip/de4x5.c
+--- linux-3.0.4/drivers/net/tulip/de4x5.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/tulip/de4x5.c      2011-08-23 21:47:55.000000000 -0400
 @@ -5401,7 +5401,7 @@ de4x5_ioctl(struct net_device *dev, stru
        for (i=0; i<ETH_ALEN; i++) {
            tmp.addr[i] = dev->dev_addr[i];
@@ -29621,9 +29646,9 @@ diff -urNp linux-3.0.3/drivers/net/tulip/de4x5.c linux-3.0.3/drivers/net/tulip/d
                return -EFAULT;
        break;
      }
-diff -urNp linux-3.0.3/drivers/net/usb/hso.c linux-3.0.3/drivers/net/usb/hso.c
---- linux-3.0.3/drivers/net/usb/hso.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/usb/hso.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/usb/hso.c linux-3.0.4/drivers/net/usb/hso.c
+--- linux-3.0.4/drivers/net/usb/hso.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/usb/hso.c  2011-08-23 21:47:55.000000000 -0400
 @@ -71,7 +71,7 @@
  #include <asm/byteorder.h>
  #include <linux/serial_core.h>
@@ -29720,9 +29745,9 @@ diff -urNp linux-3.0.3/drivers/net/usb/hso.c linux-3.0.3/drivers/net/usb/hso.c
                                result =
                                    hso_start_serial_device(serial_table[i], GFP_NOIO);
                                hso_kick_transmit(dev2ser(serial_table[i]));
-diff -urNp linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c
---- linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c
+--- linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vmxnet3/vmxnet3_ethtool.c  2011-08-23 21:47:55.000000000 -0400
 @@ -594,8 +594,7 @@ vmxnet3_set_rss_indir(struct net_device 
                 * Return with error code if any of the queue indices
                 * is out of range
@@ -29733,9 +29758,9 @@ diff -urNp linux-3.0.3/drivers/net/vmxnet3/vmxnet3_ethtool.c linux-3.0.3/drivers
                        return -EINVAL;
        }
  
-diff -urNp linux-3.0.3/drivers/net/vxge/vxge-config.h linux-3.0.3/drivers/net/vxge/vxge-config.h
---- linux-3.0.3/drivers/net/vxge/vxge-config.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vxge/vxge-config.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vxge/vxge-config.h linux-3.0.4/drivers/net/vxge/vxge-config.h
+--- linux-3.0.4/drivers/net/vxge/vxge-config.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vxge/vxge-config.h 2011-08-23 21:47:55.000000000 -0400
 @@ -512,7 +512,7 @@ struct vxge_hw_uld_cbs {
        void (*link_down)(struct __vxge_hw_device *devh);
        void (*crit_err)(struct __vxge_hw_device *devh,
@@ -29745,9 +29770,9 @@ diff -urNp linux-3.0.3/drivers/net/vxge/vxge-config.h linux-3.0.3/drivers/net/vx
  
  /*
   * struct __vxge_hw_blockpool_entry - Block private data structure
-diff -urNp linux-3.0.3/drivers/net/vxge/vxge-main.c linux-3.0.3/drivers/net/vxge/vxge-main.c
---- linux-3.0.3/drivers/net/vxge/vxge-main.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vxge/vxge-main.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vxge/vxge-main.c linux-3.0.4/drivers/net/vxge/vxge-main.c
+--- linux-3.0.4/drivers/net/vxge/vxge-main.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vxge/vxge-main.c   2011-08-23 21:48:14.000000000 -0400
 @@ -98,6 +98,8 @@ static inline void VXGE_COMPLETE_VPATH_T
        struct sk_buff *completed[NR_SKB_COMPLETED];
        int more;
@@ -29766,9 +29791,9 @@ diff -urNp linux-3.0.3/drivers/net/vxge/vxge-main.c linux-3.0.3/drivers/net/vxge
        /*
         * Filling
         *      - itable with bucket numbers
-diff -urNp linux-3.0.3/drivers/net/vxge/vxge-traffic.h linux-3.0.3/drivers/net/vxge/vxge-traffic.h
---- linux-3.0.3/drivers/net/vxge/vxge-traffic.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/vxge/vxge-traffic.h        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/vxge/vxge-traffic.h linux-3.0.4/drivers/net/vxge/vxge-traffic.h
+--- linux-3.0.4/drivers/net/vxge/vxge-traffic.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/vxge/vxge-traffic.h        2011-08-23 21:47:55.000000000 -0400
 @@ -2088,7 +2088,7 @@ struct vxge_hw_mempool_cbs {
                        struct vxge_hw_mempool_dma      *dma_object,
                        u32                     index,
@@ -29778,9 +29803,9 @@ diff -urNp linux-3.0.3/drivers/net/vxge/vxge-traffic.h linux-3.0.3/drivers/net/v
  
  #define VXGE_HW_VIRTUAL_PATH_HANDLE(vpath)                            \
                ((struct __vxge_hw_vpath_handle *)(vpath)->vpath_handles.next)
-diff -urNp linux-3.0.3/drivers/net/wan/cycx_x25.c linux-3.0.3/drivers/net/wan/cycx_x25.c
---- linux-3.0.3/drivers/net/wan/cycx_x25.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wan/cycx_x25.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wan/cycx_x25.c linux-3.0.4/drivers/net/wan/cycx_x25.c
+--- linux-3.0.4/drivers/net/wan/cycx_x25.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wan/cycx_x25.c     2011-08-23 21:48:14.000000000 -0400
 @@ -1018,6 +1018,8 @@ static void hex_dump(char *msg, unsigned
        unsigned char hex[1024],
                * phex = hex;
@@ -29790,9 +29815,9 @@ diff -urNp linux-3.0.3/drivers/net/wan/cycx_x25.c linux-3.0.3/drivers/net/wan/cy
        if (len >= (sizeof(hex) / 2))
                len = (sizeof(hex) / 2) - 1;
  
-diff -urNp linux-3.0.3/drivers/net/wan/hdlc_x25.c linux-3.0.3/drivers/net/wan/hdlc_x25.c
---- linux-3.0.3/drivers/net/wan/hdlc_x25.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wan/hdlc_x25.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wan/hdlc_x25.c linux-3.0.4/drivers/net/wan/hdlc_x25.c
+--- linux-3.0.4/drivers/net/wan/hdlc_x25.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wan/hdlc_x25.c     2011-08-23 21:47:55.000000000 -0400
 @@ -136,16 +136,16 @@ static netdev_tx_t x25_xmit(struct sk_bu
  
  static int x25_open(struct net_device *dev)
@@ -29818,9 +29843,9 @@ diff -urNp linux-3.0.3/drivers/net/wan/hdlc_x25.c linux-3.0.3/drivers/net/wan/hd
        result = lapb_register(dev, &cb);
        if (result != LAPB_OK)
                return result;
-diff -urNp linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c
---- linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c
+--- linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wimax/i2400m/usb-fw.c      2011-08-23 21:48:14.000000000 -0400
 @@ -287,6 +287,8 @@ ssize_t i2400mu_bus_bm_wait_for_ack(stru
        int do_autopm = 1;
        DECLARE_COMPLETION_ONSTACK(notif_completion);
@@ -29830,9 +29855,9 @@ diff -urNp linux-3.0.3/drivers/net/wimax/i2400m/usb-fw.c linux-3.0.3/drivers/net
        d_fnstart(8, dev, "(i2400m %p ack %p size %zu)\n",
                  i2400m, ack, ack_size);
        BUG_ON(_ack == i2400m->bm_ack_buf);
-diff -urNp linux-3.0.3/drivers/net/wireless/airo.c linux-3.0.3/drivers/net/wireless/airo.c
---- linux-3.0.3/drivers/net/wireless/airo.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/airo.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/airo.c linux-3.0.4/drivers/net/wireless/airo.c
+--- linux-3.0.4/drivers/net/wireless/airo.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/airo.c    2011-08-23 21:48:14.000000000 -0400
 @@ -3003,6 +3003,8 @@ static void airo_process_scan_results (s
        BSSListElement * loop_net;
        BSSListElement * tmp_net;
@@ -29887,9 +29912,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/airo.c linux-3.0.3/drivers/net/wirel
        /* Get stats out of the card */
        clear_bit(JOB_WSTATS, &local->jobs);
        if (local->power.event) {
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c
---- linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath5k/debug.c 2011-08-23 21:48:14.000000000 -0400
 @@ -204,6 +204,8 @@ static ssize_t read_file_beacon(struct f
        unsigned int v;
        u64 tsf;
@@ -29953,9 +29978,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath5k/debug.c linux-3.0.3/driver
        len += snprintf(buf+len, sizeof(buf)-len,
                        "available txbuffers: %d\n", sc->txbuf_len);
  
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_calib.c  2011-08-23 21:48:14.000000000 -0400
 @@ -757,6 +757,8 @@ static void ar9003_hw_tx_iq_cal_post_pro
        int i, im, j;
        int nmeasurement;
@@ -29965,9 +29990,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_calib.c linux-3.0.3
        for (i = 0; i < AR9300_MAX_CHAINS; i++) {
                if (ah->txchainmask & (1 << i))
                        num_chains++;
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/ar9003_paprd.c  2011-08-23 21:48:14.000000000 -0400
 @@ -356,6 +356,8 @@ static bool create_pa_curve(u32 *data_L,
        int theta_low_bin = 0;
        int i;
@@ -29977,9 +30002,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/ar9003_paprd.c linux-3.0.3
        /* disregard any bin that contains <= 16 samples */
        thresh_accum_cnt = 16;
        scale_factor = 5;
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/debug.c 2011-08-23 21:48:14.000000000 -0400
 @@ -337,6 +337,8 @@ static ssize_t read_file_interrupt(struc
        char buf[512];
        unsigned int len = 0;
@@ -29998,9 +30023,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/debug.c linux-3.0.3/driver
        len += snprintf(buf + len, sizeof(buf) - len,
                        "%s (chan=%d  center-freq: %d MHz  channel-type: %d (%s))\n",
                        wiphy_name(sc->hw->wiphy),
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/htc_drv_debug.c 2011-08-23 21:48:14.000000000 -0400
 @@ -31,6 +31,8 @@ static ssize_t read_file_tgt_int_stats(s
        unsigned int len = 0;
        int ret = 0;
@@ -30055,9 +30080,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/htc_drv_debug.c linux-3.0.
        len += snprintf(buf + len, sizeof(buf) - len, "%20s : %10u\n",
                        "Mgmt endpoint", skb_queue_len(&priv->tx.mgmt_ep_queue));
  
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h
---- linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h
+--- linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath9k/hw.h    2011-08-23 21:47:55.000000000 -0400
 @@ -585,7 +585,7 @@ struct ath_hw_private_ops {
  
        /* ANI */
@@ -30085,9 +30110,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath9k/hw.h linux-3.0.3/drivers/n
  
        struct ieee80211_hw *hw;
        struct ath_common common;
-diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath.h linux-3.0.3/drivers/net/wireless/ath/ath.h
---- linux-3.0.3/drivers/net/wireless/ath/ath.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ath/ath.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ath/ath.h linux-3.0.4/drivers/net/wireless/ath/ath.h
+--- linux-3.0.4/drivers/net/wireless/ath/ath.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ath/ath.h 2011-08-23 21:47:55.000000000 -0400
 @@ -121,6 +121,7 @@ struct ath_ops {
        void (*write_flush) (void *);
        u32 (*rmw)(void *, u32 reg_offset, u32 set, u32 clr);
@@ -30096,9 +30121,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ath/ath.h linux-3.0.3/drivers/net/wi
  
  struct ath_common;
  struct ath_bus_ops;
-diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c
---- linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c
+--- linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ipw2x00/ipw2100.c 2011-08-23 21:48:14.000000000 -0400
 @@ -2100,6 +2100,8 @@ static int ipw2100_set_essid(struct ipw2
        int err;
        DECLARE_SSID_BUF(ssid);
@@ -30117,9 +30142,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/ipw2100.c linux-3.0.3/driver
        IPW_DEBUG_HC("WEP_KEY_INFO: index = %d, len = %d/%d\n",
                     idx, keylen, len);
  
-diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c
---- linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c
+--- linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/ipw2x00/libipw_rx.c       2011-08-23 21:48:14.000000000 -0400
 @@ -1565,6 +1565,8 @@ static void libipw_process_probe_respons
        unsigned long flags;
        DECLARE_SSID_BUF(ssid);
@@ -30129,9 +30154,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/ipw2x00/libipw_rx.c linux-3.0.3/driv
        LIBIPW_DEBUG_SCAN("'%s' (%pM"
                     "): %c%c%c%c %c%c%c%c-%c%c%c%c %c%c%c%c\n",
                     print_ssid(ssid, info_element->data, info_element->len),
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c
---- linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c
+--- linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlegacy/iwl3945-base.c   2011-08-23 21:47:55.000000000 -0400
 @@ -3962,7 +3962,9 @@ static int iwl3945_pci_probe(struct pci_
         */
        if (iwl3945_mod_params.disable_hw_scan) {
@@ -30143,9 +30168,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlegacy/iwl3945-base.c linux-3.0.3/
        }
  
        IWL_DEBUG_INFO(priv, "*** LOAD DRIVER ***\n");
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
---- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c
+--- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-agn-rs.c      2011-08-23 21:48:14.000000000 -0400
 @@ -910,6 +910,8 @@ static void rs_tx_status(void *priv_r, s
        struct iwl_station_priv *sta_priv = (void *)sta->drv_priv;
        struct iwl_rxon_context *ctx = sta_priv->common.ctx;
@@ -30164,9 +30189,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-agn-rs.c linux-3.0.3/dri
        /* Override starting rate (index 0) if needed for debug purposes */
        rs_dbgfs_set_mcs(lq_sta, &new_rate, index);
  
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c
---- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c
+--- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debugfs.c     2011-08-23 21:48:14.000000000 -0400
 @@ -548,6 +548,8 @@ static ssize_t iwl_dbgfs_status_read(str
        int pos = 0;
        const size_t bufsz = sizeof(buf);
@@ -30185,9 +30210,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debugfs.c linux-3.0.3/dr
        for_each_context(priv, ctx) {
                pos += scnprintf(buf + pos, bufsz - pos, "context %d:\n",
                                 ctx->ctxid);
-diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h
---- linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h
+--- linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwlwifi/iwl-debug.h       2011-08-23 21:47:55.000000000 -0400
 @@ -68,8 +68,8 @@ do {                                    
  } while (0)
  
@@ -30199,9 +30224,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwlwifi/iwl-debug.h linux-3.0.3/driv
  static inline void iwl_print_hex_dump(struct iwl_priv *priv, int level,
                                      const void *p, u32 len)
  {}
-diff -urNp linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c
---- linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c
+--- linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/iwmc3200wifi/debugfs.c    2011-08-23 21:48:14.000000000 -0400
 @@ -327,6 +327,8 @@ static ssize_t iwm_debugfs_fw_err_read(s
        int buf_len = 512;
        size_t len = 0;
@@ -30211,9 +30236,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/iwmc3200wifi/debugfs.c linux-3.0.3/d
        if (*ppos != 0)
                return 0;
        if (count < sizeof(buf))
-diff -urNp linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c
---- linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c
+--- linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/mac80211_hwsim.c  2011-08-23 21:47:55.000000000 -0400
 @@ -1260,9 +1260,11 @@ static int __init init_mac80211_hwsim(vo
                return -EINVAL;
  
@@ -30229,9 +30254,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/mac80211_hwsim.c linux-3.0.3/drivers
        }
  
        spin_lock_init(&hwsim_radio_lock);
-diff -urNp linux-3.0.3/drivers/net/wireless/rndis_wlan.c linux-3.0.3/drivers/net/wireless/rndis_wlan.c
---- linux-3.0.3/drivers/net/wireless/rndis_wlan.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/rndis_wlan.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/rndis_wlan.c linux-3.0.4/drivers/net/wireless/rndis_wlan.c
+--- linux-3.0.4/drivers/net/wireless/rndis_wlan.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/rndis_wlan.c      2011-08-23 21:47:55.000000000 -0400
 @@ -1277,7 +1277,7 @@ static int set_rts_threshold(struct usbn
  
        netdev_dbg(usbdev->net, "%s(): %i\n", __func__, rts_threshold);
@@ -30241,9 +30266,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/rndis_wlan.c linux-3.0.3/drivers/net
                rts_threshold = 2347;
  
        tmp = cpu_to_le32(rts_threshold);
-diff -urNp linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
---- linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c
+--- linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c     2011-08-23 21:48:14.000000000 -0400
 @@ -837,6 +837,8 @@ bool _rtl92c_phy_sw_chnl_step_by_step(st
        u8 rfpath;
        u8 num_total_rfpath = rtlphy->num_total_rfpath;
@@ -30253,9 +30278,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/rtlwifi/rtl8192c/phy_common.c linux-
        precommoncmdcnt = 0;
        _rtl92c_phy_set_sw_chnl_cmdarray(precommoncmd, precommoncmdcnt++,
                                         MAX_PRECMD_CNT,
-diff -urNp linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h
---- linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h
+--- linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/wl1251/wl1251.h   2011-08-23 21:47:55.000000000 -0400
 @@ -266,7 +266,7 @@ struct wl1251_if_operations {
        void (*reset)(struct wl1251 *wl);
        void (*enable_irq)(struct wl1251 *wl);
@@ -30265,9 +30290,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/wl1251/wl1251.h linux-3.0.3/drivers/
  
  struct wl1251 {
        struct ieee80211_hw *hw;
-diff -urNp linux-3.0.3/drivers/net/wireless/wl12xx/spi.c linux-3.0.3/drivers/net/wireless/wl12xx/spi.c
---- linux-3.0.3/drivers/net/wireless/wl12xx/spi.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/net/wireless/wl12xx/spi.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/net/wireless/wl12xx/spi.c linux-3.0.4/drivers/net/wireless/wl12xx/spi.c
+--- linux-3.0.4/drivers/net/wireless/wl12xx/spi.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/net/wireless/wl12xx/spi.c      2011-08-23 21:48:14.000000000 -0400
 @@ -280,6 +280,8 @@ static void wl1271_spi_raw_write(struct 
        u32 chunk_len;
        int i;
@@ -30277,9 +30302,9 @@ diff -urNp linux-3.0.3/drivers/net/wireless/wl12xx/spi.c linux-3.0.3/drivers/net
        WARN_ON(len > WL1271_AGGR_BUFFER_SIZE);
  
        spi_message_init(&m);
-diff -urNp linux-3.0.3/drivers/oprofile/buffer_sync.c linux-3.0.3/drivers/oprofile/buffer_sync.c
---- linux-3.0.3/drivers/oprofile/buffer_sync.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/buffer_sync.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/buffer_sync.c linux-3.0.4/drivers/oprofile/buffer_sync.c
+--- linux-3.0.4/drivers/oprofile/buffer_sync.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/buffer_sync.c 2011-08-23 21:47:55.000000000 -0400
 @@ -343,7 +343,7 @@ static void add_data(struct op_entry *en
                if (cookie == NO_COOKIE)
                        offset = pc;
@@ -30315,9 +30340,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/buffer_sync.c linux-3.0.3/drivers/oprofi
                }
        }
        release_mm(mm);
-diff -urNp linux-3.0.3/drivers/oprofile/event_buffer.c linux-3.0.3/drivers/oprofile/event_buffer.c
---- linux-3.0.3/drivers/oprofile/event_buffer.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/event_buffer.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/event_buffer.c linux-3.0.4/drivers/oprofile/event_buffer.c
+--- linux-3.0.4/drivers/oprofile/event_buffer.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/event_buffer.c        2011-08-23 21:47:55.000000000 -0400
 @@ -53,7 +53,7 @@ void add_event_entry(unsigned long value
        }
  
@@ -30327,9 +30352,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/event_buffer.c linux-3.0.3/drivers/oprof
                return;
        }
  
-diff -urNp linux-3.0.3/drivers/oprofile/oprof.c linux-3.0.3/drivers/oprofile/oprof.c
---- linux-3.0.3/drivers/oprofile/oprof.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprof.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprof.c linux-3.0.4/drivers/oprofile/oprof.c
+--- linux-3.0.4/drivers/oprofile/oprof.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprof.c       2011-08-23 21:47:55.000000000 -0400
 @@ -110,7 +110,7 @@ static void switch_worker(struct work_st
        if (oprofile_ops.switch_events())
                return;
@@ -30339,9 +30364,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprof.c linux-3.0.3/drivers/oprofile/opr
        start_switch_worker();
  }
  
-diff -urNp linux-3.0.3/drivers/oprofile/oprofilefs.c linux-3.0.3/drivers/oprofile/oprofilefs.c
---- linux-3.0.3/drivers/oprofile/oprofilefs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprofilefs.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprofilefs.c linux-3.0.4/drivers/oprofile/oprofilefs.c
+--- linux-3.0.4/drivers/oprofile/oprofilefs.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprofilefs.c  2011-08-23 21:47:55.000000000 -0400
 @@ -186,7 +186,7 @@ static const struct file_operations atom
  
  
@@ -30351,9 +30376,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprofilefs.c linux-3.0.3/drivers/oprofil
  {
        return __oprofilefs_create_file(sb, root, name,
                                        &atomic_ro_fops, 0444, val);
-diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.c linux-3.0.3/drivers/oprofile/oprofile_stats.c
---- linux-3.0.3/drivers/oprofile/oprofile_stats.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprofile_stats.c      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.c linux-3.0.4/drivers/oprofile/oprofile_stats.c
+--- linux-3.0.4/drivers/oprofile/oprofile_stats.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprofile_stats.c      2011-08-23 21:47:55.000000000 -0400
 @@ -30,11 +30,11 @@ void oprofile_reset_stats(void)
                cpu_buf->sample_invalid_eip = 0;
        }
@@ -30371,9 +30396,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.c linux-3.0.3/drivers/opr
  }
  
  
-diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.h linux-3.0.3/drivers/oprofile/oprofile_stats.h
---- linux-3.0.3/drivers/oprofile/oprofile_stats.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/oprofile/oprofile_stats.h      2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/oprofile/oprofile_stats.h linux-3.0.4/drivers/oprofile/oprofile_stats.h
+--- linux-3.0.4/drivers/oprofile/oprofile_stats.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/oprofile/oprofile_stats.h      2011-08-23 21:47:55.000000000 -0400
 @@ -13,11 +13,11 @@
  #include <asm/atomic.h>
  
@@ -30391,9 +30416,9 @@ diff -urNp linux-3.0.3/drivers/oprofile/oprofile_stats.h linux-3.0.3/drivers/opr
  };
  
  extern struct oprofile_stat_struct oprofile_stats;
-diff -urNp linux-3.0.3/drivers/parport/procfs.c linux-3.0.3/drivers/parport/procfs.c
---- linux-3.0.3/drivers/parport/procfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/parport/procfs.c       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/parport/procfs.c linux-3.0.4/drivers/parport/procfs.c
+--- linux-3.0.4/drivers/parport/procfs.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/parport/procfs.c       2011-08-23 21:47:55.000000000 -0400
 @@ -64,7 +64,7 @@ static int do_active_device(ctl_table *t
  
        *ppos += len;
@@ -30412,9 +30437,9 @@ diff -urNp linux-3.0.3/drivers/parport/procfs.c linux-3.0.3/drivers/parport/proc
  }
  #endif /* IEEE1284.3 support. */
  
-diff -urNp linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h
---- linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h
+--- linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/hotplug/cpci_hotplug.h     2011-08-23 21:47:55.000000000 -0400
 @@ -59,7 +59,7 @@ struct cpci_hp_controller_ops {
        int (*hardware_test) (struct slot* slot, u32 value);
        u8  (*get_power) (struct slot* slot);
@@ -30424,9 +30449,9 @@ diff -urNp linux-3.0.3/drivers/pci/hotplug/cpci_hotplug.h linux-3.0.3/drivers/pc
  
  struct cpci_hp_controller {
        unsigned int irq;
-diff -urNp linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c
---- linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c
+--- linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/hotplug/cpqphp_nvram.c     2011-08-23 21:47:55.000000000 -0400
 @@ -428,9 +428,13 @@ static u32 store_HRT (void __iomem *rom_
  
  void compaq_nvram_init (void __iomem *rom_start)
@@ -30441,9 +30466,9 @@ diff -urNp linux-3.0.3/drivers/pci/hotplug/cpqphp_nvram.c linux-3.0.3/drivers/pc
        dbg("int15 entry  = %p\n", compaq_int15_entry_point);
  
        /* initialize our int15 lock */
-diff -urNp linux-3.0.3/drivers/pci/pcie/aspm.c linux-3.0.3/drivers/pci/pcie/aspm.c
---- linux-3.0.3/drivers/pci/pcie/aspm.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/pcie/aspm.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/pcie/aspm.c linux-3.0.4/drivers/pci/pcie/aspm.c
+--- linux-3.0.4/drivers/pci/pcie/aspm.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/pcie/aspm.c        2011-08-23 21:47:55.000000000 -0400
 @@ -27,9 +27,9 @@
  #define MODULE_PARAM_PREFIX "pcie_aspm."
  
@@ -30457,9 +30482,9 @@ diff -urNp linux-3.0.3/drivers/pci/pcie/aspm.c linux-3.0.3/drivers/pci/pcie/aspm
  #define ASPM_STATE_L0S                (ASPM_STATE_L0S_UP | ASPM_STATE_L0S_DW)
  #define ASPM_STATE_ALL                (ASPM_STATE_L0S | ASPM_STATE_L1)
  
-diff -urNp linux-3.0.3/drivers/pci/probe.c linux-3.0.3/drivers/pci/probe.c
---- linux-3.0.3/drivers/pci/probe.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/probe.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/probe.c linux-3.0.4/drivers/pci/probe.c
+--- linux-3.0.4/drivers/pci/probe.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/probe.c    2011-08-23 21:47:55.000000000 -0400
 @@ -129,7 +129,7 @@ int __pci_read_base(struct pci_dev *dev,
        u32 l, sz, mask;
        u16 orig_cmd;
@@ -30469,9 +30494,9 @@ diff -urNp linux-3.0.3/drivers/pci/probe.c linux-3.0.3/drivers/pci/probe.c
  
        if (!dev->mmio_always_on) {
                pci_read_config_word(dev, PCI_COMMAND, &orig_cmd);
-diff -urNp linux-3.0.3/drivers/pci/proc.c linux-3.0.3/drivers/pci/proc.c
---- linux-3.0.3/drivers/pci/proc.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/proc.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/proc.c linux-3.0.4/drivers/pci/proc.c
+--- linux-3.0.4/drivers/pci/proc.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/proc.c     2011-08-23 21:48:14.000000000 -0400
 @@ -476,7 +476,16 @@ static const struct file_operations proc
  static int __init pci_proc_init(void)
  {
@@ -30489,9 +30514,9 @@ diff -urNp linux-3.0.3/drivers/pci/proc.c linux-3.0.3/drivers/pci/proc.c
        proc_create("devices", 0, proc_bus_pci_dir,
                    &proc_bus_pci_dev_operations);
        proc_initialized = 1;
-diff -urNp linux-3.0.3/drivers/pci/xen-pcifront.c linux-3.0.3/drivers/pci/xen-pcifront.c
---- linux-3.0.3/drivers/pci/xen-pcifront.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pci/xen-pcifront.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pci/xen-pcifront.c linux-3.0.4/drivers/pci/xen-pcifront.c
+--- linux-3.0.4/drivers/pci/xen-pcifront.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pci/xen-pcifront.c     2011-08-23 21:48:14.000000000 -0400
 @@ -187,6 +187,8 @@ static int pcifront_bus_read(struct pci_
        struct pcifront_sd *sd = bus->sysdata;
        struct pcifront_device *pdev = pcifront_get_pdev(sd);
@@ -30537,9 +30562,9 @@ diff -urNp linux-3.0.3/drivers/pci/xen-pcifront.c linux-3.0.3/drivers/pci/xen-pc
        err = do_pci_op(pdev, &op);
        if (likely(!err)) {
                vector[0] = op.value;
-diff -urNp linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c
---- linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c
+--- linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/platform/x86/thinkpad_acpi.c   2011-08-23 21:47:55.000000000 -0400
 @@ -2094,7 +2094,7 @@ static int hotkey_mask_get(void)
        return 0;
  }
@@ -30549,9 +30574,9 @@ diff -urNp linux-3.0.3/drivers/platform/x86/thinkpad_acpi.c linux-3.0.3/drivers/
  {
        /* log only what the user can fix... */
        const u32 wantedmask = hotkey_driver_mask &
-diff -urNp linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c
---- linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c
+--- linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pnp/pnpbios/bioscalls.c        2011-08-23 21:47:55.000000000 -0400
 @@ -59,7 +59,7 @@ do { \
        set_desc_limit(&gdt[(selname) >> 3], (size) - 1); \
  } while(0)
@@ -30608,9 +30633,9 @@ diff -urNp linux-3.0.3/drivers/pnp/pnpbios/bioscalls.c linux-3.0.3/drivers/pnp/p
 +
 +      pax_close_kernel();
  }
-diff -urNp linux-3.0.3/drivers/pnp/resource.c linux-3.0.3/drivers/pnp/resource.c
---- linux-3.0.3/drivers/pnp/resource.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/pnp/resource.c 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/pnp/resource.c linux-3.0.4/drivers/pnp/resource.c
+--- linux-3.0.4/drivers/pnp/resource.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/pnp/resource.c 2011-08-23 21:47:55.000000000 -0400
 @@ -360,7 +360,7 @@ int pnp_check_irq(struct pnp_dev *dev, s
                return 1;
  
@@ -30629,9 +30654,9 @@ diff -urNp linux-3.0.3/drivers/pnp/resource.c linux-3.0.3/drivers/pnp/resource.c
                return 0;
  
        /* check if the resource is reserved */
-diff -urNp linux-3.0.3/drivers/power/bq27x00_battery.c linux-3.0.3/drivers/power/bq27x00_battery.c
---- linux-3.0.3/drivers/power/bq27x00_battery.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/power/bq27x00_battery.c        2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/power/bq27x00_battery.c linux-3.0.4/drivers/power/bq27x00_battery.c
+--- linux-3.0.4/drivers/power/bq27x00_battery.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/power/bq27x00_battery.c        2011-08-23 21:47:55.000000000 -0400
 @@ -67,7 +67,7 @@
  struct bq27x00_device_info;
  struct bq27x00_access_methods {
@@ -30641,9 +30666,9 @@ diff -urNp linux-3.0.3/drivers/power/bq27x00_battery.c linux-3.0.3/drivers/power
  
  enum bq27x00_chip { BQ27000, BQ27500 };
  
-diff -urNp linux-3.0.3/drivers/regulator/max8660.c linux-3.0.3/drivers/regulator/max8660.c
---- linux-3.0.3/drivers/regulator/max8660.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/regulator/max8660.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/regulator/max8660.c linux-3.0.4/drivers/regulator/max8660.c
+--- linux-3.0.4/drivers/regulator/max8660.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/regulator/max8660.c    2011-08-23 21:47:55.000000000 -0400
 @@ -383,8 +383,10 @@ static int __devinit max8660_probe(struc
                max8660->shadow_regs[MAX8660_OVER1] = 5;
        } else {
@@ -30657,9 +30682,9 @@ diff -urNp linux-3.0.3/drivers/regulator/max8660.c linux-3.0.3/drivers/regulator
        }
  
        /*
-diff -urNp linux-3.0.3/drivers/regulator/mc13892-regulator.c linux-3.0.3/drivers/regulator/mc13892-regulator.c
---- linux-3.0.3/drivers/regulator/mc13892-regulator.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/regulator/mc13892-regulator.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/regulator/mc13892-regulator.c linux-3.0.4/drivers/regulator/mc13892-regulator.c
+--- linux-3.0.4/drivers/regulator/mc13892-regulator.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/regulator/mc13892-regulator.c  2011-08-23 21:47:55.000000000 -0400
 @@ -564,10 +564,12 @@ static int __devinit mc13892_regulator_p
        }
        mc13xxx_unlock(mc13892);
@@ -30675,9 +30700,9 @@ diff -urNp linux-3.0.3/drivers/regulator/mc13892-regulator.c linux-3.0.3/drivers
        for (i = 0; i < pdata->num_regulators; i++) {
                init_data = &pdata->regulators[i];
                priv->regulators[i] = regulator_register(
-diff -urNp linux-3.0.3/drivers/rtc/rtc-dev.c linux-3.0.3/drivers/rtc/rtc-dev.c
---- linux-3.0.3/drivers/rtc/rtc-dev.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/rtc/rtc-dev.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/rtc/rtc-dev.c linux-3.0.4/drivers/rtc/rtc-dev.c
+--- linux-3.0.4/drivers/rtc/rtc-dev.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/rtc/rtc-dev.c  2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/module.h>
  #include <linux/rtc.h>
@@ -30695,9 +30720,9 @@ diff -urNp linux-3.0.3/drivers/rtc/rtc-dev.c linux-3.0.3/drivers/rtc/rtc-dev.c
                return rtc_set_time(rtc, &tm);
  
        case RTC_PIE_ON:
-diff -urNp linux-3.0.3/drivers/scsi/aacraid/aacraid.h linux-3.0.3/drivers/scsi/aacraid/aacraid.h
---- linux-3.0.3/drivers/scsi/aacraid/aacraid.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/aacraid/aacraid.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/aacraid/aacraid.h linux-3.0.4/drivers/scsi/aacraid/aacraid.h
+--- linux-3.0.4/drivers/scsi/aacraid/aacraid.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/aacraid/aacraid.h 2011-08-23 21:47:55.000000000 -0400
 @@ -492,7 +492,7 @@ struct adapter_ops
        int  (*adapter_scsi)(struct fib * fib, struct scsi_cmnd * cmd);
        /* Administrative operations */
@@ -30707,9 +30732,9 @@ diff -urNp linux-3.0.3/drivers/scsi/aacraid/aacraid.h linux-3.0.3/drivers/scsi/a
  
  /*
   *    Define which interrupt handler needs to be installed
-diff -urNp linux-3.0.3/drivers/scsi/aacraid/commctrl.c linux-3.0.3/drivers/scsi/aacraid/commctrl.c
---- linux-3.0.3/drivers/scsi/aacraid/commctrl.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/aacraid/commctrl.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/aacraid/commctrl.c linux-3.0.4/drivers/scsi/aacraid/commctrl.c
+--- linux-3.0.4/drivers/scsi/aacraid/commctrl.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/aacraid/commctrl.c        2011-08-23 21:48:14.000000000 -0400
 @@ -482,6 +482,7 @@ static int aac_send_raw_srb(struct aac_d
        u32 actual_fibsize64, actual_fibsize = 0;
        int i;
@@ -30718,9 +30743,9 @@ diff -urNp linux-3.0.3/drivers/scsi/aacraid/commctrl.c linux-3.0.3/drivers/scsi/
  
        if (dev->in_reset) {
                dprintk((KERN_DEBUG"aacraid: send raw srb -EBUSY\n"));
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfad.c linux-3.0.3/drivers/scsi/bfa/bfad.c
---- linux-3.0.3/drivers/scsi/bfa/bfad.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfad.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfad.c linux-3.0.4/drivers/scsi/bfa/bfad.c
+--- linux-3.0.4/drivers/scsi/bfa/bfad.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfad.c        2011-08-23 21:48:14.000000000 -0400
 @@ -1032,6 +1032,8 @@ bfad_start_ops(struct bfad_s *bfad) {
        struct bfad_vport_s *vport, *vport_new;
        struct bfa_fcs_driver_info_s driver_info;
@@ -30730,9 +30755,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfad.c linux-3.0.3/drivers/scsi/bfa/bfad
        /* Fill the driver_info info to fcs*/
        memset(&driver_info, 0, sizeof(driver_info));
        strncpy(driver_info.version, BFAD_DRIVER_VERSION,
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c
---- linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c
+--- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_lport.c       2011-08-23 21:48:14.000000000 -0400
 @@ -1559,6 +1559,8 @@ bfa_fcs_lport_fdmi_build_rhba_pyld(struc
        u16        len, count;
        u16     templen;
@@ -30751,9 +30776,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_lport.c linux-3.0.3/drivers/scsi
        /*
         * get port attributes
         */
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c
---- linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c
+--- linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa_fcs_rport.c       2011-08-23 21:48:14.000000000 -0400
 @@ -1844,6 +1844,8 @@ bfa_fcs_rport_process_rpsc(struct bfa_fc
        struct fc_rpsc_speed_info_s speeds;
        struct bfa_port_attr_s pport_attr;
@@ -30763,9 +30788,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_fcs_rport.c linux-3.0.3/drivers/scsi
        bfa_trc(port->fcs, rx_fchs->s_id);
        bfa_trc(port->fcs, rx_fchs->d_id);
  
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa.h linux-3.0.3/drivers/scsi/bfa/bfa.h
---- linux-3.0.3/drivers/scsi/bfa/bfa.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa.h 2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa.h linux-3.0.4/drivers/scsi/bfa/bfa.h
+--- linux-3.0.4/drivers/scsi/bfa/bfa.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa.h 2011-08-23 21:47:55.000000000 -0400
 @@ -238,7 +238,7 @@ struct bfa_hwif_s {
                                u32 *nvecs, u32 *maxvec);
        void (*hw_msix_get_rme_range) (struct bfa_s *bfa, u32 *start,
@@ -30775,9 +30800,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa.h linux-3.0.3/drivers/scsi/bfa/bfa.h
  typedef void (*bfa_cb_iocfc_t) (void *cbarg, enum bfa_status status);
  
  struct bfa_iocfc_s {
-diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h
---- linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h
+--- linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/bfa/bfa_ioc.h     2011-08-23 21:47:55.000000000 -0400
 @@ -196,7 +196,7 @@ struct bfa_ioc_cbfn_s {
        bfa_ioc_disable_cbfn_t  disable_cbfn;
        bfa_ioc_hbfail_cbfn_t   hbfail_cbfn;
@@ -30796,9 +30821,9 @@ diff -urNp linux-3.0.3/drivers/scsi/bfa/bfa_ioc.h linux-3.0.3/drivers/scsi/bfa/b
  
  #define bfa_ioc_pcifn(__ioc)          ((__ioc)->pcidev.pci_func)
  #define bfa_ioc_devid(__ioc)          ((__ioc)->pcidev.device_id)
-diff -urNp linux-3.0.3/drivers/scsi/BusLogic.c linux-3.0.3/drivers/scsi/BusLogic.c
---- linux-3.0.3/drivers/scsi/BusLogic.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/BusLogic.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/BusLogic.c linux-3.0.4/drivers/scsi/BusLogic.c
+--- linux-3.0.4/drivers/scsi/BusLogic.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/BusLogic.c        2011-08-23 21:48:14.000000000 -0400
 @@ -962,6 +962,8 @@ static int __init BusLogic_InitializeFla
  static void __init BusLogic_InitializeProbeInfoList(struct BusLogic_HostAdapter
                                                    *PrototypeHostAdapter)
@@ -30808,9 +30833,9 @@ diff -urNp linux-3.0.3/drivers/scsi/BusLogic.c linux-3.0.3/drivers/scsi/BusLogic
        /*
           If a PCI BIOS is present, interrogate it for MultiMaster and FlashPoint
           Host Adapters; otherwise, default to the standard ISA MultiMaster probe.
-diff -urNp linux-3.0.3/drivers/scsi/dpt_i2o.c linux-3.0.3/drivers/scsi/dpt_i2o.c
---- linux-3.0.3/drivers/scsi/dpt_i2o.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/dpt_i2o.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/dpt_i2o.c linux-3.0.4/drivers/scsi/dpt_i2o.c
+--- linux-3.0.4/drivers/scsi/dpt_i2o.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/dpt_i2o.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1811,6 +1811,8 @@ static int adpt_i2o_passthru(adpt_hba* p
        dma_addr_t addr;
        ulong flags = 0;
@@ -30829,9 +30854,9 @@ diff -urNp linux-3.0.3/drivers/scsi/dpt_i2o.c linux-3.0.3/drivers/scsi/dpt_i2o.c
        memset(msg, 0 , sizeof(msg));
        len = scsi_bufflen(cmd);
        direction = 0x00000000; 
-diff -urNp linux-3.0.3/drivers/scsi/eata.c linux-3.0.3/drivers/scsi/eata.c
---- linux-3.0.3/drivers/scsi/eata.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/eata.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/eata.c linux-3.0.4/drivers/scsi/eata.c
+--- linux-3.0.4/drivers/scsi/eata.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/eata.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1087,6 +1087,8 @@ static int port_detect(unsigned long por
        struct hostdata *ha;
        char name[16];
@@ -30841,9 +30866,9 @@ diff -urNp linux-3.0.3/drivers/scsi/eata.c linux-3.0.3/drivers/scsi/eata.c
        sprintf(name, "%s%d", driver_name, j);
  
        if (!request_region(port_base, REGION_SIZE, driver_name)) {
-diff -urNp linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c
---- linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c
+--- linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/fcoe/fcoe_ctlr.c  2011-08-23 21:48:14.000000000 -0400
 @@ -2503,6 +2503,8 @@ static int fcoe_ctlr_vn_recv(struct fcoe
        } buf;
        int rc;
@@ -30853,9 +30878,9 @@ diff -urNp linux-3.0.3/drivers/scsi/fcoe/fcoe_ctlr.c linux-3.0.3/drivers/scsi/fc
        fiph = (struct fip_header *)skb->data;
        sub = fiph->fip_subcode;
  
-diff -urNp linux-3.0.3/drivers/scsi/gdth.c linux-3.0.3/drivers/scsi/gdth.c
---- linux-3.0.3/drivers/scsi/gdth.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/gdth.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/gdth.c linux-3.0.4/drivers/scsi/gdth.c
+--- linux-3.0.4/drivers/scsi/gdth.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/gdth.c    2011-08-23 21:48:14.000000000 -0400
 @@ -4107,6 +4107,8 @@ static int ioc_lockdrv(void __user *arg)
      unsigned long flags;
      gdth_ha_str *ha;
@@ -30893,9 +30918,9 @@ diff -urNp linux-3.0.3/drivers/scsi/gdth.c linux-3.0.3/drivers/scsi/gdth.c
      memset(cmnd, 0xff, MAX_COMMAND_SIZE);
  
      TRACE2(("gdth_flush() hanum %d\n", ha->hanum));
-diff -urNp linux-3.0.3/drivers/scsi/gdth_proc.c linux-3.0.3/drivers/scsi/gdth_proc.c
---- linux-3.0.3/drivers/scsi/gdth_proc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/gdth_proc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/gdth_proc.c linux-3.0.4/drivers/scsi/gdth_proc.c
+--- linux-3.0.4/drivers/scsi/gdth_proc.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/gdth_proc.c       2011-08-23 21:48:14.000000000 -0400
 @@ -47,6 +47,9 @@ static int gdth_set_asc_info(struct Scsi
      u64         paddr;
  
@@ -30915,9 +30940,9 @@ diff -urNp linux-3.0.3/drivers/scsi/gdth_proc.c linux-3.0.3/drivers/scsi/gdth_pr
      gdtcmd = kmalloc(sizeof(*gdtcmd), GFP_KERNEL);
      estr = kmalloc(sizeof(*estr), GFP_KERNEL);
      if (!gdtcmd || !estr)
-diff -urNp linux-3.0.3/drivers/scsi/hosts.c linux-3.0.3/drivers/scsi/hosts.c
---- linux-3.0.3/drivers/scsi/hosts.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/hosts.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/hosts.c linux-3.0.4/drivers/scsi/hosts.c
+--- linux-3.0.4/drivers/scsi/hosts.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/hosts.c   2011-08-23 21:47:55.000000000 -0400
 @@ -42,7 +42,7 @@
  #include "scsi_logging.h"
  
@@ -30936,9 +30961,9 @@ diff -urNp linux-3.0.3/drivers/scsi/hosts.c linux-3.0.3/drivers/scsi/hosts.c
        shost->dma_channel = 0xff;
  
        /* These three are default values which can be overridden */
-diff -urNp linux-3.0.3/drivers/scsi/hpsa.c linux-3.0.3/drivers/scsi/hpsa.c
---- linux-3.0.3/drivers/scsi/hpsa.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/hpsa.c    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/hpsa.c linux-3.0.4/drivers/scsi/hpsa.c
+--- linux-3.0.4/drivers/scsi/hpsa.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/hpsa.c    2011-08-23 21:47:55.000000000 -0400
 @@ -498,7 +498,7 @@ static inline u32 next_command(struct ct
        u32 a;
  
@@ -31053,9 +31078,9 @@ diff -urNp linux-3.0.3/drivers/scsi/hpsa.c linux-3.0.3/drivers/scsi/hpsa.c
        h->transMethod = CFGTBL_Trans_Performant;
  }
  
-diff -urNp linux-3.0.3/drivers/scsi/hpsa.h linux-3.0.3/drivers/scsi/hpsa.h
---- linux-3.0.3/drivers/scsi/hpsa.h    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/hpsa.h    2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/hpsa.h linux-3.0.4/drivers/scsi/hpsa.h
+--- linux-3.0.4/drivers/scsi/hpsa.h    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/scsi/hpsa.h    2011-08-23 21:47:55.000000000 -0400
 @@ -73,7 +73,7 @@ struct ctlr_info {
        unsigned int msix_vector;
        unsigned int msi_vector;
@@ -31065,9 +31090,9 @@ diff -urNp linux-3.0.3/drivers/scsi/hpsa.h linux-3.0.3/drivers/scsi/hpsa.h
  
        /* queue and queue Info */
        struct list_head reqQ;
-diff -urNp linux-3.0.3/drivers/scsi/ips.h linux-3.0.3/drivers/scsi/ips.h
---- linux-3.0.3/drivers/scsi/ips.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/ips.h     2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/ips.h linux-3.0.4/drivers/scsi/ips.h
+--- linux-3.0.4/drivers/scsi/ips.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/ips.h     2011-08-23 21:47:55.000000000 -0400
 @@ -1027,7 +1027,7 @@ typedef struct {
     int       (*intr)(struct ips_ha *);
     void      (*enableint)(struct ips_ha *);
@@ -31077,9 +31102,9 @@ diff -urNp linux-3.0.3/drivers/scsi/ips.h linux-3.0.3/drivers/scsi/ips.h
  
  typedef struct ips_ha {
     uint8_t            ha_id[IPS_MAX_CHANNELS+1];
-diff -urNp linux-3.0.3/drivers/scsi/libfc/fc_exch.c linux-3.0.3/drivers/scsi/libfc/fc_exch.c
---- linux-3.0.3/drivers/scsi/libfc/fc_exch.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/libfc/fc_exch.c   2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/libfc/fc_exch.c linux-3.0.4/drivers/scsi/libfc/fc_exch.c
+--- linux-3.0.4/drivers/scsi/libfc/fc_exch.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/libfc/fc_exch.c   2011-08-23 21:47:55.000000000 -0400
 @@ -105,12 +105,12 @@ struct fc_exch_mgr {
         * all together if not used XXX
         */
@@ -31201,9 +31226,9 @@ diff -urNp linux-3.0.3/drivers/scsi/libfc/fc_exch.c linux-3.0.3/drivers/scsi/lib
  
        fc_frame_free(fp);
  }
-diff -urNp linux-3.0.3/drivers/scsi/libsas/sas_ata.c linux-3.0.3/drivers/scsi/libsas/sas_ata.c
---- linux-3.0.3/drivers/scsi/libsas/sas_ata.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/libsas/sas_ata.c  2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/libsas/sas_ata.c linux-3.0.4/drivers/scsi/libsas/sas_ata.c
+--- linux-3.0.4/drivers/scsi/libsas/sas_ata.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/libsas/sas_ata.c  2011-08-23 21:47:55.000000000 -0400
 @@ -368,7 +368,7 @@ static struct ata_port_operations sas_sa
        .postreset              = ata_std_postreset,
        .error_handler          = ata_std_error_handler,
@@ -31213,9 +31238,9 @@ diff -urNp linux-3.0.3/drivers/scsi/libsas/sas_ata.c linux-3.0.3/drivers/scsi/li
        .qc_prep                = ata_noop_qc_prep,
        .qc_issue               = sas_ata_qc_issue,
        .qc_fill_rtf            = sas_ata_qc_fill_rtf,
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c
---- linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc_debugfs.c       2011-08-23 21:48:14.000000000 -0400
 @@ -104,7 +104,7 @@ MODULE_PARM_DESC(lpfc_debugfs_mask_disc_
  
  #include <linux/debugfs.h>
@@ -31304,9 +31329,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_debugfs.c linux-3.0.3/drivers/scsi
  
        snprintf(name, sizeof(name), "discovery_trace");
        vport->debug_disc_trc =
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc.h linux-3.0.3/drivers/scsi/lpfc/lpfc.h
---- linux-3.0.3/drivers/scsi/lpfc/lpfc.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc.h       2011-08-23 21:47:55.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc.h linux-3.0.4/drivers/scsi/lpfc/lpfc.h
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc.h       2011-08-23 21:47:55.000000000 -0400
 @@ -420,7 +420,7 @@ struct lpfc_vport {
        struct dentry *debug_nodelist;
        struct dentry *vport_debugfs_root;
@@ -31336,9 +31361,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc.h linux-3.0.3/drivers/scsi/lpfc/lp
        /* iDiag debugfs sub-directory */
        struct dentry *idiag_root;
        struct dentry *idiag_pci_cfg;
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c
---- linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc_init.c  2011-08-23 21:47:56.000000000 -0400
 @@ -9923,8 +9923,10 @@ lpfc_init(void)
        printk(LPFC_COPYRIGHT "\n");
  
@@ -31352,9 +31377,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_init.c linux-3.0.3/drivers/scsi/lp
        }
        lpfc_transport_template =
                                fc_attach_transport(&lpfc_transport_functions);
-diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c
---- linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c
+--- linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/lpfc/lpfc_scsi.c  2011-08-23 21:47:56.000000000 -0400
 @@ -297,7 +297,7 @@ lpfc_rampdown_queue_depth(struct lpfc_hb
        uint32_t evt_posted;
  
@@ -31406,9 +31431,9 @@ diff -urNp linux-3.0.3/drivers/scsi/lpfc/lpfc_scsi.c linux-3.0.3/drivers/scsi/lp
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c
---- linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c
+--- linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/megaraid/megaraid_mbox.c  2011-08-23 21:48:14.000000000 -0400
 @@ -3503,6 +3503,8 @@ megaraid_cmm_register(adapter_t *adapter
        int             rval;
        int             i;
@@ -31418,9 +31443,9 @@ diff -urNp linux-3.0.3/drivers/scsi/megaraid/megaraid_mbox.c linux-3.0.3/drivers
        // Allocate memory for the base list of scb for management module.
        adapter->uscb_list = kcalloc(MBOX_MAX_USER_CMDS, sizeof(scb_t), GFP_KERNEL);
  
-diff -urNp linux-3.0.3/drivers/scsi/osd/osd_initiator.c linux-3.0.3/drivers/scsi/osd/osd_initiator.c
---- linux-3.0.3/drivers/scsi/osd/osd_initiator.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/osd/osd_initiator.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/osd/osd_initiator.c linux-3.0.4/drivers/scsi/osd/osd_initiator.c
+--- linux-3.0.4/drivers/scsi/osd/osd_initiator.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/osd/osd_initiator.c       2011-08-23 21:48:14.000000000 -0400
 @@ -97,6 +97,8 @@ static int _osd_get_print_system_info(st
        int nelem = ARRAY_SIZE(get_attrs), a = 0;
        int ret;
@@ -31430,9 +31455,9 @@ diff -urNp linux-3.0.3/drivers/scsi/osd/osd_initiator.c linux-3.0.3/drivers/scsi
        or = osd_start_request(od, GFP_KERNEL);
        if (!or)
                return -ENOMEM;
-diff -urNp linux-3.0.3/drivers/scsi/pmcraid.c linux-3.0.3/drivers/scsi/pmcraid.c
---- linux-3.0.3/drivers/scsi/pmcraid.c 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/pmcraid.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/pmcraid.c linux-3.0.4/drivers/scsi/pmcraid.c
+--- linux-3.0.4/drivers/scsi/pmcraid.c 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/scsi/pmcraid.c 2011-08-23 21:47:56.000000000 -0400
 @@ -201,8 +201,8 @@ static int pmcraid_slave_alloc(struct sc
                res->scsi_dev = scsi_dev;
                scsi_dev->hostdata = res;
@@ -31503,9 +31528,9 @@ diff -urNp linux-3.0.3/drivers/scsi/pmcraid.c linux-3.0.3/drivers/scsi/pmcraid.c
        schedule_work(&pinstance->worker_q);
        return rc;
  
-diff -urNp linux-3.0.3/drivers/scsi/pmcraid.h linux-3.0.3/drivers/scsi/pmcraid.h
---- linux-3.0.3/drivers/scsi/pmcraid.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/pmcraid.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/pmcraid.h linux-3.0.4/drivers/scsi/pmcraid.h
+--- linux-3.0.4/drivers/scsi/pmcraid.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/pmcraid.h 2011-08-23 21:47:56.000000000 -0400
 @@ -749,7 +749,7 @@ struct pmcraid_instance {
        struct pmcraid_isr_param hrrq_vector[PMCRAID_NUM_MSIX_VECTORS];
  
@@ -31535,9 +31560,9 @@ diff -urNp linux-3.0.3/drivers/scsi/pmcraid.h linux-3.0.3/drivers/scsi/pmcraid.h
  
        /* To indicate add/delete/modify during CCN */
        u8 change_detected;
-diff -urNp linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h
---- linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h
+--- linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla2xxx/qla_def.h 2011-08-23 21:47:56.000000000 -0400
 @@ -2244,7 +2244,7 @@ struct isp_operations {
        int (*get_flash_version) (struct scsi_qla_host *, void *);
        int (*start_scsi) (srb_t *);
@@ -31547,9 +31572,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla2xxx/qla_def.h linux-3.0.3/drivers/scsi/q
  
  /* MSI-X Support *************************************************************/
  
-diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h
---- linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h
+--- linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_def.h 2011-08-23 21:47:56.000000000 -0400
 @@ -256,7 +256,7 @@ struct ddb_entry {
        atomic_t retry_relogin_timer; /* Min Time between relogins
                                       * (4000 only) */
@@ -31559,9 +31584,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_def.h linux-3.0.3/drivers/scsi/q
                                       * retried */
  
        uint16_t port;
-diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c
---- linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c
+--- linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_init.c        2011-08-23 21:47:56.000000000 -0400
 @@ -680,7 +680,7 @@ static struct ddb_entry * qla4xxx_alloc_
        ddb_entry->fw_ddb_index = fw_ddb_index;
        atomic_set(&ddb_entry->retry_relogin_timer, INVALID_ENTRY);
@@ -31580,9 +31605,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_init.c linux-3.0.3/drivers/scsi/
                atomic_set(&ddb_entry->relogin_timer, 0);
                clear_bit(DF_RELOGIN, &ddb_entry->flags);
                iscsi_unblock_session(ddb_entry->sess);
-diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c
---- linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c
+--- linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/qla4xxx/ql4_os.c  2011-08-23 21:47:56.000000000 -0400
 @@ -811,13 +811,13 @@ static void qla4xxx_timer(struct scsi_ql
                            ddb_entry->fw_ddb_device_state ==
                            DDB_DS_SESSION_FAILED) {
@@ -31599,9 +31624,9 @@ diff -urNp linux-3.0.3/drivers/scsi/qla4xxx/ql4_os.c linux-3.0.3/drivers/scsi/ql
                                                          relogin_retry_count))
                                        );
                                start_dpc++;
-diff -urNp linux-3.0.3/drivers/scsi/scsi.c linux-3.0.3/drivers/scsi/scsi.c
---- linux-3.0.3/drivers/scsi/scsi.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi.c linux-3.0.4/drivers/scsi/scsi.c
+--- linux-3.0.4/drivers/scsi/scsi.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi.c    2011-08-23 21:47:56.000000000 -0400
 @@ -655,7 +655,7 @@ int scsi_dispatch_cmd(struct scsi_cmnd *
        unsigned long timeout;
        int rtn = 0;
@@ -31611,9 +31636,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi.c linux-3.0.3/drivers/scsi/scsi.c
  
        /* check if the device is still usable */
        if (unlikely(cmd->device->sdev_state == SDEV_DEL)) {
-diff -urNp linux-3.0.3/drivers/scsi/scsi_debug.c linux-3.0.3/drivers/scsi/scsi_debug.c
---- linux-3.0.3/drivers/scsi/scsi_debug.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_debug.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_debug.c linux-3.0.4/drivers/scsi/scsi_debug.c
+--- linux-3.0.4/drivers/scsi/scsi_debug.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_debug.c      2011-08-23 21:48:14.000000000 -0400
 @@ -1493,6 +1493,8 @@ static int resp_mode_select(struct scsi_
        unsigned char arr[SDEBUG_MAX_MSELECT_SZ];
        unsigned char *cmd = (unsigned char *)scp->cmnd;
@@ -31632,9 +31657,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_debug.c linux-3.0.3/drivers/scsi/scsi_d
        if ((errsts = check_readiness(scp, 1, devip)))
                return errsts;
        memset(arr, 0, sizeof(arr));
-diff -urNp linux-3.0.3/drivers/scsi/scsi_lib.c linux-3.0.3/drivers/scsi/scsi_lib.c
---- linux-3.0.3/drivers/scsi/scsi_lib.c        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_lib.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_lib.c linux-3.0.4/drivers/scsi/scsi_lib.c
+--- linux-3.0.4/drivers/scsi/scsi_lib.c        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_lib.c        2011-08-23 21:47:56.000000000 -0400
 @@ -1412,7 +1412,7 @@ static void scsi_kill_request(struct req
        shost = sdev->host;
        scsi_init_cmd_errh(cmd);
@@ -31656,9 +31681,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_lib.c linux-3.0.3/drivers/scsi/scsi_lib
  
        disposition = scsi_decide_disposition(cmd);
        if (disposition != SUCCESS &&
-diff -urNp linux-3.0.3/drivers/scsi/scsi_sysfs.c linux-3.0.3/drivers/scsi/scsi_sysfs.c
---- linux-3.0.3/drivers/scsi/scsi_sysfs.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_sysfs.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_sysfs.c linux-3.0.4/drivers/scsi/scsi_sysfs.c
+--- linux-3.0.4/drivers/scsi/scsi_sysfs.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_sysfs.c      2011-08-23 21:47:56.000000000 -0400
 @@ -622,7 +622,7 @@ show_iostat_##field(struct device *dev, 
                    char *buf)                                          \
  {                                                                     \
@@ -31668,9 +31693,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_sysfs.c linux-3.0.3/drivers/scsi/scsi_s
        return snprintf(buf, 20, "0x%llx\n", count);                    \
  }                                                                     \
  static DEVICE_ATTR(field, S_IRUGO, show_iostat_##field, NULL)
-diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_fc.c linux-3.0.3/drivers/scsi/scsi_transport_fc.c
---- linux-3.0.3/drivers/scsi/scsi_transport_fc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_transport_fc.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_fc.c linux-3.0.4/drivers/scsi/scsi_transport_fc.c
+--- linux-3.0.4/drivers/scsi/scsi_transport_fc.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_transport_fc.c       2011-08-23 21:47:56.000000000 -0400
 @@ -484,7 +484,7 @@ static DECLARE_TRANSPORT_CLASS(fc_vport_
   * Netlink Infrastructure
   */
@@ -31707,9 +31732,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_fc.c linux-3.0.3/drivers/scsi
                return -EINVAL;
        /*
         * Check for overflow; dev_loss_tmo is u32
-diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c
---- linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c
+--- linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_transport_iscsi.c    2011-08-23 21:47:56.000000000 -0400
 @@ -83,7 +83,7 @@ struct iscsi_internal {
        struct device_attribute *session_attrs[ISCSI_SESSION_ATTRS + 1];
  };
@@ -31737,9 +31762,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_iscsi.c linux-3.0.3/drivers/s
  
        err = class_register(&iscsi_transport_class);
        if (err)
-diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_srp.c linux-3.0.3/drivers/scsi/scsi_transport_srp.c
---- linux-3.0.3/drivers/scsi/scsi_transport_srp.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/scsi_transport_srp.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/scsi_transport_srp.c linux-3.0.4/drivers/scsi/scsi_transport_srp.c
+--- linux-3.0.4/drivers/scsi/scsi_transport_srp.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/scsi_transport_srp.c      2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@
  #include "scsi_transport_srp_internal.h"
  
@@ -31767,9 +31792,9 @@ diff -urNp linux-3.0.3/drivers/scsi/scsi_transport_srp.c linux-3.0.3/drivers/scs
        dev_set_name(&rport->dev, "port-%d:%d", shost->host_no, id);
  
        transport_setup_device(&rport->dev);
-diff -urNp linux-3.0.3/drivers/scsi/sg.c linux-3.0.3/drivers/scsi/sg.c
---- linux-3.0.3/drivers/scsi/sg.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/sg.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/sg.c linux-3.0.4/drivers/scsi/sg.c
+--- linux-3.0.4/drivers/scsi/sg.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/sg.c      2011-08-23 21:47:56.000000000 -0400
 @@ -2310,7 +2310,7 @@ struct sg_proc_leaf {
        const struct file_operations * fops;
  };
@@ -31788,9 +31813,9 @@ diff -urNp linux-3.0.3/drivers/scsi/sg.c linux-3.0.3/drivers/scsi/sg.c
  
        sg_proc_sgp = proc_mkdir(sg_proc_sg_dirname, NULL);
        if (!sg_proc_sgp)
-diff -urNp linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c
---- linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c
+--- linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/sym53c8xx_2/sym_glue.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1756,6 +1756,8 @@ static int __devinit sym2_probe(struct p
        int do_iounmap = 0;
        int do_disable_device = 1;
@@ -31800,9 +31825,9 @@ diff -urNp linux-3.0.3/drivers/scsi/sym53c8xx_2/sym_glue.c linux-3.0.3/drivers/s
        memset(&sym_dev, 0, sizeof(sym_dev));
        memset(&nvram, 0, sizeof(nvram));
        sym_dev.pdev = pdev;
-diff -urNp linux-3.0.3/drivers/scsi/vmw_pvscsi.c linux-3.0.3/drivers/scsi/vmw_pvscsi.c
---- linux-3.0.3/drivers/scsi/vmw_pvscsi.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/scsi/vmw_pvscsi.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/scsi/vmw_pvscsi.c linux-3.0.4/drivers/scsi/vmw_pvscsi.c
+--- linux-3.0.4/drivers/scsi/vmw_pvscsi.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/scsi/vmw_pvscsi.c      2011-08-23 21:48:14.000000000 -0400
 @@ -447,6 +447,8 @@ static void pvscsi_setup_all_rings(const
        dma_addr_t base;
        unsigned i;
@@ -31812,9 +31837,9 @@ diff -urNp linux-3.0.3/drivers/scsi/vmw_pvscsi.c linux-3.0.3/drivers/scsi/vmw_pv
        cmd.ringsStatePPN   = adapter->ringStatePA >> PAGE_SHIFT;
        cmd.reqRingNumPages = adapter->req_pages;
        cmd.cmpRingNumPages = adapter->cmp_pages;
-diff -urNp linux-3.0.3/drivers/spi/spi.c linux-3.0.3/drivers/spi/spi.c
---- linux-3.0.3/drivers/spi/spi.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/spi/spi.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/spi/spi.c linux-3.0.4/drivers/spi/spi.c
+--- linux-3.0.4/drivers/spi/spi.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/spi/spi.c      2011-08-23 21:47:56.000000000 -0400
 @@ -1023,7 +1023,7 @@ int spi_bus_unlock(struct spi_master *ma
  EXPORT_SYMBOL_GPL(spi_bus_unlock);
  
@@ -31824,9 +31849,9 @@ diff -urNp linux-3.0.3/drivers/spi/spi.c linux-3.0.3/drivers/spi/spi.c
  
  static u8     *buf;
  
-diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c
---- linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c
+--- linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/ath6kl/os/linux/ar6000_drv.c   2011-08-23 21:48:14.000000000 -0400
 @@ -362,7 +362,7 @@ static struct ar_cookie s_ar_cookie_mem[
          (((ar)->arTargetType == TARGET_TYPE_AR6003) ? AR6003_HOST_INTEREST_ITEM_ADDRESS(item) : 0))
  
@@ -31836,9 +31861,9 @@ diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/ar6000_drv.c linux-3.0.3/
      .ndo_init               = NULL,
      .ndo_open               = ar6000_open,
      .ndo_stop               = ar6000_close,
-diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
---- linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h
+--- linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h     2011-08-23 21:47:56.000000000 -0400
 @@ -30,7 +30,7 @@ typedef bool (*ar6k_pal_recv_pkt_t)(void
  typedef struct ar6k_pal_config_s
  {
@@ -31848,9 +31873,9 @@ diff -urNp linux-3.0.3/drivers/staging/ath6kl/os/linux/include/ar6k_pal.h linux-
  
  void register_pal_cb(ar6k_pal_config_t *palConfig_p);
  #endif /* _AR6K_PAL_H_ */
-diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
---- linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c
+--- linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/brcm80211/brcmfmac/dhd_linux.c 2011-08-23 21:47:56.000000000 -0400
 @@ -853,14 +853,14 @@ static void dhd_op_if(dhd_if_t *ifp)
                        free_netdev(ifp->net);
                }
@@ -31895,9 +31920,9 @@ diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmfmac/dhd_linux.c linux-3.0.
  
  #if defined(CUSTOMER_HW2) && defined(CONFIG_WIFI_CONTROL_FUNC)
        g_bus = bus;
-diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
---- linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h
+--- linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h   2011-08-23 21:47:56.000000000 -0400
 @@ -593,7 +593,7 @@ struct phy_func_ptr {
        initfn_t carrsuppr;
        rxsigpwrfn_t rxsigpwr;
@@ -31907,9 +31932,9 @@ diff -urNp linux-3.0.3/drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h linu
  typedef struct phy_func_ptr phy_func_ptr_t;
  
  struct phy_info {
-diff -urNp linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h
---- linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h
+--- linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/brcm80211/include/bcmsdh.h     2011-08-23 21:47:56.000000000 -0400
 @@ -185,7 +185,7 @@ typedef struct {
                         u16 func, uint bustype, void *regsva, void *param);
        /* detach from device */
@@ -31919,9 +31944,9 @@ diff -urNp linux-3.0.3/drivers/staging/brcm80211/include/bcmsdh.h linux-3.0.3/dr
  
  /* platform specific/high level functions */
  extern int bcmsdh_register(bcmsdh_driver_t *driver);
-diff -urNp linux-3.0.3/drivers/staging/et131x/et1310_tx.c linux-3.0.3/drivers/staging/et131x/et1310_tx.c
---- linux-3.0.3/drivers/staging/et131x/et1310_tx.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/et131x/et1310_tx.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/et131x/et1310_tx.c linux-3.0.4/drivers/staging/et131x/et1310_tx.c
+--- linux-3.0.4/drivers/staging/et131x/et1310_tx.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/et131x/et1310_tx.c     2011-08-23 21:47:56.000000000 -0400
 @@ -635,11 +635,11 @@ inline void et131x_free_send_packet(stru
        struct net_device_stats *stats = &etdev->net_stats;
  
@@ -31937,9 +31962,9 @@ diff -urNp linux-3.0.3/drivers/staging/et131x/et1310_tx.c linux-3.0.3/drivers/st
  
        if (tcb->skb) {
                stats->tx_bytes += tcb->skb->len;
-diff -urNp linux-3.0.3/drivers/staging/et131x/et131x_adapter.h linux-3.0.3/drivers/staging/et131x/et131x_adapter.h
---- linux-3.0.3/drivers/staging/et131x/et131x_adapter.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/et131x/et131x_adapter.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/et131x/et131x_adapter.h linux-3.0.4/drivers/staging/et131x/et131x_adapter.h
+--- linux-3.0.4/drivers/staging/et131x/et131x_adapter.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/et131x/et131x_adapter.h        2011-08-23 21:47:56.000000000 -0400
 @@ -110,11 +110,11 @@ typedef struct _ce_stats_t {
         * operations
         */
@@ -31955,9 +31980,9 @@ diff -urNp linux-3.0.3/drivers/staging/et131x/et131x_adapter.h linux-3.0.3/drive
        u32 norcvbuf;   /* # Rx packets discarded */
        u32 noxmtbuf;   /* # Tx packets discarded */
  
-diff -urNp linux-3.0.3/drivers/staging/hv/channel.c linux-3.0.3/drivers/staging/hv/channel.c
---- linux-3.0.3/drivers/staging/hv/channel.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/channel.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/channel.c linux-3.0.4/drivers/staging/hv/channel.c
+--- linux-3.0.4/drivers/staging/hv/channel.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/channel.c   2011-08-23 21:47:56.000000000 -0400
 @@ -433,8 +433,8 @@ int vmbus_establish_gpadl(struct vmbus_c
        int ret = 0;
        int t;
@@ -31969,9 +31994,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/channel.c linux-3.0.3/drivers/staging/
  
        ret = create_gpadl_header(kbuffer, size, &msginfo, &msgcount);
        if (ret)
-diff -urNp linux-3.0.3/drivers/staging/hv/hv.c linux-3.0.3/drivers/staging/hv/hv.c
---- linux-3.0.3/drivers/staging/hv/hv.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/hv.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/hv.c linux-3.0.4/drivers/staging/hv/hv.c
+--- linux-3.0.4/drivers/staging/hv/hv.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/hv.c        2011-08-23 21:47:56.000000000 -0400
 @@ -132,7 +132,7 @@ static u64 do_hypercall(u64 control, voi
        u64 output_address = (output) ? virt_to_phys(output) : 0;
        u32 output_address_hi = output_address >> 32;
@@ -31981,9 +32006,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/hv.c linux-3.0.3/drivers/staging/hv/hv
  
        __asm__ __volatile__ ("call *%8" : "=d"(hv_status_hi),
                              "=a"(hv_status_lo) : "d" (control_hi),
-diff -urNp linux-3.0.3/drivers/staging/hv/hv_mouse.c linux-3.0.3/drivers/staging/hv/hv_mouse.c
---- linux-3.0.3/drivers/staging/hv/hv_mouse.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/hv_mouse.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/hv_mouse.c linux-3.0.4/drivers/staging/hv/hv_mouse.c
+--- linux-3.0.4/drivers/staging/hv/hv_mouse.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/hv_mouse.c  2011-08-23 21:47:56.000000000 -0400
 @@ -879,8 +879,10 @@ static void reportdesc_callback(struct h
        if (hid_dev) {
                DPRINT_INFO(INPUTVSC_DRV, "hid_device created");
@@ -31997,9 +32022,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/hv_mouse.c linux-3.0.3/drivers/staging
  
                hid_dev->bus = BUS_VIRTUAL;
                hid_dev->vendor = input_device_ctx->device_info.vendor;
-diff -urNp linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h
---- linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h
+--- linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/hyperv_vmbus.h      2011-08-23 21:47:56.000000000 -0400
 @@ -559,7 +559,7 @@ enum vmbus_connect_state {
  struct vmbus_connection {
        enum vmbus_connect_state conn_state;
@@ -32009,9 +32034,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/hyperv_vmbus.h linux-3.0.3/drivers/sta
  
        /*
         * Represents channel interrupts. Each bit position represents a
-diff -urNp linux-3.0.3/drivers/staging/hv/rndis_filter.c linux-3.0.3/drivers/staging/hv/rndis_filter.c
---- linux-3.0.3/drivers/staging/hv/rndis_filter.c      2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/rndis_filter.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/rndis_filter.c linux-3.0.4/drivers/staging/hv/rndis_filter.c
+--- linux-3.0.4/drivers/staging/hv/rndis_filter.c      2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/rndis_filter.c      2011-08-23 21:47:56.000000000 -0400
 @@ -43,7 +43,7 @@ struct rndis_device {
  
        enum rndis_device_state state;
@@ -32039,9 +32064,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/rndis_filter.c linux-3.0.3/drivers/sta
  
        /* Ignore return since this msg is optional. */
        rndis_filter_send_request(dev, request);
-diff -urNp linux-3.0.3/drivers/staging/hv/vmbus_drv.c linux-3.0.3/drivers/staging/hv/vmbus_drv.c
---- linux-3.0.3/drivers/staging/hv/vmbus_drv.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/hv/vmbus_drv.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/hv/vmbus_drv.c linux-3.0.4/drivers/staging/hv/vmbus_drv.c
+--- linux-3.0.4/drivers/staging/hv/vmbus_drv.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/hv/vmbus_drv.c 2011-08-23 21:47:56.000000000 -0400
 @@ -668,11 +668,11 @@ int vmbus_child_device_register(struct h
  {
        int ret = 0;
@@ -32056,9 +32081,9 @@ diff -urNp linux-3.0.3/drivers/staging/hv/vmbus_drv.c linux-3.0.3/drivers/stagin
  
        /* The new device belongs to this bus */
        child_device_obj->device.bus = &hv_bus; /* device->dev.bus; */
-diff -urNp linux-3.0.3/drivers/staging/iio/ring_generic.h linux-3.0.3/drivers/staging/iio/ring_generic.h
---- linux-3.0.3/drivers/staging/iio/ring_generic.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/iio/ring_generic.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/iio/ring_generic.h linux-3.0.4/drivers/staging/iio/ring_generic.h
+--- linux-3.0.4/drivers/staging/iio/ring_generic.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/iio/ring_generic.h     2011-08-23 21:47:56.000000000 -0400
 @@ -62,7 +62,7 @@ struct iio_ring_access_funcs {
  
        int (*is_enabled)(struct iio_ring_buffer *ring);
@@ -32068,9 +32093,9 @@ diff -urNp linux-3.0.3/drivers/staging/iio/ring_generic.h linux-3.0.3/drivers/st
  
  struct iio_ring_setup_ops {
        int                             (*preenable)(struct iio_dev *);
-diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet.c linux-3.0.3/drivers/staging/octeon/ethernet.c
---- linux-3.0.3/drivers/staging/octeon/ethernet.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/octeon/ethernet.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet.c linux-3.0.4/drivers/staging/octeon/ethernet.c
+--- linux-3.0.4/drivers/staging/octeon/ethernet.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/octeon/ethernet.c      2011-08-23 21:47:56.000000000 -0400
 @@ -258,11 +258,11 @@ static struct net_device_stats *cvm_oct_
                 * since the RX tasklet also increments it.
                 */
@@ -32087,9 +32112,9 @@ diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet.c linux-3.0.3/drivers/sta
  #endif
        }
  
-diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet-rx.c linux-3.0.3/drivers/staging/octeon/ethernet-rx.c
---- linux-3.0.3/drivers/staging/octeon/ethernet-rx.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/octeon/ethernet-rx.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/octeon/ethernet-rx.c linux-3.0.4/drivers/staging/octeon/ethernet-rx.c
+--- linux-3.0.4/drivers/staging/octeon/ethernet-rx.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/octeon/ethernet-rx.c   2011-08-23 21:47:56.000000000 -0400
 @@ -417,11 +417,11 @@ static int cvm_oct_napi_poll(struct napi
                                /* Increment RX stats for virtual ports */
                                if (work->ipprt >= CVMX_PIP_NUM_INPUT_PORTS) {
@@ -32118,9 +32143,9 @@ diff -urNp linux-3.0.3/drivers/staging/octeon/ethernet-rx.c linux-3.0.3/drivers/
  #endif
                                dev_kfree_skb_irq(skb);
                        }
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/inode.c linux-3.0.3/drivers/staging/pohmelfs/inode.c
---- linux-3.0.3/drivers/staging/pohmelfs/inode.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/inode.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/inode.c linux-3.0.4/drivers/staging/pohmelfs/inode.c
+--- linux-3.0.4/drivers/staging/pohmelfs/inode.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/inode.c       2011-08-23 21:47:56.000000000 -0400
 @@ -1856,7 +1856,7 @@ static int pohmelfs_fill_super(struct su
        mutex_init(&psb->mcache_lock);
        psb->mcache_root = RB_ROOT;
@@ -32139,9 +32164,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/inode.c linux-3.0.3/drivers/stag
        atomic_long_set(&psb->total_inodes, 0);
  
        mutex_init(&psb->state_lock);
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/mcache.c linux-3.0.3/drivers/staging/pohmelfs/mcache.c
---- linux-3.0.3/drivers/staging/pohmelfs/mcache.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/mcache.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/mcache.c linux-3.0.4/drivers/staging/pohmelfs/mcache.c
+--- linux-3.0.4/drivers/staging/pohmelfs/mcache.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/mcache.c      2011-08-23 21:47:56.000000000 -0400
 @@ -121,7 +121,7 @@ struct pohmelfs_mcache *pohmelfs_mcache_
        m->data = data;
        m->start = start;
@@ -32151,9 +32176,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/mcache.c linux-3.0.3/drivers/sta
  
        mutex_lock(&psb->mcache_lock);
        err = pohmelfs_mcache_insert(psb, m);
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/netfs.h linux-3.0.3/drivers/staging/pohmelfs/netfs.h
---- linux-3.0.3/drivers/staging/pohmelfs/netfs.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/netfs.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/netfs.h linux-3.0.4/drivers/staging/pohmelfs/netfs.h
+--- linux-3.0.4/drivers/staging/pohmelfs/netfs.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/netfs.h       2011-08-23 21:47:56.000000000 -0400
 @@ -571,14 +571,14 @@ struct pohmelfs_config;
  struct pohmelfs_sb {
        struct rb_root          mcache_root;
@@ -32171,9 +32196,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/netfs.h linux-3.0.3/drivers/stag
  
        unsigned int            crypto_attached_size;
        unsigned int            crypto_align_size;
-diff -urNp linux-3.0.3/drivers/staging/pohmelfs/trans.c linux-3.0.3/drivers/staging/pohmelfs/trans.c
---- linux-3.0.3/drivers/staging/pohmelfs/trans.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/pohmelfs/trans.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/pohmelfs/trans.c linux-3.0.4/drivers/staging/pohmelfs/trans.c
+--- linux-3.0.4/drivers/staging/pohmelfs/trans.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/pohmelfs/trans.c       2011-08-23 21:47:56.000000000 -0400
 @@ -492,7 +492,7 @@ int netfs_trans_finish(struct netfs_tran
        int err;
        struct netfs_cmd *cmd = t->iovec.iov_base;
@@ -32183,9 +32208,9 @@ diff -urNp linux-3.0.3/drivers/staging/pohmelfs/trans.c linux-3.0.3/drivers/stag
  
        cmd->size = t->iovec.iov_len - sizeof(struct netfs_cmd) +
                t->attached_size + t->attached_pages * sizeof(struct netfs_cmd);
-diff -urNp linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h
---- linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h
+--- linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/rtl8712/rtl871x_io.h   2011-08-23 21:47:56.000000000 -0400
 @@ -83,7 +83,7 @@ struct       _io_ops {
                          u8 *pmem);
        u32 (*_write_port)(struct intf_hdl *pintfhdl, u32 addr, u32 cnt,
@@ -32195,9 +32220,9 @@ diff -urNp linux-3.0.3/drivers/staging/rtl8712/rtl871x_io.h linux-3.0.3/drivers/
  
  struct io_req {
        struct list_head list;
-diff -urNp linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c
---- linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c     2011-08-24 18:21:41.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c
+--- linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/sbe-2t3e3/netdev.c     2011-08-24 18:21:41.000000000 -0400
 @@ -51,7 +51,7 @@ int t3e3_ioctl(struct net_device *dev, s
        t3e3_if_config(sc, cmd_2t3e3, (char *)&param, &resp, &rlen);
  
@@ -32207,9 +32232,9 @@ diff -urNp linux-3.0.3/drivers/staging/sbe-2t3e3/netdev.c linux-3.0.3/drivers/st
                        return -EFAULT;
  
        return 0;
-diff -urNp linux-3.0.3/drivers/staging/tty/stallion.c linux-3.0.3/drivers/staging/tty/stallion.c
---- linux-3.0.3/drivers/staging/tty/stallion.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/tty/stallion.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/tty/stallion.c linux-3.0.4/drivers/staging/tty/stallion.c
+--- linux-3.0.4/drivers/staging/tty/stallion.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/tty/stallion.c 2011-08-23 21:48:14.000000000 -0400
 @@ -2406,6 +2406,8 @@ static int stl_getportstruct(struct stlp
        struct stlport  stl_dummyport;
        struct stlport  *portp;
@@ -32219,9 +32244,9 @@ diff -urNp linux-3.0.3/drivers/staging/tty/stallion.c linux-3.0.3/drivers/stagin
        if (copy_from_user(&stl_dummyport, arg, sizeof(struct stlport)))
                return -EFAULT;
        portp = stl_getport(stl_dummyport.brdnr, stl_dummyport.panelnr,
-diff -urNp linux-3.0.3/drivers/staging/usbip/usbip_common.h linux-3.0.3/drivers/staging/usbip/usbip_common.h
---- linux-3.0.3/drivers/staging/usbip/usbip_common.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/usbip_common.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/usbip_common.h linux-3.0.4/drivers/staging/usbip/usbip_common.h
+--- linux-3.0.4/drivers/staging/usbip/usbip_common.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/usbip_common.h   2011-08-23 21:47:56.000000000 -0400
 @@ -315,7 +315,7 @@ struct usbip_device {
                void (*shutdown)(struct usbip_device *);
                void (*reset)(struct usbip_device *);
@@ -32231,9 +32256,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/usbip_common.h linux-3.0.3/drivers/
  };
  
  void usbip_pack_pdu(struct usbip_header *pdu, struct urb *urb, int cmd,
-diff -urNp linux-3.0.3/drivers/staging/usbip/vhci.h linux-3.0.3/drivers/staging/usbip/vhci.h
---- linux-3.0.3/drivers/staging/usbip/vhci.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/vhci.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/vhci.h linux-3.0.4/drivers/staging/usbip/vhci.h
+--- linux-3.0.4/drivers/staging/usbip/vhci.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/vhci.h   2011-08-23 21:47:56.000000000 -0400
 @@ -94,7 +94,7 @@ struct vhci_hcd {
        unsigned resuming:1;
        unsigned long re_timeout;
@@ -32243,9 +32268,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/vhci.h linux-3.0.3/drivers/staging/
  
        /*
         * NOTE:
-diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_hcd.c linux-3.0.3/drivers/staging/usbip/vhci_hcd.c
---- linux-3.0.3/drivers/staging/usbip/vhci_hcd.c       2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/vhci_hcd.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_hcd.c linux-3.0.4/drivers/staging/usbip/vhci_hcd.c
+--- linux-3.0.4/drivers/staging/usbip/vhci_hcd.c       2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/vhci_hcd.c       2011-08-23 21:47:56.000000000 -0400
 @@ -511,7 +511,7 @@ static void vhci_tx_urb(struct urb *urb)
                return;
        }
@@ -32273,9 +32298,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_hcd.c linux-3.0.3/drivers/stag
        spin_lock_init(&vhci->lock);
  
        hcd->power_budget = 0; /* no limit */
-diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_rx.c linux-3.0.3/drivers/staging/usbip/vhci_rx.c
---- linux-3.0.3/drivers/staging/usbip/vhci_rx.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/usbip/vhci_rx.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/usbip/vhci_rx.c linux-3.0.4/drivers/staging/usbip/vhci_rx.c
+--- linux-3.0.4/drivers/staging/usbip/vhci_rx.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/usbip/vhci_rx.c        2011-08-23 21:47:56.000000000 -0400
 @@ -76,7 +76,7 @@ static void vhci_recv_ret_submit(struct 
        if (!urb) {
                pr_err("cannot find a urb of seqnum %u\n", pdu->base.seqnum);
@@ -32285,9 +32310,9 @@ diff -urNp linux-3.0.3/drivers/staging/usbip/vhci_rx.c linux-3.0.3/drivers/stagi
                usbip_event_add(ud, VDEV_EVENT_ERROR_TCP);
                return;
        }
-diff -urNp linux-3.0.3/drivers/staging/vt6655/hostap.c linux-3.0.3/drivers/staging/vt6655/hostap.c
---- linux-3.0.3/drivers/staging/vt6655/hostap.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/vt6655/hostap.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/vt6655/hostap.c linux-3.0.4/drivers/staging/vt6655/hostap.c
+--- linux-3.0.4/drivers/staging/vt6655/hostap.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/vt6655/hostap.c        2011-08-23 21:47:56.000000000 -0400
 @@ -79,14 +79,13 @@ static int          msglevel            
   *
   */
@@ -32314,9 +32339,9 @@ diff -urNp linux-3.0.3/drivers/staging/vt6655/hostap.c linux-3.0.3/drivers/stagi
        pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
        pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.3/drivers/staging/vt6656/hostap.c linux-3.0.3/drivers/staging/vt6656/hostap.c
---- linux-3.0.3/drivers/staging/vt6656/hostap.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/vt6656/hostap.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/vt6656/hostap.c linux-3.0.4/drivers/staging/vt6656/hostap.c
+--- linux-3.0.4/drivers/staging/vt6656/hostap.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/vt6656/hostap.c        2011-08-23 21:47:56.000000000 -0400
 @@ -80,14 +80,13 @@ static int          msglevel            
   *
   */
@@ -32343,9 +32368,9 @@ diff -urNp linux-3.0.3/drivers/staging/vt6656/hostap.c linux-3.0.3/drivers/stagi
        pDevice->apdev->netdev_ops = &apdev_netdev_ops;
  
        pDevice->apdev->type = ARPHRD_IEEE80211;
-diff -urNp linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c
---- linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c
+--- linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/wlan-ng/hfa384x_usb.c  2011-08-23 21:47:56.000000000 -0400
 @@ -204,7 +204,7 @@ static void unlocked_usbctlx_complete(hf
  
  struct usbctlx_completor {
@@ -32355,9 +32380,9 @@ diff -urNp linux-3.0.3/drivers/staging/wlan-ng/hfa384x_usb.c linux-3.0.3/drivers
  
  static int
  hfa384x_usbctlx_complete_sync(hfa384x_t *hw,
-diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.c linux-3.0.3/drivers/staging/zcache/tmem.c
---- linux-3.0.3/drivers/staging/zcache/tmem.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/zcache/tmem.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.c linux-3.0.4/drivers/staging/zcache/tmem.c
+--- linux-3.0.4/drivers/staging/zcache/tmem.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/zcache/tmem.c  2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@
   * A tmem host implementation must use this function to register callbacks
   * for memory allocation.
@@ -32376,9 +32401,9 @@ diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.c linux-3.0.3/drivers/staging
  
  void tmem_register_pamops(struct tmem_pamops *m)
  {
-diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.h linux-3.0.3/drivers/staging/zcache/tmem.h
---- linux-3.0.3/drivers/staging/zcache/tmem.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/staging/zcache/tmem.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/staging/zcache/tmem.h linux-3.0.4/drivers/staging/zcache/tmem.h
+--- linux-3.0.4/drivers/staging/zcache/tmem.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/staging/zcache/tmem.h  2011-08-23 21:47:56.000000000 -0400
 @@ -171,6 +171,7 @@ struct tmem_pamops {
        int (*get_data)(struct page *, void *, struct tmem_pool *);
        void (*free)(void *, struct tmem_pool *);
@@ -32395,9 +32420,9 @@ diff -urNp linux-3.0.3/drivers/staging/zcache/tmem.h linux-3.0.3/drivers/staging
  extern void tmem_register_hostops(struct tmem_hostops *m);
  
  /* core tmem accessor functions */
-diff -urNp linux-3.0.3/drivers/target/target_core_alua.c linux-3.0.3/drivers/target/target_core_alua.c
---- linux-3.0.3/drivers/target/target_core_alua.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_alua.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_alua.c linux-3.0.4/drivers/target/target_core_alua.c
+--- linux-3.0.4/drivers/target/target_core_alua.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_alua.c      2011-08-23 21:48:14.000000000 -0400
 @@ -675,6 +675,8 @@ static int core_alua_update_tpg_primary_
        char path[ALUA_METADATA_PATH_LEN];
        int len;
@@ -32416,9 +32441,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_alua.c linux-3.0.3/drivers/tar
        memset(path, 0, ALUA_METADATA_PATH_LEN);
        memset(wwn, 0, ALUA_SECONDARY_METADATA_WWN_LEN);
  
-diff -urNp linux-3.0.3/drivers/target/target_core_cdb.c linux-3.0.3/drivers/target/target_core_cdb.c
---- linux-3.0.3/drivers/target/target_core_cdb.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_cdb.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_cdb.c linux-3.0.4/drivers/target/target_core_cdb.c
+--- linux-3.0.4/drivers/target/target_core_cdb.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_cdb.c       2011-08-23 21:48:14.000000000 -0400
 @@ -838,6 +838,8 @@ target_emulate_modesense(struct se_cmd *
        int length = 0;
        unsigned char buf[SE_MODE_PAGE_BUF];
@@ -32428,9 +32453,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_cdb.c linux-3.0.3/drivers/targ
        memset(buf, 0, SE_MODE_PAGE_BUF);
  
        switch (cdb[2] & 0x3f) {
-diff -urNp linux-3.0.3/drivers/target/target_core_configfs.c linux-3.0.3/drivers/target/target_core_configfs.c
---- linux-3.0.3/drivers/target/target_core_configfs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_configfs.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_configfs.c linux-3.0.4/drivers/target/target_core_configfs.c
+--- linux-3.0.4/drivers/target/target_core_configfs.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_configfs.c  2011-08-23 21:48:14.000000000 -0400
 @@ -1276,6 +1276,8 @@ static ssize_t target_core_dev_pr_show_a
        ssize_t len = 0;
        int reg_count = 0, prf_isid;
@@ -32440,9 +32465,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_configfs.c linux-3.0.3/drivers
        if (!(su_dev->se_dev_ptr))
                return -ENODEV;
  
-diff -urNp linux-3.0.3/drivers/target/target_core_pr.c linux-3.0.3/drivers/target/target_core_pr.c
---- linux-3.0.3/drivers/target/target_core_pr.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_pr.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_pr.c linux-3.0.4/drivers/target/target_core_pr.c
+--- linux-3.0.4/drivers/target/target_core_pr.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_pr.c        2011-08-23 21:48:14.000000000 -0400
 @@ -918,6 +918,8 @@ static int __core_scsi3_check_aptpl_regi
        unsigned char t_port[PR_APTPL_MAX_TPORT_LEN];
        u16 tpgt;
@@ -32470,9 +32495,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_pr.c linux-3.0.3/drivers/targe
        memset(iov, 0, sizeof(struct iovec));
        memset(path, 0, 512);
  
-diff -urNp linux-3.0.3/drivers/target/target_core_tmr.c linux-3.0.3/drivers/target/target_core_tmr.c
---- linux-3.0.3/drivers/target/target_core_tmr.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_tmr.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_tmr.c linux-3.0.4/drivers/target/target_core_tmr.c
+--- linux-3.0.4/drivers/target/target_core_tmr.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_tmr.c       2011-08-23 21:47:56.000000000 -0400
 @@ -269,7 +269,7 @@ int core_tmr_lun_reset(
                        CMD_TFO(cmd)->get_task_tag(cmd), cmd->pr_res_key,
                        T_TASK(cmd)->t_task_cdbs,
@@ -32500,9 +32525,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_tmr.c linux-3.0.3/drivers/targ
                spin_unlock_irqrestore(&T_TASK(cmd)->t_state_lock, flags);
                core_tmr_handle_tas_abort(tmr_nacl, cmd, tas, fe_count);
  
-diff -urNp linux-3.0.3/drivers/target/target_core_transport.c linux-3.0.3/drivers/target/target_core_transport.c
---- linux-3.0.3/drivers/target/target_core_transport.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/target/target_core_transport.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/target/target_core_transport.c linux-3.0.4/drivers/target/target_core_transport.c
+--- linux-3.0.4/drivers/target/target_core_transport.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/target/target_core_transport.c 2011-08-23 21:47:56.000000000 -0400
 @@ -1681,7 +1681,7 @@ struct se_device *transport_add_device_t
  
        dev->queue_depth        = dev_limits->queue_depth;
@@ -32578,9 +32603,9 @@ diff -urNp linux-3.0.3/drivers/target/target_core_transport.c linux-3.0.3/driver
                        atomic_read(&T_TASK(cmd)->t_transport_active),
                        atomic_read(&T_TASK(cmd)->t_transport_stop),
                        atomic_read(&T_TASK(cmd)->t_transport_sent));
-diff -urNp linux-3.0.3/drivers/telephony/ixj.c linux-3.0.3/drivers/telephony/ixj.c
---- linux-3.0.3/drivers/telephony/ixj.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/telephony/ixj.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/telephony/ixj.c linux-3.0.4/drivers/telephony/ixj.c
+--- linux-3.0.4/drivers/telephony/ixj.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/telephony/ixj.c        2011-08-23 21:48:14.000000000 -0400
 @@ -4976,6 +4976,8 @@ static int ixj_daa_cid_read(IXJ *j)
        bool mContinue;
        char *pIn, *pOut;
@@ -32590,9 +32615,9 @@ diff -urNp linux-3.0.3/drivers/telephony/ixj.c linux-3.0.3/drivers/telephony/ixj
        if (!SCI_Prepare(j))
                return 0;
  
-diff -urNp linux-3.0.3/drivers/tty/hvc/hvcs.c linux-3.0.3/drivers/tty/hvc/hvcs.c
---- linux-3.0.3/drivers/tty/hvc/hvcs.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/hvc/hvcs.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/hvc/hvcs.c linux-3.0.4/drivers/tty/hvc/hvcs.c
+--- linux-3.0.4/drivers/tty/hvc/hvcs.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/hvc/hvcs.c 2011-08-23 21:47:56.000000000 -0400
 @@ -83,6 +83,7 @@
  #include <asm/hvcserver.h>
  #include <asm/uaccess.h>
@@ -32695,9 +32720,9 @@ diff -urNp linux-3.0.3/drivers/tty/hvc/hvcs.c linux-3.0.3/drivers/tty/hvc/hvcs.c
                return 0;
  
        return HVCS_BUFF_LEN - hvcsd->chars_in_buffer;
-diff -urNp linux-3.0.3/drivers/tty/ipwireless/tty.c linux-3.0.3/drivers/tty/ipwireless/tty.c
---- linux-3.0.3/drivers/tty/ipwireless/tty.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/ipwireless/tty.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/ipwireless/tty.c linux-3.0.4/drivers/tty/ipwireless/tty.c
+--- linux-3.0.4/drivers/tty/ipwireless/tty.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/ipwireless/tty.c   2011-08-23 21:47:56.000000000 -0400
 @@ -29,6 +29,7 @@
  #include <linux/tty_driver.h>
  #include <linux/tty_flip.h>
@@ -32820,9 +32845,9 @@ diff -urNp linux-3.0.3/drivers/tty/ipwireless/tty.c linux-3.0.3/drivers/tty/ipwi
                                do_ipw_close(ttyj);
                        ipwireless_disassociate_network_ttys(network,
                                                             ttyj->channel_idx);
-diff -urNp linux-3.0.3/drivers/tty/n_gsm.c linux-3.0.3/drivers/tty/n_gsm.c
---- linux-3.0.3/drivers/tty/n_gsm.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/drivers/tty/n_gsm.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/n_gsm.c linux-3.0.4/drivers/tty/n_gsm.c
+--- linux-3.0.4/drivers/tty/n_gsm.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/drivers/tty/n_gsm.c    2011-08-23 21:47:56.000000000 -0400
 @@ -1589,7 +1589,7 @@ static struct gsm_dlci *gsm_dlci_alloc(s
                return NULL;
        spin_lock_init(&dlci->lock);
@@ -32832,9 +32857,9 @@ diff -urNp linux-3.0.3/drivers/tty/n_gsm.c linux-3.0.3/drivers/tty/n_gsm.c
                kfree(dlci);
                return NULL;
        }
-diff -urNp linux-3.0.3/drivers/tty/n_tty.c linux-3.0.3/drivers/tty/n_tty.c
---- linux-3.0.3/drivers/tty/n_tty.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/n_tty.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/n_tty.c linux-3.0.4/drivers/tty/n_tty.c
+--- linux-3.0.4/drivers/tty/n_tty.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/n_tty.c    2011-08-23 21:47:56.000000000 -0400
 @@ -2123,6 +2123,7 @@ void n_tty_inherit_ops(struct tty_ldisc_
  {
        *ops = tty_ldisc_N_TTY;
@@ -32844,9 +32869,9 @@ diff -urNp linux-3.0.3/drivers/tty/n_tty.c linux-3.0.3/drivers/tty/n_tty.c
 +      ops->flags = 0;
  }
  EXPORT_SYMBOL_GPL(n_tty_inherit_ops);
-diff -urNp linux-3.0.3/drivers/tty/pty.c linux-3.0.3/drivers/tty/pty.c
---- linux-3.0.3/drivers/tty/pty.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/pty.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/pty.c linux-3.0.4/drivers/tty/pty.c
+--- linux-3.0.4/drivers/tty/pty.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/pty.c      2011-08-23 21:47:56.000000000 -0400
 @@ -754,8 +754,10 @@ static void __init unix98_pty_init(void)
        register_sysctl_table(pty_root_table);
  
@@ -32859,9 +32884,9 @@ diff -urNp linux-3.0.3/drivers/tty/pty.c linux-3.0.3/drivers/tty/pty.c
  
        cdev_init(&ptmx_cdev, &ptmx_fops);
        if (cdev_add(&ptmx_cdev, MKDEV(TTYAUX_MAJOR, 2), 1) ||
-diff -urNp linux-3.0.3/drivers/tty/rocket.c linux-3.0.3/drivers/tty/rocket.c
---- linux-3.0.3/drivers/tty/rocket.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/rocket.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/rocket.c linux-3.0.4/drivers/tty/rocket.c
+--- linux-3.0.4/drivers/tty/rocket.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/rocket.c   2011-08-23 21:48:14.000000000 -0400
 @@ -1277,6 +1277,8 @@ static int get_ports(struct r_port *info
        struct rocket_ports tmp;
        int board;
@@ -32871,9 +32896,9 @@ diff -urNp linux-3.0.3/drivers/tty/rocket.c linux-3.0.3/drivers/tty/rocket.c
        if (!retports)
                return -EFAULT;
        memset(&tmp, 0, sizeof (tmp));
-diff -urNp linux-3.0.3/drivers/tty/serial/kgdboc.c linux-3.0.3/drivers/tty/serial/kgdboc.c
---- linux-3.0.3/drivers/tty/serial/kgdboc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/serial/kgdboc.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/serial/kgdboc.c linux-3.0.4/drivers/tty/serial/kgdboc.c
+--- linux-3.0.4/drivers/tty/serial/kgdboc.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/serial/kgdboc.c    2011-08-23 21:47:56.000000000 -0400
 @@ -23,8 +23,9 @@
  #define MAX_CONFIG_LEN                40
  
@@ -32972,9 +32997,9 @@ diff -urNp linux-3.0.3/drivers/tty/serial/kgdboc.c linux-3.0.3/drivers/tty/seria
  #ifdef CONFIG_KGDB_SERIAL_CONSOLE
  /* This is only available if kgdboc is a built in for early debugging */
  static int __init kgdboc_early_init(char *opt)
-diff -urNp linux-3.0.3/drivers/tty/serial/mrst_max3110.c linux-3.0.3/drivers/tty/serial/mrst_max3110.c
---- linux-3.0.3/drivers/tty/serial/mrst_max3110.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/serial/mrst_max3110.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/serial/mrst_max3110.c linux-3.0.4/drivers/tty/serial/mrst_max3110.c
+--- linux-3.0.4/drivers/tty/serial/mrst_max3110.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/serial/mrst_max3110.c      2011-08-23 21:48:14.000000000 -0400
 @@ -393,6 +393,8 @@ static void max3110_con_receive(struct u
        int loop = 1, num, total = 0;
        u8 recv_buf[512], *pbuf;
@@ -32984,9 +33009,9 @@ diff -urNp linux-3.0.3/drivers/tty/serial/mrst_max3110.c linux-3.0.3/drivers/tty
        pbuf = recv_buf;
        do {
                num = max3110_read_multi(max, pbuf);
-diff -urNp linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3/drivers/tty/tty_io.c
---- linux-3.0.3/drivers/tty/tty_io.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/tty_io.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/tty_io.c linux-3.0.4/drivers/tty/tty_io.c
+--- linux-3.0.4/drivers/tty/tty_io.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/tty_io.c   2011-08-23 21:47:56.000000000 -0400
 @@ -3215,7 +3215,7 @@ EXPORT_SYMBOL_GPL(get_current_tty);
  
  void tty_default_fops(struct file_operations *fops)
@@ -32996,9 +33021,9 @@ diff -urNp linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3/drivers/tty/tty_io.c
  }
  
  /*
-diff -urNp linux-3.0.3/drivers/tty/tty_ldisc.c linux-3.0.3/drivers/tty/tty_ldisc.c
---- linux-3.0.3/drivers/tty/tty_ldisc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/tty_ldisc.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/tty_ldisc.c linux-3.0.4/drivers/tty/tty_ldisc.c
+--- linux-3.0.4/drivers/tty/tty_ldisc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/tty_ldisc.c        2011-08-23 21:47:56.000000000 -0400
 @@ -74,7 +74,7 @@ static void put_ldisc(struct tty_ldisc *
        if (atomic_dec_and_lock(&ld->users, &tty_ldisc_lock)) {
                struct tty_ldisc_ops *ldo = ld->ops;
@@ -33044,9 +33069,9 @@ diff -urNp linux-3.0.3/drivers/tty/tty_ldisc.c linux-3.0.3/drivers/tty/tty_ldisc
        module_put(ldops->owner);
        spin_unlock_irqrestore(&tty_ldisc_lock, flags);
  }
-diff -urNp linux-3.0.3/drivers/tty/vt/keyboard.c linux-3.0.3/drivers/tty/vt/keyboard.c
---- linux-3.0.3/drivers/tty/vt/keyboard.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/vt/keyboard.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/vt/keyboard.c linux-3.0.4/drivers/tty/vt/keyboard.c
+--- linux-3.0.4/drivers/tty/vt/keyboard.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/vt/keyboard.c      2011-08-23 21:48:14.000000000 -0400
 @@ -656,6 +656,16 @@ static void k_spec(struct vc_data *vc, u
             kbd->kbdmode == VC_OFF) &&
             value != KVAL(K_SAK))
@@ -33064,9 +33089,9 @@ diff -urNp linux-3.0.3/drivers/tty/vt/keyboard.c linux-3.0.3/drivers/tty/vt/keyb
        fn_handler[value](vc);
  }
  
-diff -urNp linux-3.0.3/drivers/tty/vt/vt.c linux-3.0.3/drivers/tty/vt/vt.c
---- linux-3.0.3/drivers/tty/vt/vt.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/vt/vt.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/vt/vt.c linux-3.0.4/drivers/tty/vt/vt.c
+--- linux-3.0.4/drivers/tty/vt/vt.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/vt/vt.c    2011-08-23 21:47:56.000000000 -0400
 @@ -259,7 +259,7 @@ EXPORT_SYMBOL_GPL(unregister_vt_notifier
  
  static void notify_write(struct vc_data *vc, unsigned int unicode)
@@ -33076,9 +33101,9 @@ diff -urNp linux-3.0.3/drivers/tty/vt/vt.c linux-3.0.3/drivers/tty/vt/vt.c
        atomic_notifier_call_chain(&vt_notifier_list, VT_WRITE, &param);
  }
  
-diff -urNp linux-3.0.3/drivers/tty/vt/vt_ioctl.c linux-3.0.3/drivers/tty/vt/vt_ioctl.c
---- linux-3.0.3/drivers/tty/vt/vt_ioctl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/tty/vt/vt_ioctl.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/tty/vt/vt_ioctl.c linux-3.0.4/drivers/tty/vt/vt_ioctl.c
+--- linux-3.0.4/drivers/tty/vt/vt_ioctl.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/tty/vt/vt_ioctl.c      2011-08-23 21:48:14.000000000 -0400
 @@ -207,9 +207,6 @@ do_kdsk_ioctl(int cmd, struct kbentry __
        if (copy_from_user(&tmp, user_kbe, sizeof(struct kbentry)))
                return -EFAULT;
@@ -33119,9 +33144,9 @@ diff -urNp linux-3.0.3/drivers/tty/vt/vt_ioctl.c linux-3.0.3/drivers/tty/vt/vt_i
                if (!perm) {
                        ret = -EPERM;
                        goto reterr;
-diff -urNp linux-3.0.3/drivers/uio/uio.c linux-3.0.3/drivers/uio/uio.c
---- linux-3.0.3/drivers/uio/uio.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/uio/uio.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/uio/uio.c linux-3.0.4/drivers/uio/uio.c
+--- linux-3.0.4/drivers/uio/uio.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/uio/uio.c      2011-08-23 21:47:56.000000000 -0400
 @@ -25,6 +25,7 @@
  #include <linux/kobject.h>
  #include <linux/cdev.h>
@@ -33213,9 +33238,9 @@ diff -urNp linux-3.0.3/drivers/uio/uio.c linux-3.0.3/drivers/uio/uio.c
  
        ret = uio_get_minor(idev);
        if (ret)
-diff -urNp linux-3.0.3/drivers/usb/atm/cxacru.c linux-3.0.3/drivers/usb/atm/cxacru.c
---- linux-3.0.3/drivers/usb/atm/cxacru.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/atm/cxacru.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/atm/cxacru.c linux-3.0.4/drivers/usb/atm/cxacru.c
+--- linux-3.0.4/drivers/usb/atm/cxacru.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/atm/cxacru.c       2011-08-23 21:47:56.000000000 -0400
 @@ -473,7 +473,7 @@ static ssize_t cxacru_sysfs_store_adsl_c
                ret = sscanf(buf + pos, "%x=%x%n", &index, &value, &tmp);
                if (ret < 2)
@@ -33225,9 +33250,9 @@ diff -urNp linux-3.0.3/drivers/usb/atm/cxacru.c linux-3.0.3/drivers/usb/atm/cxac
                        return -EINVAL;
                pos += tmp;
  
-diff -urNp linux-3.0.3/drivers/usb/atm/usbatm.c linux-3.0.3/drivers/usb/atm/usbatm.c
---- linux-3.0.3/drivers/usb/atm/usbatm.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/atm/usbatm.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/atm/usbatm.c linux-3.0.4/drivers/usb/atm/usbatm.c
+--- linux-3.0.4/drivers/usb/atm/usbatm.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/atm/usbatm.c       2011-08-23 21:47:56.000000000 -0400
 @@ -332,7 +332,7 @@ static void usbatm_extract_one_cell(stru
                if (printk_ratelimit())
                        atm_warn(instance, "%s: OAM not supported (vpi %d, vci %d)!\n",
@@ -33307,9 +33332,9 @@ diff -urNp linux-3.0.3/drivers/usb/atm/usbatm.c linux-3.0.3/drivers/usb/atm/usba
  
        if (!left--) {
                if (instance->disconnected)
-diff -urNp linux-3.0.3/drivers/usb/core/devices.c linux-3.0.3/drivers/usb/core/devices.c
---- linux-3.0.3/drivers/usb/core/devices.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/core/devices.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/core/devices.c linux-3.0.4/drivers/usb/core/devices.c
+--- linux-3.0.4/drivers/usb/core/devices.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/core/devices.c     2011-08-23 21:47:56.000000000 -0400
 @@ -126,7 +126,7 @@ static const char format_endpt[] =
   * time it gets called.
   */
@@ -33337,9 +33362,9 @@ diff -urNp linux-3.0.3/drivers/usb/core/devices.c linux-3.0.3/drivers/usb/core/d
        if (file->f_version != event_count) {
                file->f_version = event_count;
                return POLLIN | POLLRDNORM;
-diff -urNp linux-3.0.3/drivers/usb/core/message.c linux-3.0.3/drivers/usb/core/message.c
---- linux-3.0.3/drivers/usb/core/message.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/core/message.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/core/message.c linux-3.0.4/drivers/usb/core/message.c
+--- linux-3.0.4/drivers/usb/core/message.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/core/message.c     2011-08-23 21:47:56.000000000 -0400
 @@ -869,8 +869,8 @@ char *usb_cache_string(struct usb_device
        buf = kmalloc(MAX_USB_STRING_SIZE, GFP_NOIO);
        if (buf) {
@@ -33351,9 +33376,9 @@ diff -urNp linux-3.0.3/drivers/usb/core/message.c linux-3.0.3/drivers/usb/core/m
                        if (!smallbuf)
                                return buf;
                        memcpy(smallbuf, buf, len);
-diff -urNp linux-3.0.3/drivers/usb/early/ehci-dbgp.c linux-3.0.3/drivers/usb/early/ehci-dbgp.c
---- linux-3.0.3/drivers/usb/early/ehci-dbgp.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/early/ehci-dbgp.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/early/ehci-dbgp.c linux-3.0.4/drivers/usb/early/ehci-dbgp.c
+--- linux-3.0.4/drivers/usb/early/ehci-dbgp.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/early/ehci-dbgp.c  2011-08-23 21:47:56.000000000 -0400
 @@ -97,7 +97,8 @@ static inline u32 dbgp_len_update(u32 x,
  
  #ifdef CONFIG_KGDB
@@ -33391,9 +33416,9 @@ diff -urNp linux-3.0.3/drivers/usb/early/ehci-dbgp.c linux-3.0.3/drivers/usb/ear
  
        return 0;
  }
-diff -urNp linux-3.0.3/drivers/usb/host/xhci-mem.c linux-3.0.3/drivers/usb/host/xhci-mem.c
---- linux-3.0.3/drivers/usb/host/xhci-mem.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/host/xhci-mem.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/host/xhci-mem.c linux-3.0.4/drivers/usb/host/xhci-mem.c
+--- linux-3.0.4/drivers/usb/host/xhci-mem.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/host/xhci-mem.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1685,6 +1685,8 @@ static int xhci_check_trb_in_td_math(str
        unsigned int num_tests;
        int i, ret;
@@ -33403,9 +33428,9 @@ diff -urNp linux-3.0.3/drivers/usb/host/xhci-mem.c linux-3.0.3/drivers/usb/host/
        num_tests = ARRAY_SIZE(simple_test_vector);
        for (i = 0; i < num_tests; i++) {
                ret = xhci_test_trb_in_td(xhci,
-diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-hc.h linux-3.0.3/drivers/usb/wusbcore/wa-hc.h
---- linux-3.0.3/drivers/usb/wusbcore/wa-hc.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/wusbcore/wa-hc.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-hc.h linux-3.0.4/drivers/usb/wusbcore/wa-hc.h
+--- linux-3.0.4/drivers/usb/wusbcore/wa-hc.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/wusbcore/wa-hc.h   2011-08-23 21:47:56.000000000 -0400
 @@ -192,7 +192,7 @@ struct wahc {
        struct list_head xfer_delayed_list;
        spinlock_t xfer_list_lock;
@@ -33424,9 +33449,9 @@ diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-hc.h linux-3.0.3/drivers/usb/wusb
  }
  
  /**
-diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c
---- linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c
+--- linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/usb/wusbcore/wa-xfer.c 2011-08-23 21:47:56.000000000 -0400
 @@ -294,7 +294,7 @@ out:
   */
  static void wa_xfer_id_init(struct wa_xfer *xfer)
@@ -33436,9 +33461,9 @@ diff -urNp linux-3.0.3/drivers/usb/wusbcore/wa-xfer.c linux-3.0.3/drivers/usb/wu
  }
  
  /*
-diff -urNp linux-3.0.3/drivers/vhost/vhost.c linux-3.0.3/drivers/vhost/vhost.c
---- linux-3.0.3/drivers/vhost/vhost.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/vhost/vhost.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/vhost/vhost.c linux-3.0.4/drivers/vhost/vhost.c
+--- linux-3.0.4/drivers/vhost/vhost.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/vhost/vhost.c  2011-08-23 21:47:56.000000000 -0400
 @@ -589,7 +589,7 @@ static int init_used(struct vhost_virtqu
        return get_user(vq->last_used_idx, &used->idx);
  }
@@ -33448,9 +33473,9 @@ diff -urNp linux-3.0.3/drivers/vhost/vhost.c linux-3.0.3/drivers/vhost/vhost.c
  {
        struct file *eventfp, *filep = NULL,
                    *pollstart = NULL, *pollstop = NULL;
-diff -urNp linux-3.0.3/drivers/video/fbcmap.c linux-3.0.3/drivers/video/fbcmap.c
---- linux-3.0.3/drivers/video/fbcmap.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/fbcmap.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/fbcmap.c linux-3.0.4/drivers/video/fbcmap.c
+--- linux-3.0.4/drivers/video/fbcmap.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/fbcmap.c 2011-08-23 21:47:56.000000000 -0400
 @@ -285,8 +285,7 @@ int fb_set_user_cmap(struct fb_cmap_user
                rc = -ENODEV;
                goto out;
@@ -33461,9 +33486,9 @@ diff -urNp linux-3.0.3/drivers/video/fbcmap.c linux-3.0.3/drivers/video/fbcmap.c
                rc = -EINVAL;
                goto out1;
        }
-diff -urNp linux-3.0.3/drivers/video/fbmem.c linux-3.0.3/drivers/video/fbmem.c
---- linux-3.0.3/drivers/video/fbmem.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/fbmem.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/fbmem.c linux-3.0.4/drivers/video/fbmem.c
+--- linux-3.0.4/drivers/video/fbmem.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/fbmem.c  2011-08-23 21:48:14.000000000 -0400
 @@ -428,7 +428,7 @@ static void fb_do_show_logo(struct fb_in
                        image->dx += image->width + 8;
                }
@@ -33509,9 +33534,9 @@ diff -urNp linux-3.0.3/drivers/video/fbmem.c linux-3.0.3/drivers/video/fbmem.c
                        return -EINVAL;
                if (!registered_fb[con2fb.framebuffer])
                        request_module("fb%d", con2fb.framebuffer);
-diff -urNp linux-3.0.3/drivers/video/i810/i810_accel.c linux-3.0.3/drivers/video/i810/i810_accel.c
---- linux-3.0.3/drivers/video/i810/i810_accel.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/i810/i810_accel.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/i810/i810_accel.c linux-3.0.4/drivers/video/i810/i810_accel.c
+--- linux-3.0.4/drivers/video/i810/i810_accel.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/i810/i810_accel.c        2011-08-23 21:47:56.000000000 -0400
 @@ -73,6 +73,7 @@ static inline int wait_for_space(struct 
                }
        }
@@ -33520,9 +33545,2737 @@ diff -urNp linux-3.0.3/drivers/video/i810/i810_accel.c linux-3.0.3/drivers/video
        i810_report_error(mmio); 
        par->dev_flags |= LOCKUP;
        info->pixmap.scan_align = 1;
-diff -urNp linux-3.0.3/drivers/video/udlfb.c linux-3.0.3/drivers/video/udlfb.c
---- linux-3.0.3/drivers/video/udlfb.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/udlfb.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm
+--- linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/logo/logo_linux_clut224.ppm      2011-08-29 23:49:40.000000000 -0400
+@@ -1,1604 +1,1123 @@
+ P3
+-# Standard 224-color Linux logo
+ 80 80
+ 255
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6   6   6   6  10  10  10  10  10  10
+- 10  10  10   6   6   6   6   6   6   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  10  10  10  14  14  14
+- 22  22  22  26  26  26  30  30  30  34  34  34
+- 30  30  30  30  30  30  26  26  26  18  18  18
+- 14  14  14  10  10  10   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  26  26  26  42  42  42
+- 54  54  54  66  66  66  78  78  78  78  78  78
+- 78  78  78  74  74  74  66  66  66  54  54  54
+- 42  42  42  26  26  26  18  18  18  10  10  10
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 22  22  22  42  42  42  66  66  66  86  86  86
+- 66  66  66  38  38  38  38  38  38  22  22  22
+- 26  26  26  34  34  34  54  54  54  66  66  66
+- 86  86  86  70  70  70  46  46  46  26  26  26
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  26  26  26
+- 50  50  50  82  82  82  58  58  58   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  54  54  54  86  86  86  66  66  66
+- 38  38  38  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  22  22  22  50  50  50
+- 78  78  78  34  34  34   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   6   6   6  70  70  70
+- 78  78  78  46  46  46  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  42  42  42  82  82  82
+- 26  26  26   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  14  14  14
+- 46  46  46  34  34  34   6   6   6   2   2   6
+- 42  42  42  78  78  78  42  42  42  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  30  30  30  66  66  66  58  58  58
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  26  26  26
+- 86  86  86 101 101 101  46  46  46  10  10  10
+-  2   2   6  58  58  58  70  70  70  34  34  34
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  42  42  42  86  86  86  10  10  10
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  30  30  30
+- 94  94  94  94  94  94  58  58  58  26  26  26
+-  2   2   6   6   6   6  78  78  78  54  54  54
+- 22  22  22   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  62  62  62  62  62  62   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  26  26  26
+- 54  54  54  38  38  38  18  18  18  10  10  10
+-  2   2   6   2   2   6  34  34  34  82  82  82
+- 38  38  38  14  14  14   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 30  30  30  78  78  78  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 10  10  10   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  78  78  78
+- 50  50  50  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  14  14  14   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  54  54  54
+- 66  66  66  26  26  26   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  82  82  82   2   2   6   2   2   6
+-  2   2   6   6   6   6  10  10  10   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 14  14  14  10  10  10   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  18  18  18
+- 82  82  82  34  34  34  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6   2   2   6
+-  6   6   6   6   6   6  22  22  22  34  34  34
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  34  34  34
+- 10  10  10  50  50  50  22  22  22   2   2   6
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 86  86  86  42  42  42  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6   2   2   6
+- 38  38  38 116 116 116  94  94  94  22  22  22
+- 22  22  22   2   2   6   2   2   6   2   2   6
+- 14  14  14  86  86  86 138 138 138 162 162 162
+-154 154 154  38  38  38  26  26  26   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 86  86  86  46  46  46  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6  14  14  14
+-134 134 134 198 198 198 195 195 195 116 116 116
+- 10  10  10   2   2   6   2   2   6   6   6   6
+-101  98  89 187 187 187 210 210 210 218 218 218
+-214 214 214 134 134 134  14  14  14   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 86  86  86  50  50  50  18  18  18   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  86  86  86   2   2   6  54  54  54
+-218 218 218 195 195 195 226 226 226 246 246 246
+- 58  58  58   2   2   6   2   2   6  30  30  30
+-210 210 210 253 253 253 174 174 174 123 123 123
+-221 221 221 234 234 234  74  74  74   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 46  46  46  82  82  82   2   2   6 106 106 106
+-170 170 170  26  26  26  86  86  86 226 226 226
+-123 123 123  10  10  10  14  14  14  46  46  46
+-231 231 231 190 190 190   6   6   6  70  70  70
+- 90  90  90 238 238 238 158 158 158   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   1   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  86  86  86   6   6   6 116 116 116
+-106 106 106   6   6   6  70  70  70 149 149 149
+-128 128 128  18  18  18  38  38  38  54  54  54
+-221 221 221 106 106 106   2   2   6  14  14  14
+- 46  46  46 190 190 190 198 198 198   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  62  62  62  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   0
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  94  94  94  14  14  14 101 101 101
+-128 128 128   2   2   6  18  18  18 116 116 116
+-118  98  46 121  92   8 121  92   8  98  78  10
+-162 162 162 106 106 106   2   2   6   2   2   6
+-  2   2   6 195 195 195 195 195 195   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  62  62  62  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   1   0   0   1
+-  0   0   1   0   0   0   0   0   1   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  90  90  90  14  14  14  58  58  58
+-210 210 210  26  26  26  54  38   6 154 114  10
+-226 170  11 236 186  11 225 175  15 184 144  12
+-215 174  15 175 146  61  37  26   9   2   2   6
+- 70  70  70 246 246 246 138 138 138   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 70  70  70  66  66  66  26  26  26   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  14  14  14  10  10  10
+-195 195 195 188 164 115 192 133   9 225 175  15
+-239 182  13 234 190  10 232 195  16 232 200  30
+-245 207  45 241 208  19 232 195  16 184 144  12
+-218 194 134 211 206 186  42  42  42   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 50  50  50  74  74  74  30  30  30   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  86  86  86  14  14  14   2   2   6
+-121  87  25 192 133   9 219 162  10 239 182  13
+-236 186  11 232 195  16 241 208  19 244 214  54
+-246 218  60 246 218  38 246 215  20 241 208  19
+-241 208  19 226 184  13 121  87  25   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 50  50  50  82  82  82  34  34  34  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  82  82  82  30  30  30  61  42   6
+-180 123   7 206 145  10 230 174  11 239 182  13
+-234 190  10 238 202  15 241 208  19 246 218  74
+-246 218  38 246 215  20 246 215  20 246 215  20
+-226 184  13 215 174  15 184 144  12   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 26  26  26  94  94  94  42  42  42  14  14  14
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78  50  50  50 104  69   6
+-192 133   9 216 158  10 236 178  12 236 186  11
+-232 195  16 241 208  19 244 214  54 245 215  43
+-246 215  20 246 215  20 241 208  19 198 155  10
+-200 144  11 216 158  10 156 118  10   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  90  90  90  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78  46  46  46  22  22  22
+-137  92   6 210 162  10 239 182  13 238 190  10
+-238 202  15 241 208  19 246 215  20 246 215  20
+-241 208  19 203 166  17 185 133  11 210 150  10
+-216 158  10 210 150  10 102  78  10   2   2   6
+-  6   6   6  54  54  54  14  14  14   2   2   6
+-  2   2   6  62  62  62  74  74  74  30  30  30
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 34  34  34  78  78  78  50  50  50   6   6   6
+- 94  70  30 139 102  15 190 146  13 226 184  13
+-232 200  30 232 195  16 215 174  15 190 146  13
+-168 122  10 192 133   9 210 150  10 213 154  11
+-202 150  34 182 157 106 101  98  89   2   2   6
+-  2   2   6  78  78  78 116 116 116  58  58  58
+-  2   2   6  22  22  22  90  90  90  46  46  46
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  86  86  86  50  50  50   6   6   6
+-128 128 128 174 154 114 156 107  11 168 122  10
+-198 155  10 184 144  12 197 138  11 200 144  11
+-206 145  10 206 145  10 197 138  11 188 164 115
+-195 195 195 198 198 198 174 174 174  14  14  14
+-  2   2   6  22  22  22 116 116 116 116 116 116
+- 22  22  22   2   2   6  74  74  74  70  70  70
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 101 101 101  26  26  26  10  10  10
+-138 138 138 190 190 190 174 154 114 156 107  11
+-197 138  11 200 144  11 197 138  11 192 133   9
+-180 123   7 190 142  34 190 178 144 187 187 187
+-202 202 202 221 221 221 214 214 214  66  66  66
+-  2   2   6   2   2   6  50  50  50  62  62  62
+-  6   6   6   2   2   6  10  10  10  90  90  90
+- 50  50  50  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  34  34  34
+- 74  74  74  74  74  74   2   2   6   6   6   6
+-144 144 144 198 198 198 190 190 190 178 166 146
+-154 121  60 156 107  11 156 107  11 168 124  44
+-174 154 114 187 187 187 190 190 190 210 210 210
+-246 246 246 253 253 253 253 253 253 182 182 182
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  62  62  62
+- 74  74  74  34  34  34  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0  10  10  10  22  22  22  54  54  54
+- 94  94  94  18  18  18   2   2   6  46  46  46
+-234 234 234 221 221 221 190 190 190 190 190 190
+-190 190 190 187 187 187 187 187 187 190 190 190
+-190 190 190 195 195 195 214 214 214 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+- 82  82  82   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  14  14  14
+- 86  86  86  54  54  54  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  46  46  46  90  90  90
+- 46  46  46  18  18  18   6   6   6 182 182 182
+-253 253 253 246 246 246 206 206 206 190 190 190
+-190 190 190 190 190 190 190 190 190 190 190 190
+-206 206 206 231 231 231 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-202 202 202  14  14  14   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 42  42  42  86  86  86  42  42  42  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 14  14  14  38  38  38  74  74  74  66  66  66
+-  2   2   6   6   6   6  90  90  90 250 250 250
+-253 253 253 253 253 253 238 238 238 198 198 198
+-190 190 190 190 190 190 195 195 195 221 221 221
+-246 246 246 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253  82  82  82   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  78  78  78  70  70  70  34  34  34
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 34  34  34  66  66  66  78  78  78   6   6   6
+-  2   2   6  18  18  18 218 218 218 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-226 226 226 231 231 231 246 246 246 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 178 178 178   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  18  18  18  90  90  90  62  62  62
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  26  26  26
+- 58  58  58  90  90  90  18  18  18   2   2   6
+-  2   2   6 110 110 110 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 231 231 231  18  18  18   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  94  94  94
+- 54  54  54  26  26  26  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  22  22  22  50  50  50
+- 90  90  90  26  26  26   2   2   6   2   2   6
+- 14  14  14 195 195 195 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 242 242 242  54  54  54   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+- 86  86  86  50  50  50  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  38  38  38  82  82  82
+- 34  34  34   2   2   6   2   2   6   2   2   6
+- 42  42  42 195 195 195 246 246 246 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 242 242 242 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 246 246 246 238 238 238
+-226 226 226 231 231 231 101 101 101   6   6   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 38  38  38  82  82  82  42  42  42  14  14  14
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  26  26  26  62  62  62  66  66  66
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 70  70  70 170 170 170 206 206 206 234 234 234
+-246 246 246 250 250 250 250 250 250 238 238 238
+-226 226 226 231 231 231 238 238 238 250 250 250
+-250 250 250 250 250 250 246 246 246 231 231 231
+-214 214 214 206 206 206 202 202 202 202 202 202
+-198 198 198 202 202 202 182 182 182  18  18  18
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  62  62  62  66  66  66  30  30  30
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  42  42  42  82  82  82  18  18  18
+-  2   2   6   2   2   6   2   2   6  10  10  10
+- 94  94  94 182 182 182 218 218 218 242 242 242
+-250 250 250 253 253 253 253 253 253 250 250 250
+-234 234 234 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-238 238 238 226 226 226 210 210 210 202 202 202
+-195 195 195 195 195 195 210 210 210 158 158 158
+-  6   6   6  14  14  14  50  50  50  14  14  14
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  86  86  86  46  46  46
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  54  54  54  70  70  70   2   2   6
+-  2   2   6  10  10  10   2   2   6  22  22  22
+-166 166 166 231 231 231 250 250 250 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 246 246
+-231 231 231 206 206 206 198 198 198 226 226 226
+- 94  94  94   2   2   6   6   6   6  38  38  38
+- 30  30  30   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  62  62  62  66  66  66
+- 26  26  26  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  74  74  74  50  50  50   2   2   6
+- 26  26  26  26  26  26   2   2   6 106 106 106
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 246 246 246 218 218 218 202 202 202
+-210 210 210  14  14  14   2   2   6   2   2   6
+- 30  30  30  22  22  22   2   2   6   2   2   6
+-  2   2   6   2   2   6  18  18  18  86  86  86
+- 42  42  42  14  14  14   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 42  42  42  90  90  90  22  22  22   2   2   6
+- 42  42  42   2   2   6  18  18  18 218 218 218
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 250 250 250 221 221 221
+-218 218 218 101 101 101   2   2   6  14  14  14
+- 18  18  18  38  38  38  10  10  10   2   2   6
+-  2   2   6   2   2   6   2   2   6  78  78  78
+- 58  58  58  22  22  22   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 54  54  54  82  82  82   2   2   6  26  26  26
+- 22  22  22   2   2   6 123 123 123 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-238 238 238 198 198 198   6   6   6  38  38  38
+- 58  58  58  26  26  26  38  38  38   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+- 78  78  78  30  30  30  10  10  10   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0  10  10  10  30  30  30
+- 74  74  74  58  58  58   2   2   6  42  42  42
+-  2   2   6  22  22  22 231 231 231 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 246 246 246  46  46  46  38  38  38
+- 42  42  42  14  14  14  38  38  38  14  14  14
+-  2   2   6   2   2   6   2   2   6   6   6   6
+- 86  86  86  46  46  46  14  14  14   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  42  42  42
+- 90  90  90  18  18  18  18  18  18  26  26  26
+-  2   2   6 116 116 116 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 250 250 250 238 238 238
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253  94  94  94   6   6   6
+-  2   2   6   2   2   6  10  10  10  34  34  34
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 74  74  74  58  58  58  22  22  22   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0  10  10  10  26  26  26  66  66  66
+- 82  82  82   2   2   6  38  38  38   6   6   6
+- 14  14  14 210 210 210 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 246 246 246 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 144 144 144   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 42  42  42  74  74  74  30  30  30  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  42  42  42  90  90  90
+- 26  26  26   6   6   6  42  42  42   2   2   6
+- 74  74  74 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 242 242 242 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 182 182 182   2   2   6
+-  2   2   6   2   2   6   2   2   6  46  46  46
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 10  10  10  86  86  86  38  38  38  10  10  10
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 10  10  10  26  26  26  66  66  66  82  82  82
+-  2   2   6  22  22  22  18  18  18   2   2   6
+-149 149 149 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 206 206 206   2   2   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  86  86  86  46  46  46  14  14  14
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 18  18  18  46  46  46  86  86  86  18  18  18
+-  2   2   6  34  34  34  10  10  10   6   6   6
+-210 210 210 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 221 221 221   6   6   6
+-  2   2   6   2   2   6   6   6   6  30  30  30
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  82  82  82  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 26  26  26  66  66  66  62  62  62   2   2   6
+-  2   2   6  38  38  38  10  10  10  26  26  26
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 238 238 238
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231   6   6   6
+-  2   2   6   2   2   6  10  10  10  30  30  30
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  58  58  58  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 38  38  38  78  78  78   6   6   6   2   2   6
+-  2   2   6  46  46  46  14  14  14  42  42  42
+-246 246 246 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234  10  10  10
+-  2   2   6   2   2   6  22  22  22  14  14  14
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  62  62  62  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50  74  74  74   2   2   6   2   2   6
+- 14  14  14  70  70  70  34  34  34  62  62  62
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234  14  14  14
+-  2   2   6   2   2   6  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  62  62  62  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 54  54  54  62  62  62   2   2   6   2   2   6
+-  2   2   6  30  30  30  46  46  46  70  70  70
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 226 226 226  10  10  10
+-  2   2   6   6   6   6  30  30  30   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6  66  66  66  58  58  58  22  22  22
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 58  58  58  62  62  62   2   2   6   2   2   6
+-  2   2   6   2   2   6  30  30  30  78  78  78
+-250 250 250 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 206 206 206   2   2   6
+- 22  22  22  34  34  34  18  14   6  22  22  22
+- 26  26  26  18  18  18   6   6   6   2   2   6
+-  2   2   6  82  82  82  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  26  26  26
+- 62  62  62 106 106 106  74  54  14 185 133  11
+-210 162  10 121  92   8   6   6   6  62  62  62
+-238 238 238 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 246 246 246
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 158 158 158  18  18  18
+- 14  14  14   2   2   6   2   2   6   2   2   6
+-  6   6   6  18  18  18  66  66  66  38  38  38
+-  6   6   6  94  94  94  50  50  50  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 10  10  10  10  10  10  18  18  18  38  38  38
+- 78  78  78 142 134 106 216 158  10 242 186  14
+-246 190  14 246 190  14 156 118  10  10  10  10
+- 90  90  90 238 238 238 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 246 230 190
+-238 204  91 238 204  91 181 142  44  37  26   9
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  38  38  38  46  46  46
+- 26  26  26 106 106 106  54  54  54  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  22  22  22
+- 30  30  30  38  38  38  50  50  50  70  70  70
+-106 106 106 190 142  34 226 170  11 242 186  14
+-246 190  14 246 190  14 246 190  14 154 114  10
+-  6   6   6  74  74  74 226 226 226 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 231 231 231 250 250 250
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 228 184  62
+-241 196  14 241 208  19 232 195  16  38  30  10
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  30  30  30  26  26  26
+-203 166  17 154 142  90  66  66  66  26  26  26
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  38  38  38  58  58  58
+- 78  78  78  86  86  86 101 101 101 123 123 123
+-175 146  61 210 150  10 234 174  13 246 186  14
+-246 190  14 246 190  14 246 190  14 238 190  10
+-102  78  10   2   2   6  46  46  46 198 198 198
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 234 234 234 242 242 242
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 224 178  62
+-242 186  14 241 196  14 210 166  10  22  18   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   6   6   6 121  92   8
+-238 202  15 232 195  16  82  82  82  34  34  34
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+- 14  14  14  38  38  38  70  70  70 154 122  46
+-190 142  34 200 144  11 197 138  11 197 138  11
+-213 154  11 226 170  11 242 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-225 175  15  46  32   6   2   2   6  22  22  22
+-158 158 158 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 242 242 242 224 178  62
+-239 182  13 236 186  11 213 154  11  46  32   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  61  42   6 225 175  15
+-238 190  10 236 186  11 112 100  78  42  42  42
+- 14  14  14   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 22  22  22  54  54  54 154 122  46 213 154  11
+-226 170  11 230 174  11 226 170  11 226 170  11
+-236 178  12 242 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-241 196  14 184 144  12  10  10  10   2   2   6
+-  6   6   6 116 116 116 242 242 242 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 231 231 231 198 198 198 214 170  54
+-236 178  12 236 178  12 210 150  10 137  92   6
+- 18  14   6   2   2   6   2   2   6   2   2   6
+-  6   6   6  70  47   6 200 144  11 236 178  12
+-239 182  13 239 182  13 124 112  88  58  58  58
+- 22  22  22   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  70  70  70 180 133  36 226 170  11
+-239 182  13 242 186  14 242 186  14 246 186  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 232 195  16  98  70   6   2   2   6
+-  2   2   6   2   2   6  66  66  66 221 221 221
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 206 206 206 198 198 198 214 166  58
+-230 174  11 230 174  11 216 158  10 192 133   9
+-163 110   8 116  81   8 102  78  10 116  81   8
+-167 114   7 197 138  11 226 170  11 239 182  13
+-242 186  14 242 186  14 162 146  94  78  78  78
+- 34  34  34  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 30  30  30  78  78  78 190 142  34 226 170  11
+-239 182  13 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 241 196  14 203 166  17  22  18   6
+-  2   2   6   2   2   6   2   2   6  38  38  38
+-218 218 218 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 206 206 206 198 198 198 202 162  69
+-226 170  11 236 178  12 224 166  10 210 150  10
+-200 144  11 197 138  11 192 133   9 197 138  11
+-210 150  10 226 170  11 242 186  14 246 190  14
+-246 190  14 246 186  14 225 175  15 124 112  88
+- 62  62  62  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78 174 135  50 224 166  10
+-239 182  13 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 241 196  14 139 102  15
+-  2   2   6   2   2   6   2   2   6   2   2   6
+- 78  78  78 250 250 250 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-250 250 250 214 214 214 198 198 198 190 150  46
+-219 162  10 236 178  12 234 174  13 224 166  10
+-216 158  10 213 154  11 213 154  11 216 158  10
+-226 170  11 239 182  13 246 190  14 246 190  14
+-246 190  14 246 190  14 242 186  14 206 162  42
+-101 101 101  58  58  58  30  30  30  14  14  14
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  74  74  74 174 135  50 216 158  10
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 241 196  14 226 184  13
+- 61  42   6   2   2   6   2   2   6   2   2   6
+- 22  22  22 238 238 238 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 226 226 226 187 187 187 180 133  36
+-216 158  10 236 178  12 239 182  13 236 178  12
+-230 174  11 226 170  11 226 170  11 230 174  11
+-236 178  12 242 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 186  14 239 182  13
+-206 162  42 106 106 106  66  66  66  34  34  34
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 26  26  26  70  70  70 163 133  67 213 154  11
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 241 196  14
+-190 146  13  18  14   6   2   2   6   2   2   6
+- 46  46  46 246 246 246 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 221 221 221  86  86  86 156 107  11
+-216 158  10 236 178  12 242 186  14 246 186  14
+-242 186  14 239 182  13 239 182  13 242 186  14
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-242 186  14 225 175  15 142 122  72  66  66  66
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 26  26  26  70  70  70 163 133  67 210 150  10
+-236 178  12 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-232 195  16 121  92   8  34  34  34 106 106 106
+-221 221 221 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-242 242 242  82  82  82  18  14   6 163 110   8
+-216 158  10 236 178  12 242 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 242 186  14 163 133  67
+- 46  46  46  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  10  10  10
+- 30  30  30  78  78  78 163 133  67 210 150  10
+-236 178  12 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-241 196  14 215 174  15 190 178 144 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 218 218 218
+- 58  58  58   2   2   6  22  18   6 167 114   7
+-216 158  10 236 178  12 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 186  14 242 186  14 190 150  46
+- 54  54  54  22  22  22   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 38  38  38  86  86  86 180 133  36 213 154  11
+-236 178  12 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 232 195  16 190 146  13 214 214 214
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 250 250 250 170 170 170  26  26  26
+-  2   2   6   2   2   6  37  26   9 163 110   8
+-219 162  10 239 182  13 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 236 178  12 224 166  10 142 122  72
+- 46  46  46  18  18  18   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 109 106  95 192 133   9 224 166  10
+-242 186  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-242 186  14 226 184  13 210 162  10 142 110  46
+-226 226 226 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-253 253 253 253 253 253 253 253 253 253 253 253
+-198 198 198  66  66  66   2   2   6   2   2   6
+-  2   2   6   2   2   6  50  34   6 156 107  11
+-219 162  10 239 182  13 246 186  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 242 186  14
+-234 174  13 213 154  11 154 122  46  66  66  66
+- 30  30  30  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 58  58  58 154 121  60 206 145  10 234 174  13
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 236 178  12 210 162  10 163 110   8
+- 61  42   6 138 138 138 218 218 218 250 250 250
+-253 253 253 253 253 253 253 253 253 250 250 250
+-242 242 242 210 210 210 144 144 144  66  66  66
+-  6   6   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6  61  42   6 163 110   8
+-216 158  10 236 178  12 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 239 182  13 230 174  11 216 158  10
+-190 142  34 124 112  88  70  70  70  38  38  38
+- 18  18  18   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  22  22  22
+- 62  62  62 168 124  44 206 145  10 224 166  10
+-236 178  12 239 182  13 242 186  14 242 186  14
+-246 186  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 236 178  12 216 158  10 175 118   6
+- 80  54   7   2   2   6   6   6   6  30  30  30
+- 54  54  54  62  62  62  50  50  50  38  38  38
+- 14  14  14   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  80  54   7 167 114   7
+-213 154  11 236 178  12 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 190  14 242 186  14 239 182  13 239 182  13
+-230 174  11 210 150  10 174 135  50 124 112  88
+- 82  82  82  54  54  54  34  34  34  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  18  18  18
+- 50  50  50 158 118  36 192 133   9 200 144  11
+-216 158  10 219 162  10 224 166  10 226 170  11
+-230 174  11 236 178  12 239 182  13 239 182  13
+-242 186  14 246 186  14 246 190  14 246 190  14
+-246 190  14 246 190  14 246 190  14 246 190  14
+-246 186  14 230 174  11 210 150  10 163 110   8
+-104  69   6  10  10  10   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  91  60   6 167 114   7
+-206 145  10 230 174  11 242 186  14 246 190  14
+-246 190  14 246 190  14 246 186  14 242 186  14
+-239 182  13 230 174  11 224 166  10 213 154  11
+-180 133  36 124 112  88  86  86  86  58  58  58
+- 38  38  38  22  22  22  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0  14  14  14
+- 34  34  34  70  70  70 138 110  50 158 118  36
+-167 114   7 180 123   7 192 133   9 197 138  11
+-200 144  11 206 145  10 213 154  11 219 162  10
+-224 166  10 230 174  11 239 182  13 242 186  14
+-246 186  14 246 186  14 246 186  14 246 186  14
+-239 182  13 216 158  10 185 133  11 152  99   6
+-104  69   6  18  14   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   2   2   6   2   2   6   2   2   6
+-  2   2   6   6   6   6  80  54   7 152  99   6
+-192 133   9 219 162  10 236 178  12 239 182  13
+-246 186  14 242 186  14 239 182  13 236 178  12
+-224 166  10 206 145  10 192 133   9 154 121  60
+- 94  94  94  62  62  62  42  42  42  22  22  22
+- 14  14  14   6   6   6   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 18  18  18  34  34  34  58  58  58  78  78  78
+-101  98  89 124 112  88 142 110  46 156 107  11
+-163 110   8 167 114   7 175 118   6 180 123   7
+-185 133  11 197 138  11 210 150  10 219 162  10
+-226 170  11 236 178  12 236 178  12 234 174  13
+-219 162  10 197 138  11 163 110   8 130  83   6
+- 91  60   6  10  10  10   2   2   6   2   2   6
+- 18  18  18  38  38  38  38  38  38  38  38  38
+- 38  38  38  38  38  38  38  38  38  38  38  38
+- 38  38  38  38  38  38  26  26  26   2   2   6
+-  2   2   6   6   6   6  70  47   6 137  92   6
+-175 118   6 200 144  11 219 162  10 230 174  11
+-234 174  13 230 174  11 219 162  10 210 150  10
+-192 133   9 163 110   8 124 112  88  82  82  82
+- 50  50  50  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  14  14  14  22  22  22  34  34  34
+- 42  42  42  58  58  58  74  74  74  86  86  86
+-101  98  89 122 102  70 130  98  46 121  87  25
+-137  92   6 152  99   6 163 110   8 180 123   7
+-185 133  11 197 138  11 206 145  10 200 144  11
+-180 123   7 156 107  11 130  83   6 104  69   6
+- 50  34   6  54  54  54 110 110 110 101  98  89
+- 86  86  86  82  82  82  78  78  78  78  78  78
+- 78  78  78  78  78  78  78  78  78  78  78  78
+- 78  78  78  82  82  82  86  86  86  94  94  94
+-106 106 106 101 101 101  86  66  34 124  80   6
+-156 107  11 180 123   7 192 133   9 200 144  11
+-206 145  10 200 144  11 192 133   9 175 118   6
+-139 102  15 109 106  95  70  70  70  42  42  42
+- 22  22  22  10  10  10   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   6   6   6  10  10  10
+- 14  14  14  22  22  22  30  30  30  38  38  38
+- 50  50  50  62  62  62  74  74  74  90  90  90
+-101  98  89 112 100  78 121  87  25 124  80   6
+-137  92   6 152  99   6 152  99   6 152  99   6
+-138  86   6 124  80   6  98  70   6  86  66  30
+-101  98  89  82  82  82  58  58  58  46  46  46
+- 38  38  38  34  34  34  34  34  34  34  34  34
+- 34  34  34  34  34  34  34  34  34  34  34  34
+- 34  34  34  34  34  34  38  38  38  42  42  42
+- 54  54  54  82  82  82  94  86  76  91  60   6
+-134  86   6 156 107  11 167 114   7 175 118   6
+-175 118   6 167 114   7 152  99   6 121  87  25
+-101  98  89  62  62  62  34  34  34  18  18  18
+-  6   6   6   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6   6   6   6  10  10  10
+- 18  18  18  22  22  22  30  30  30  42  42  42
+- 50  50  50  66  66  66  86  86  86 101  98  89
+-106  86  58  98  70   6 104  69   6 104  69   6
+-104  69   6  91  60   6  82  62  34  90  90  90
+- 62  62  62  38  38  38  22  22  22  14  14  14
+- 10  10  10  10  10  10  10  10  10  10  10  10
+- 10  10  10  10  10  10   6   6   6  10  10  10
+- 10  10  10  10  10  10  10  10  10  14  14  14
+- 22  22  22  42  42  42  70  70  70  89  81  66
+- 80  54   7 104  69   6 124  80   6 137  92   6
+-134  86   6 116  81   8 100  82  52  86  86  86
+- 58  58  58  30  30  30  14  14  14   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  10  10  10  14  14  14
+- 18  18  18  26  26  26  38  38  38  54  54  54
+- 70  70  70  86  86  86  94  86  76  89  81  66
+- 89  81  66  86  86  86  74  74  74  50  50  50
+- 30  30  30  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6  18  18  18  34  34  34  58  58  58
+- 82  82  82  89  81  66  89  81  66  89  81  66
+- 94  86  66  94  86  76  74  74  74  50  50  50
+- 26  26  26  14  14  14   6   6   6   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  6   6   6   6   6   6  14  14  14  18  18  18
+- 30  30  30  38  38  38  46  46  46  54  54  54
+- 50  50  50  42  42  42  30  30  30  18  18  18
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   6   6   6  14  14  14  26  26  26
+- 38  38  38  50  50  50  58  58  58  58  58  58
+- 54  54  54  42  42  42  30  30  30  18  18  18
+- 10  10  10   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+-  6   6   6  10  10  10  14  14  14  18  18  18
+- 18  18  18  14  14  14  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   6   6   6
+- 14  14  14  18  18  18  22  22  22  22  22  22
+- 18  18  18  14  14  14  10  10  10   6   6   6
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
+-  0   0   0   0   0   0   0   0   0   0   0   0
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  3 3 3  0 0 0  0 0 0
++0 0 0  0 0 0  0 0 0  0 0 0  3 3 3  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  1 1 1  0 0 0
++0 0 0  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  2 1 0  2 1 0  3 2 2
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  2 2 2  0 0 0  3 4 3  26 28 28
++37 38 37  37 38 37  14 17 19  2 2 2  0 0 0  2 2 2
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  3 3 3  0 0 0  1 1 1  6 6 6
++2 2 2  0 0 0  3 3 3  4 4 4  4 4 4  4 4 4
++4 4 5  3 3 3  1 0 0  0 0 0  1 0 0  0 0 0
++1 1 1  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++2 2 2  0 0 0  0 0 0  14 17 19  60 74 84  137 136 137
++153 152 153  137 136 137  125 124 125  60 73 81  6 6 6  3 1 0
++0 0 0  3 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  0 0 0  4 4 4  41 54 63  125 124 125
++60 73 81  6 6 6  4 0 0  3 3 3  4 4 4  4 4 4
++4 4 4  0 0 0  6 9 11  41 54 63  41 65 82  22 30 35
++2 2 2  2 1 0  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  2 2 2  0 0 0
++4 0 0  6 6 6  41 54 63  137 136 137  174 174 174  167 166 167
++165 164 165  165 164 165  163 162 163  163 162 163  125 124 125  41 54 63
++1 1 1  0 0 0  0 0 0  3 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  5 5 5
++3 3 3  2 0 0  4 0 0  60 73 81  156 155 156  167 166 167
++163 162 163  85 115 134  5 7 8  0 0 0  4 4 4  5 5 5
++0 0 0  2 5 5  55 98 126  90 154 193  90 154 193  72 125 159
++37 51 59  2 0 0  1 1 1  4 5 5  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 4 4  1 1 1  0 0 0  3 3 3
++37 38 37  125 124 125  163 162 163  174 174 174  158 157 158  158 157 158
++156 155 156  156 155 156  158 157 158  165 164 165  174 174 174  166 165 166
++125 124 125  16 19 21  1 0 0  0 0 0  0 0 0  4 4 4
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  1 1 1
++0 0 0  0 0 0  37 38 37  153 152 153  174 174 174  158 157 158
++174 174 174  163 162 163  37 38 37  4 3 3  4 0 0  1 1 1
++0 0 0  22 40 52  101 161 196  101 161 196  90 154 193  101 161 196
++64 123 161  14 17 19  0 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++5 5 5  2 2 2  0 0 0  4 0 0  24 26 27  85 115 134
++156 155 156  174 174 174  167 166 167  156 155 156  154 153 154  157 156 157
++156 155 156  156 155 156  155 154 155  153 152 153  158 157 158  167 166 167
++174 174 174  156 155 156  60 74 84  16 19 21  0 0 0  0 0 0
++1 1 1  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  6 6 6  3 3 3  0 0 0  4 0 0
++13 16 17  60 73 81  137 136 137  165 164 165  156 155 156  153 152 153
++174 174 174  177 184 187  60 73 81  3 1 0  0 0 0  1 1 2
++22 30 35  64 123 161  136 185 209  90 154 193  90 154 193  90 154 193
++90 154 193  21 29 34  0 0 0  3 2 2  4 4 5  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  3 3 3
++0 0 0  0 0 0  10 13 16  60 74 84  157 156 157  174 174 174
++174 174 174  158 157 158  153 152 153  154 153 154  156 155 156  155 154 155
++156 155 156  155 154 155  154 153 154  157 156 157  154 153 154  153 152 153
++163 162 163  174 174 174  177 184 187  137 136 137  60 73 81  13 16 17
++4 0 0  0 0 0  3 3 3  5 5 5  4 4 4  4 4 4
++5 5 5  4 4 4  1 1 1  0 0 0  3 3 3  41 54 63
++131 129 131  174 174 174  174 174 174  174 174 174  167 166 167  174 174 174
++190 197 201  137 136 137  24 26 27  4 0 0  16 21 25  50 82 103
++90 154 193  136 185 209  90 154 193  101 161 196  101 161 196  101 161 196
++31 91 132  3 6 7  0 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  2 2 2  0 0 0  4 0 0
++4 0 0  43 57 68  137 136 137  177 184 187  174 174 174  163 162 163
++155 154 155  155 154 155  156 155 156  155 154 155  158 157 158  165 164 165
++167 166 167  166 165 166  163 162 163  157 156 157  155 154 155  155 154 155
++153 152 153  156 155 156  167 166 167  174 174 174  174 174 174  131 129 131
++41 54 63  5 5 5  0 0 0  0 0 0  3 3 3  4 4 4
++1 1 1  0 0 0  1 0 0  26 28 28  125 124 125  174 174 174
++177 184 187  174 174 174  174 174 174  156 155 156  131 129 131  137 136 137
++125 124 125  24 26 27  4 0 0  41 65 82  90 154 193  136 185 209
++136 185 209  101 161 196  53 118 160  37 112 160  90 154 193  34 86 122
++7 12 15  0 0 0  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  3 3 3  0 0 0  0 0 0  5 5 5  37 38 37
++125 124 125  167 166 167  174 174 174  167 166 167  158 157 158  155 154 155
++156 155 156  156 155 156  156 155 156  163 162 163  167 166 167  155 154 155
++137 136 137  153 152 153  156 155 156  165 164 165  163 162 163  156 155 156
++156 155 156  156 155 156  155 154 155  158 157 158  166 165 166  174 174 174
++167 166 167  125 124 125  37 38 37  1 0 0  0 0 0  0 0 0
++0 0 0  24 26 27  60 74 84  158 157 158  174 174 174  174 174 174
++166 165 166  158 157 158  125 124 125  41 54 63  13 16 17  6 6 6
++6 6 6  37 38 37  80 127 157  136 185 209  101 161 196  101 161 196
++90 154 193  28 67 93  6 10 14  13 20 25  13 20 25  6 10 14
++1 1 2  4 3 3  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++1 1 1  1 0 0  4 3 3  37 38 37  60 74 84  153 152 153
++167 166 167  167 166 167  158 157 158  154 153 154  155 154 155  156 155 156
++157 156 157  158 157 158  167 166 167  167 166 167  131 129 131  43 57 68
++26 28 28  37 38 37  60 73 81  131 129 131  165 164 165  166 165 166
++158 157 158  155 154 155  156 155 156  156 155 156  156 155 156  158 157 158
++165 164 165  174 174 174  163 162 163  60 74 84  16 19 21  13 16 17
++60 73 81  131 129 131  174 174 174  174 174 174  167 166 167  165 164 165
++137 136 137  60 73 81  24 26 27  4 0 0  4 0 0  16 19 21
++52 104 138  101 161 196  136 185 209  136 185 209  90 154 193  27 99 146
++13 20 25  4 5 7  2 5 5  4 5 7  1 1 2  0 0 0
++4 4 4  4 4 4  3 3 3  2 2 2  2 2 2  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  3 3 3  0 0 0
++0 0 0  13 16 17  60 73 81  137 136 137  174 174 174  166 165 166
++158 157 158  156 155 156  157 156 157  156 155 156  155 154 155  158 157 158
++167 166 167  174 174 174  153 152 153  60 73 81  16 19 21  4 0 0
++4 0 0  4 0 0  6 6 6  26 28 28  60 74 84  158 157 158
++174 174 174  166 165 166  157 156 157  155 154 155  156 155 156  156 155 156
++155 154 155  158 157 158  167 166 167  167 166 167  131 129 131  125 124 125
++137 136 137  167 166 167  167 166 167  174 174 174  158 157 158  125 124 125
++16 19 21  4 0 0  4 0 0  10 13 16  49 76 92  107 159 188
++136 185 209  136 185 209  90 154 193  26 108 161  22 40 52  6 10 14
++2 3 3  1 1 2  1 1 2  4 4 5  4 4 5  4 4 5
++4 4 5  2 2 1  0 0 0  0 0 0  0 0 0  2 2 2
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  3 3 3  0 0 0  1 0 0  4 0 0
++37 51 59  131 129 131  167 166 167  167 166 167  163 162 163  157 156 157
++157 156 157  155 154 155  153 152 153  157 156 157  167 166 167  174 174 174
++153 152 153  125 124 125  37 38 37  4 0 0  4 0 0  4 0 0
++4 3 3  4 3 3  4 0 0  6 6 6  4 0 0  37 38 37
++125 124 125  174 174 174  174 174 174  165 164 165  156 155 156  154 153 154
++156 155 156  156 155 156  155 154 155  163 162 163  158 157 158  163 162 163
++174 174 174  174 174 174  174 174 174  125 124 125  37 38 37  0 0 0
++4 0 0  6 9 11  41 54 63  90 154 193  136 185 209  146 190 211
++136 185 209  37 112 160  22 40 52  6 10 14  3 6 7  1 1 2
++1 1 2  3 3 3  1 1 2  3 3 3  4 4 4  4 4 4
++2 2 2  2 0 0  16 19 21  37 38 37  24 26 27  0 0 0
++0 0 0  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  5 5 5
++4 4 4  0 0 0  0 0 0  0 0 0  26 28 28  120 125 127
++158 157 158  174 174 174  165 164 165  157 156 157  155 154 155  156 155 156
++153 152 153  153 152 153  167 166 167  174 174 174  174 174 174  125 124 125
++37 38 37  4 0 0  0 0 0  4 0 0  4 3 3  4 4 4
++4 4 4  4 4 4  5 5 5  4 0 0  4 0 0  4 0 0
++4 3 3  43 57 68  137 136 137  174 174 174  174 174 174  165 164 165
++154 153 154  153 152 153  153 152 153  153 152 153  163 162 163  174 174 174
++174 174 174  153 152 153  60 73 81  6 6 6  4 0 0  4 3 3
++32 43 50  80 127 157  136 185 209  146 190 211  146 190 211  90 154 193
++28 67 93  28 67 93  40 71 93  3 6 7  1 1 2  2 5 5
++50 82 103  79 117 143  26 37 45  0 0 0  3 3 3  1 1 1
++0 0 0  41 54 63  137 136 137  174 174 174  153 152 153  60 73 81
++2 0 0  0 0 0
++4 4 4  4 4 4  4 4 4  4 4 4  6 6 6  2 2 2
++0 0 0  2 0 0  24 26 27  60 74 84  153 152 153  174 174 174
++174 174 174  157 156 157  154 153 154  156 155 156  154 153 154  153 152 153
++165 164 165  174 174 174  177 184 187  137 136 137  43 57 68  6 6 6
++4 0 0  2 0 0  3 3 3  5 5 5  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  6 6 6  4 3 3
++4 0 0  4 0 0  24 26 27  60 73 81  153 152 153  174 174 174
++174 174 174  158 157 158  158 157 158  174 174 174  174 174 174  158 157 158
++60 74 84  24 26 27  4 0 0  4 0 0  17 23 27  59 113 148
++136 185 209  191 222 234  146 190 211  136 185 209  31 91 132  7 11 13
++22 40 52  101 161 196  90 154 193  6 9 11  3 4 4  43 95 132
++136 185 209  172 205 220  55 98 126  0 0 0  0 0 0  2 0 0
++26 28 28  153 152 153  177 184 187  167 166 167  177 184 187  165 164 165
++37 38 37  0 0 0
++4 4 4  4 4 4  5 5 5  5 5 5  1 1 1  0 0 0
++13 16 17  60 73 81  137 136 137  174 174 174  174 174 174  165 164 165
++153 152 153  153 152 153  155 154 155  154 153 154  158 157 158  174 174 174
++177 184 187  163 162 163  60 73 81  16 19 21  4 0 0  4 0 0
++4 3 3  4 4 4  5 5 5  5 5 5  4 4 4  5 5 5
++5 5 5  5 5 5  5 5 5  4 4 4  4 4 4  5 5 5
++6 6 6  4 0 0  4 0 0  4 0 0  24 26 27  60 74 84
++166 165 166  174 174 174  177 184 187  165 164 165  125 124 125  24 26 27
++4 0 0  4 0 0  5 5 5  50 82 103  136 185 209  172 205 220
++146 190 211  136 185 209  26 108 161  22 40 52  7 12 15  44 81 103
++71 116 144  28 67 93  37 51 59  41 65 82  100 139 164  101 161 196
++90 154 193  90 154 193  28 67 93  0 0 0  0 0 0  26 28 28
++125 124 125  167 166 167  163 162 163  153 152 153  163 162 163  174 174 174
++85 115 134  4 0 0
++4 4 4  5 5 5  4 4 4  1 0 0  4 0 0  34 47 55
++125 124 125  174 174 174  174 174 174  167 166 167  157 156 157  153 152 153
++155 154 155  155 154 155  158 157 158  166 165 166  167 166 167  154 153 154
++125 124 125  26 28 28  4 0 0  4 0 0  4 0 0  5 5 5
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  1 1 1
++0 0 0  0 0 0  1 1 1  4 4 4  4 4 4  4 4 4
++5 5 5  5 5 5  4 3 3  4 0 0  4 0 0  6 6 6
++37 38 37  131 129 131  137 136 137  37 38 37  0 0 0  4 0 0
++4 5 5  43 61 72  90 154 193  172 205 220  146 190 211  136 185 209
++90 154 193  28 67 93  13 20 25  43 61 72  71 116 144  44 81 103
++2 5 5  7 11 13  59 113 148  101 161 196  90 154 193  28 67 93
++13 20 25  6 10 14  0 0 0  13 16 17  60 73 81  137 136 137
++166 165 166  158 157 158  156 155 156  154 153 154  167 166 167  174 174 174
++60 73 81  4 0 0
++4 4 4  4 4 4  0 0 0  3 3 3  60 74 84  174 174 174
++174 174 174  167 166 167  163 162 163  155 154 155  157 156 157  155 154 155
++156 155 156  163 162 163  167 166 167  158 157 158  125 124 125  37 38 37
++4 3 3  4 0 0  4 0 0  6 6 6  6 6 6  5 5 5
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  2 3 3
++10 13 16  7 11 13  1 0 0  0 0 0  2 2 1  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  4 0 0
++4 0 0  7 11 13  13 16 17  4 0 0  3 3 3  34 47 55
++80 127 157  146 190 211  172 205 220  136 185 209  136 185 209  136 185 209
++28 67 93  22 40 52  55 98 126  55 98 126  21 29 34  7 11 13
++50 82 103  101 161 196  101 161 196  35 83 115  13 20 25  2 2 1
++1 1 2  1 1 2  37 51 59  131 129 131  174 174 174  174 174 174
++167 166 167  163 162 163  163 162 163  167 166 167  174 174 174  125 124 125
++16 19 21  4 0 0
++4 4 4  4 0 0  4 0 0  60 74 84  174 174 174  174 174 174
++158 157 158  155 154 155  155 154 155  156 155 156  155 154 155  158 157 158
++167 166 167  165 164 165  131 129 131  60 73 81  13 16 17  4 0 0
++4 0 0  4 3 3  6 6 6  4 3 3  5 5 5  4 4 4
++4 4 4  3 2 2  0 0 0  0 0 0  7 11 13  45 69 86
++80 127 157  71 116 144  43 61 72  7 11 13  0 0 0  1 1 1
++4 3 3  4 4 4  4 4 4  4 4 4  6 6 6  5 5 5
++3 2 2  4 0 0  1 0 0  21 29 34  59 113 148  136 185 209
++146 190 211  136 185 209  136 185 209  136 185 209  136 185 209  136 185 209
++68 124 159  44 81 103  22 40 52  13 16 17  43 61 72  90 154 193
++136 185 209  59 113 148  21 29 34  3 4 3  1 1 1  0 0 0
++24 26 27  125 124 125  163 162 163  174 174 174  166 165 166  165 164 165
++163 162 163  125 124 125  125 124 125  125 124 125  125 124 125  26 28 28
++4 0 0  4 3 3
++3 3 3  0 0 0  24 26 27  153 152 153  177 184 187  158 157 158
++156 155 156  156 155 156  155 154 155  155 154 155  165 164 165  174 174 174
++155 154 155  60 74 84  26 28 28  4 0 0  4 0 0  3 1 0
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 3 3
++2 0 0  0 0 0  0 0 0  32 43 50  72 125 159  101 161 196
++136 185 209  101 161 196  101 161 196  79 117 143  32 43 50  0 0 0
++0 0 0  2 2 2  4 4 4  4 4 4  3 3 3  1 0 0
++0 0 0  4 5 5  49 76 92  101 161 196  146 190 211  146 190 211
++136 185 209  136 185 209  136 185 209  136 185 209  136 185 209  90 154 193
++28 67 93  13 16 17  37 51 59  80 127 157  136 185 209  90 154 193
++22 40 52  6 9 11  3 4 3  2 2 1  16 19 21  60 73 81
++137 136 137  163 162 163  158 157 158  166 165 166  167 166 167  153 152 153
++60 74 84  37 38 37  6 6 6  13 16 17  4 0 0  1 0 0
++3 2 2  4 4 4
++3 2 2  4 0 0  37 38 37  137 136 137  167 166 167  158 157 158
++157 156 157  154 153 154  157 156 157  167 166 167  174 174 174  125 124 125
++37 38 37  4 0 0  4 0 0  4 0 0  4 3 3  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  1 1 1  0 0 0
++0 0 0  16 21 25  55 98 126  90 154 193  136 185 209  101 161 196
++101 161 196  101 161 196  136 185 209  136 185 209  101 161 196  55 98 126
++14 17 19  0 0 0  0 0 0  0 0 0  0 0 0  0 0 0
++22 40 52  90 154 193  146 190 211  146 190 211  136 185 209  136 185 209
++136 185 209  136 185 209  136 185 209  101 161 196  35 83 115  7 11 13
++17 23 27  59 113 148  136 185 209  101 161 196  34 86 122  7 12 15
++2 5 5  3 4 3  6 6 6  60 73 81  131 129 131  163 162 163
++166 165 166  174 174 174  174 174 174  163 162 163  125 124 125  41 54 63
++13 16 17  4 0 0  4 0 0  4 0 0  1 0 0  2 2 2
++4 4 4  4 4 4
++1 1 1  2 1 0  43 57 68  137 136 137  153 152 153  153 152 153
++163 162 163  156 155 156  165 164 165  167 166 167  60 74 84  6 6 6
++4 0 0  4 0 0  5 5 5  4 4 4  4 4 4  4 4 4
++4 5 5  6 6 6  4 3 3  0 0 0  0 0 0  11 15 18
++40 71 93  100 139 164  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  136 185 209  136 185 209
++101 161 196  45 69 86  6 6 6  0 0 0  17 23 27  55 98 126
++136 185 209  146 190 211  136 185 209  136 185 209  136 185 209  136 185 209
++136 185 209  136 185 209  90 154 193  22 40 52  7 11 13  50 82 103
++136 185 209  136 185 209  53 118 160  22 40 52  7 11 13  2 5 5
++3 4 3  37 38 37  125 124 125  157 156 157  166 165 166  167 166 167
++174 174 174  174 174 174  137 136 137  60 73 81  4 0 0  4 0 0
++4 0 0  4 0 0  5 5 5  3 3 3  3 3 3  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  137 136 137  125 124 125  131 129 131
++155 154 155  167 166 167  174 174 174  60 74 84  6 6 6  4 0 0
++4 3 3  6 6 6  4 4 4  4 4 4  4 4 4  5 5 5
++4 4 4  1 1 1  0 0 0  3 6 7  41 65 82  72 125 159
++101 161 196  101 161 196  101 161 196  90 154 193  90 154 193  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  136 185 209
++136 185 209  136 185 209  80 127 157  55 98 126  101 161 196  146 190 211
++136 185 209  136 185 209  136 185 209  101 161 196  136 185 209  101 161 196
++136 185 209  101 161 196  35 83 115  22 30 35  101 161 196  172 205 220
++90 154 193  28 67 93  7 11 13  2 5 5  3 4 3  13 16 17
++85 115 134  167 166 167  174 174 174  174 174 174  174 174 174  174 174 174
++167 166 167  60 74 84  13 16 17  4 0 0  4 0 0  4 3 3
++6 6 6  5 5 5  4 4 4  5 5 5  4 4 4  5 5 5
++5 5 5  5 5 5
++1 1 1  4 0 0  41 54 63  137 136 137  137 136 137  125 124 125
++131 129 131  167 166 167  157 156 157  37 38 37  6 6 6  4 0 0
++6 6 6  5 5 5  4 4 4  4 4 4  4 5 5  2 2 1
++0 0 0  0 0 0  26 37 45  58 111 146  101 161 196  101 161 196
++101 161 196  90 154 193  90 154 193  90 154 193  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  136 185 209  136 185 209  136 185 209  146 190 211  136 185 209
++136 185 209  101 161 196  136 185 209  136 185 209  101 161 196  136 185 209
++101 161 196  136 185 209  136 185 209  136 185 209  136 185 209  16 89 141
++7 11 13  2 5 5  2 5 5  13 16 17  60 73 81  154 154 154
++174 174 174  174 174 174  174 174 174  174 174 174  163 162 163  125 124 125
++24 26 27  4 0 0  4 0 0  4 0 0  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
++5 5 5  4 4 4
++4 0 0  6 6 6  37 38 37  137 136 137  137 136 137  131 129 131
++131 129 131  153 152 153  131 129 131  26 28 28  4 0 0  4 3 3
++6 6 6  4 4 4  4 4 4  4 4 4  0 0 0  0 0 0
++13 20 25  51 88 114  90 154 193  101 161 196  101 161 196  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  136 185 209  101 161 196
++101 161 196  136 185 209  101 161 196  136 185 209  136 185 209  101 161 196
++136 185 209  101 161 196  136 185 209  101 161 196  101 161 196  101 161 196
++136 185 209  136 185 209  136 185 209  37 112 160  21 29 34  5 7 8
++2 5 5  13 16 17  43 57 68  131 129 131  174 174 174  174 174 174
++174 174 174  167 166 167  157 156 157  125 124 125  37 38 37  4 0 0
++4 0 0  4 0 0  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  41 54 63  153 152 153  137 136 137  137 136 137
++137 136 137  153 152 153  125 124 125  24 26 27  4 0 0  3 2 2
++4 4 4  4 4 4  4 3 3  4 0 0  3 6 7  43 61 72
++64 123 161  101 161 196  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  101 161 196  90 154 193
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++136 185 209  101 161 196  101 161 196  136 185 209  136 185 209  101 161 196
++101 161 196  90 154 193  28 67 93  13 16 17  7 11 13  3 6 7
++37 51 59  125 124 125  163 162 163  174 174 174  167 166 167  166 165 166
++167 166 167  131 129 131  60 73 81  4 0 0  4 0 0  4 0 0
++3 3 3  5 5 5  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  137 136 137  153 152 153  137 136 137
++153 152 153  157 156 157  125 124 125  24 26 27  0 0 0  2 2 2
++4 4 4  4 4 4  2 0 0  0 0 0  28 67 93  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  64 123 161  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++90 154 193  101 161 196  101 161 196  101 161 196  90 154 193  136 185 209
++101 161 196  101 161 196  136 185 209  101 161 196  136 185 209  101 161 196
++101 161 196  101 161 196  136 185 209  101 161 196  101 161 196  90 154 193
++35 83 115  13 16 17  3 6 7  2 5 5  13 16 17  60 74 84
++154 154 154  166 165 166  165 164 165  158 157 158  163 162 163  157 156 157
++60 74 84  13 16 17  4 0 0  4 0 0  3 2 2  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  41 54 63  157 156 157  155 154 155  137 136 137
++153 152 153  158 157 158  137 136 137  26 28 28  2 0 0  2 2 2
++4 4 4  4 4 4  1 0 0  6 10 14  34 86 122  90 154 193
++64 123 161  90 154 193  64 123 161  90 154 193  90 154 193  90 154 193
++64 123 161  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  101 161 196
++136 185 209  101 161 196  136 185 209  90 154 193  26 108 161  22 40 52
++13 16 17  5 7 8  2 5 5  2 5 5  37 38 37  165 164 165
++174 174 174  163 162 163  154 154 154  165 164 165  167 166 167  60 73 81
++6 6 6  4 0 0  4 0 0  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  41 54 63  156 155 156  158 157 158  153 152 153
++156 155 156  165 164 165  137 136 137  26 28 28  0 0 0  2 2 2
++4 4 5  4 4 4  2 0 0  7 12 15  31 96 139  64 123 161
++90 154 193  64 123 161  90 154 193  90 154 193  64 123 161  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  101 161 196  101 161 196  136 185 209
++101 161 196  136 185 209  26 108 161  22 40 52  7 11 13  5 7 8
++2 5 5  2 5 5  2 5 5  2 2 1  37 38 37  158 157 158
++174 174 174  154 154 154  156 155 156  167 166 167  165 164 165  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  157 156 157  163 162 163  153 152 153
++158 157 158  167 166 167  137 136 137  26 28 28  2 0 0  2 2 2
++4 5 5  4 4 4  4 0 0  7 12 15  24 86 132  26 108 161
++37 112 160  64 123 161  90 154 193  64 123 161  90 154 193  90 154 193
++90 154 193  90 154 193  90 154 193  90 154 193  90 154 193  90 154 193
++90 154 193  101 161 196  90 154 193  101 161 196  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  136 185 209  101 161 196  136 185 209
++90 154 193  35 83 115  13 16 17  13 16 17  7 11 13  3 6 7
++5 7 8  6 6 6  3 4 3  2 2 1  30 32 34  154 154 154
++167 166 167  154 154 154  154 154 154  174 174 174  165 164 165  37 38 37
++6 6 6  4 0 0  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  41 54 63  163 162 163  166 165 166  154 154 154
++163 162 163  174 174 174  137 136 137  26 28 28  0 0 0  2 2 2
++4 5 5  4 4 5  1 1 2  6 10 14  28 67 93  18 97 151
++18 97 151  18 97 151  26 108 161  37 112 160  37 112 160  90 154 193
++64 123 161  90 154 193  90 154 193  90 154 193  90 154 193  101 161 196
++90 154 193  101 161 196  101 161 196  90 154 193  101 161 196  101 161 196
++101 161 196  101 161 196  101 161 196  136 185 209  90 154 193  16 89 141
++13 20 25  7 11 13  5 7 8  5 7 8  2 5 5  4 5 5
++3 4 3  4 5 5  3 4 3  0 0 0  37 38 37  158 157 158
++174 174 174  158 157 158  158 157 158  167 166 167  174 174 174  41 54 63
++4 0 0  3 2 2  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  165 164 165  174 174 174  158 157 158
++167 166 167  174 174 174  153 152 153  26 28 28  2 0 0  2 2 2
++4 5 5  4 4 4  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  18 97 151  18 97 151  26 108 161  26 108 161  26 108 161
++26 108 161  37 112 160  53 118 160  90 154 193  90 154 193  90 154 193
++90 154 193  90 154 193  101 161 196  101 161 196  101 161 196  101 161 196
++101 161 196  136 185 209  90 154 193  26 108 161  22 40 52  13 16 17
++7 11 13  3 6 7  5 7 8  5 7 8  2 5 5  4 5 5
++4 5 5  6 6 6  3 4 3  0 0 0  30 32 34  158 157 158
++174 174 174  156 155 156  155 154 155  165 164 165  154 153 154  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  167 166 167  174 174 174  163 162 163
++174 174 174  174 174 174  153 152 153  26 28 28  0 0 0  3 3 3
++5 5 5  4 4 4  1 1 2  7 12 15  28 67 93  18 97 151
++18 97 151  18 97 151  18 97 151  18 97 151  18 97 151  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++90 154 193  26 108 161  90 154 193  90 154 193  90 154 193  101 161 196
++101 161 196  26 108 161  22 40 52  13 16 17  7 11 13  2 5 5
++2 5 5  6 6 6  2 5 5  4 5 5  4 5 5  4 5 5
++3 4 3  5 5 5  3 4 3  2 0 0  30 32 34  137 136 137
++153 152 153  137 136 137  131 129 131  137 136 137  131 129 131  37 38 37
++4 0 0  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  167 166 167  174 174 174  166 165 166
++174 174 174  177 184 187  153 152 153  30 32 34  1 0 0  3 3 3
++5 5 5  4 3 3  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  18 97 151  18 97 151  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  90 154 193  90 154 193  26 108 161
++35 83 115  13 16 17  7 11 13  5 7 8  3 6 7  5 7 8
++2 5 5  6 6 6  4 5 5  4 5 5  3 4 3  4 5 5
++3 4 3  6 6 6  3 4 3  0 0 0  26 28 28  125 124 125
++131 129 131  125 124 125  125 124 125  131 129 131  131 129 131  37 38 37
++4 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  174 174 174  177 184 187  167 166 167
++174 174 174  177 184 187  153 152 153  30 32 34  0 0 0  3 3 3
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  18 97 151
++18 97 151  18 97 151  18 97 151  18 97 151  18 97 151  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  90 154 193  26 108 161  26 108 161  24 86 132  13 20 25
++7 11 13  13 20 25  22 40 52  5 7 8  3 4 3  3 4 3
++4 5 5  3 4 3  4 5 5  3 4 3  4 5 5  3 4 3
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  125 124 125
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  174 174 174  177 184 187  174 174 174
++174 174 174  190 197 201  157 156 157  30 32 34  1 0 0  3 3 3
++5 5 5  4 3 3  4 0 0  7 12 15  10 87 144  10 87 144
++18 97 151  19 95 150  19 95 150  18 97 151  18 97 151  26 108 161
++18 97 151  26 108 161  26 108 161  26 108 161  26 108 161  90 154 193
++26 108 161  26 108 161  26 108 161  22 40 52  2 5 5  3 4 3
++28 67 93  37 112 160  34 86 122  2 5 5  3 4 3  3 4 3
++3 4 3  3 4 3  3 4 3  2 2 1  3 4 3  4 4 4
++4 5 5  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  174 174 174  177 184 187  174 174 174
++174 174 174  190 197 201  158 157 158  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  18 97 151
++10 87 144  19 95 150  19 95 150  18 97 151  18 97 151  18 97 151
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++18 97 151  22 40 52  2 5 5  2 2 1  22 40 52  26 108 161
++90 154 193  37 112 160  22 40 52  3 4 3  13 20 25  22 30 35
++3 6 7  1 1 1  2 2 2  6 9 11  5 5 5  4 3 3
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++1 1 1  4 0 0  60 73 81  177 184 187  193 200 203  174 174 174
++177 184 187  193 200 203  163 162 163  30 32 34  4 0 0  2 2 2
++5 5 5  4 3 3  4 0 0  6 10 14  24 86 132  10 87 144
++10 87 144  10 87 144  19 95 150  19 95 150  19 95 150  18 97 151
++26 108 161  26 108 161  26 108 161  90 154 193  26 108 161  28 67 93
++6 10 14  2 5 5  13 20 25  24 86 132  37 112 160  90 154 193
++10 87 144  7 12 15  2 5 5  28 67 93  37 112 160  28 67 93
++2 2 1  7 12 15  35 83 115  28 67 93  3 6 7  1 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  174 174 174  190 197 201  174 174 174
++177 184 187  193 200 203  163 162 163  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  16 89 141  19 95 150  10 87 144  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  28 67 93  6 10 14  1 1 2
++7 12 15  28 67 93  26 108 161  16 89 141  24 86 132  21 29 34
++3 4 3  21 29 34  37 112 160  37 112 160  27 99 146  21 29 34
++21 29 34  26 108 161  90 154 193  35 83 115  1 1 2  2 0 0
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  125 124 125
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++3 1 0  4 0 0  60 73 81  193 200 203  193 200 203  174 174 174
++190 197 201  193 200 203  165 164 165  37 38 37  4 0 0  2 2 2
++5 5 5  4 3 3  4 0 0  6 10 14  24 86 132  10 87 144
++10 87 144  10 87 144  16 89 141  18 97 151  18 97 151  10 87 144
++24 86 132  24 86 132  13 20 25  4 5 7  4 5 7  22 40 52
++18 97 151  37 112 160  26 108 161  7 12 15  1 1 1  0 0 0
++28 67 93  37 112 160  26 108 161  28 67 93  22 40 52  28 67 93
++26 108 161  90 154 193  26 108 161  10 87 144  0 0 0  2 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  193 200 203  174 174 174
++190 197 201  193 200 203  165 164 165  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  10 87 144  18 97 151  28 67 93  6 10 14
++0 0 0  1 1 2  4 5 7  13 20 25  16 89 141  26 108 161
++26 108 161  26 108 161  24 86 132  6 9 11  2 3 3  22 40 52
++37 112 160  16 89 141  22 40 52  28 67 93  26 108 161  26 108 161
++90 154 193  26 108 161  26 108 161  28 67 93  1 1 1  4 0 0
++4 4 4  5 5 5  3 3 3  4 0 0  26 28 28  124 126 130
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  193 200 203  193 200 203  174 174 174
++193 200 203  193 200 203  167 166 167  37 38 37  4 0 0  2 2 2
++5 5 5  4 4 4  4 0 0  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  13 20 25  4 5 7
++1 1 2  1 1 1  22 40 52  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  24 86 132  22 40 52  22 40 52
++22 40 52  22 40 52  10 87 144  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  90 154 193  10 87 144  0 0 0  4 0 0
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  205 212 215  167 166 167  30 32 34  0 0 0  2 2 2
++5 5 5  4 4 4  1 1 2  6 10 14  28 67 93  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  22 40 52  1 1 2
++2 0 0  1 1 2  24 86 132  26 108 161  26 108 161  26 108 161
++26 108 161  19 95 150  16 89 141  10 87 144  22 40 52  22 40 52
++10 87 144  26 108 161  37 112 160  26 108 161  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  28 67 93  2 0 0  3 1 0
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  190 197 201  174 174 174
++193 200 203  193 200 203  174 174 174  37 38 37  4 0 0  2 2 2
++5 5 5  4 4 4  3 2 2  1 1 2  13 20 25  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  13 20 25
++13 20 25  22 40 52  10 87 144  18 97 151  18 97 151  26 108 161
++10 87 144  13 20 25  6 10 14  21 29 34  24 86 132  18 97 151
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  90 154 193  18 97 151  13 20 25  0 0 0  4 3 3
++4 4 4  5 5 5  3 3 3  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  220 221 221  167 166 167  30 32 34  1 0 0  2 2 2
++5 5 5  4 4 4  4 4 5  2 5 5  4 5 7  13 20 25
++28 67 93  10 87 144  10 87 144  10 87 144  10 87 144  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  18 97 151  18 97 151
++28 67 93  2 3 3  0 0 0  28 67 93  26 108 161  26 108 161
++26 108 161  26 108 161  26 108 161  26 108 161  26 108 161  26 108 161
++26 108 161  10 87 144  13 20 25  1 1 2  3 2 2  4 4 4
++4 4 4  5 5 5  3 3 3  2 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  190 197 201  174 174 174
++193 200 203  193 200 203  174 174 174  26 28 28  4 0 0  4 3 3
++5 5 5  4 4 4  4 4 4  4 4 5  1 1 2  2 5 5
++4 5 7  22 40 52  10 87 144  10 87 144  18 97 151  10 87 144
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  18 97 151
++10 87 144  28 67 93  22 40 52  10 87 144  26 108 161  18 97 151
++18 97 151  18 97 151  26 108 161  26 108 161  26 108 161  26 108 161
++22 40 52  1 1 2  0 0 0  2 3 3  4 4 4  4 4 4
++4 4 4  5 5 5  4 4 4  0 0 0  26 28 28  131 129 131
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++190 197 201  220 221 221  190 197 201  41 54 63  4 0 0  2 2 2
++6 6 6  4 4 4  4 4 4  4 4 5  4 4 5  3 3 3
++1 1 2  1 1 2  6 10 14  22 40 52  10 87 144  18 97 151
++18 97 151  10 87 144  10 87 144  10 87 144  18 97 151  10 87 144
++10 87 144  18 97 151  26 108 161  18 97 151  18 97 151  10 87 144
++26 108 161  26 108 161  26 108 161  10 87 144  28 67 93  6 10 14
++1 1 2  1 1 2  4 3 3  4 4 5  4 4 4  4 4 4
++5 5 5  5 5 5  1 1 1  4 0 0  37 51 59  137 136 137
++137 136 137  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  4 0 0  60 73 81  220 221 221  193 200 203  174 174 174
++193 200 203  193 200 203  220 221 221  137 136 137  13 16 17  4 0 0
++2 2 2  4 4 4  4 4 4  4 4 4  4 4 4  4 4 5
++4 4 5  4 3 3  1 1 2  4 5 7  13 20 25  28 67 93
++10 87 144  10 87 144  10 87 144  10 87 144  10 87 144  10 87 144
++10 87 144  18 97 151  18 97 151  10 87 144  18 97 151  26 108 161
++26 108 161  18 97 151  28 67 93  6 10 14  0 0 0  0 0 0
++2 3 3  4 5 5  4 4 5  4 4 4  4 4 4  5 5 5
++3 3 3  1 1 1  0 0 0  16 19 21  125 124 125  137 136 137
++131 129 131  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  60 73 81  174 174 174  220 221 221  174 174 174
++193 200 203  190 197 201  220 221 221  220 221 221  153 152 153  30 32 34
++0 0 0  0 0 0  2 2 2  4 4 4  4 4 4  4 4 4
++4 4 4  4 5 5  4 5 7  1 1 2  1 1 2  4 5 7
++13 20 25  28 67 93  10 87 144  18 97 151  10 87 144  10 87 144
++10 87 144  10 87 144  10 87 144  18 97 151  26 108 161  18 97 151
++28 67 93  7 12 15  0 0 0  0 0 0  2 2 1  4 4 4
++4 5 5  4 5 5  4 4 4  4 4 4  3 3 3  0 0 0
++0 0 0  0 0 0  37 38 37  125 124 125  158 157 158  131 129 131
++125 124 125  125 124 125  125 124 125  137 136 137  131 129 131  37 38 37
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  4 0 0  41 54 63  193 200 203  220 221 221  174 174 174
++193 200 203  193 200 203  193 200 203  220 221 221  244 246 246  193 200 203
++120 125 127  5 5 5  1 0 0  0 0 0  1 1 1  4 4 4
++4 4 4  4 4 4  4 5 5  4 5 5  4 4 5  1 1 2
++4 5 7  4 5 7  22 40 52  10 87 144  10 87 144  10 87 144
++10 87 144  10 87 144  18 97 151  10 87 144  10 87 144  13 20 25
++4 5 7  2 3 3  1 1 2  4 4 4  4 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  1 1 2
++24 26 27  60 74 84  153 152 153  163 162 163  137 136 137  125 124 125
++125 124 125  125 124 125  125 124 125  137 136 137  125 124 125  26 28 28
++0 0 0  3 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 0 0  6 6 6  26 28 28  156 155 156  220 221 221  220 221 221
++174 174 174  193 200 203  193 200 203  193 200 203  205 212 215  220 221 221
++220 221 221  167 166 167  60 73 81  7 11 13  0 0 0  0 0 0
++3 3 3  4 4 4  4 4 4  4 4 4  4 4 5  4 4 5
++4 4 5  1 1 2  1 1 2  4 5 7  22 40 52  10 87 144
++10 87 144  10 87 144  10 87 144  22 40 52  4 5 7  1 1 2
++1 1 2  4 4 5  4 4 4  4 4 4  4 4 4  4 4 4
++5 5 5  2 2 2  0 0 0  4 0 0  16 19 21  60 73 81
++137 136 137  167 166 167  158 157 158  137 136 137  131 129 131  131 129 131
++125 124 125  125 124 125  131 129 131  155 154 155  60 74 84  5 7 8
++0 0 0  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 0 0  4 0 0  60 73 81  193 200 203  220 221 221
++193 200 203  193 200 203  193 200 203  193 200 203  205 212 215  220 221 221
++220 221 221  220 221 221  220 221 221  137 136 137  43 57 68  6 6 6
++4 0 0  1 1 1  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 5  4 4 5  3 2 2  1 1 2  2 5 5  13 20 25
++22 40 52  22 40 52  13 20 25  2 3 3  1 1 2  3 3 3
++4 5 7  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++1 1 1  0 0 0  2 3 3  41 54 63  131 129 131  166 165 166
++166 165 166  155 154 155  153 152 153  137 136 137  137 136 137  125 124 125
++125 124 125  137 136 137  137 136 137  125 124 125  37 38 37  4 3 3
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  6 6 6  6 6 6  13 16 17  60 73 81  167 166 167
++220 221 221  220 221 221  220 221 221  193 200 203  193 200 203  193 200 203
++205 212 215  220 221 221  220 221 221  244 246 246  205 212 215  125 124 125
++24 26 27  0 0 0  0 0 0  2 2 2  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 5  1 1 2  4 5 7
++4 5 7  4 5 7  1 1 2  3 2 2  4 4 5  4 4 4
++4 4 4  4 4 4  5 5 5  4 4 4  0 0 0  0 0 0
++2 0 0  26 28 28  125 124 125  174 174 174  174 174 174  166 165 166
++156 155 156  153 152 153  137 136 137  137 136 137  131 129 131  137 136 137
++137 136 137  137 136 137  60 74 84  30 32 34  4 0 0  4 0 0
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  6 6 6  4 0 0  4 0 0  6 6 6  26 28 28
++125 124 125  174 174 174  220 221 221  220 221 221  220 221 221  193 200 203
++205 212 215  220 221 221  205 212 215  220 221 221  220 221 221  244 246 246
++193 200 203  60 74 84  13 16 17  4 0 0  0 0 0  3 3 3
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 5  3 3 3
++1 1 2  3 3 3  4 4 5  4 4 5  4 4 4  4 4 4
++5 5 5  5 5 5  2 2 2  0 0 0  0 0 0  13 16 17
++60 74 84  174 174 174  193 200 203  174 174 174  167 166 167  163 162 163
++153 152 153  153 152 153  137 136 137  137 136 137  153 152 153  137 136 137
++125 124 125  41 54 63  24 26 27  4 0 0  4 0 0  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 3 3  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++6 6 6  37 38 37  131 129 131  220 221 221  220 221 221  220 221 221
++193 200 203  193 200 203  220 221 221  205 212 215  220 221 221  244 246 246
++244 246 246  244 246 246  174 174 174  41 54 63  0 0 0  0 0 0
++0 0 0  4 4 4  5 5 5  5 5 5  4 4 4  4 4 5
++4 4 5  4 4 5  4 4 4  4 4 4  6 6 6  6 6 6
++3 3 3  0 0 0  2 0 0  13 16 17  60 73 81  156 155 156
++220 221 221  193 200 203  174 174 174  165 164 165  163 162 163  154 153 154
++153 152 153  153 152 153  158 157 158  163 162 163  137 136 137  60 73 81
++13 16 17  4 0 0  4 0 0  4 3 3  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  4 3 3  6 6 6  6 6 6  6 6 6
++6 6 6  6 6 6  6 6 6  37 38 37  167 166 167  244 246 246
++244 246 246  220 221 221  205 212 215  205 212 215  220 221 221  193 200 203
++220 221 221  244 246 246  244 246 246  244 246 246  137 136 137  37 38 37
++3 2 2  0 0 0  1 1 1  5 5 5  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 4 4  1 1 1
++0 0 0  5 5 5  43 57 68  153 152 153  193 200 203  220 221 221
++177 184 187  174 174 174  167 166 167  166 165 166  158 157 158  157 156 157
++158 157 158  166 165 166  156 155 156  85 115 134  13 16 17  4 0 0
++4 0 0  4 0 0  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  6 6 6  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  6 6 6  6 6 6  13 16 17  60 73 81
++177 184 187  220 221 221  220 221 221  220 221 221  205 212 215  220 221 221
++220 221 221  205 212 215  220 221 221  244 246 246  244 246 246  205 212 215
++125 124 125  30 32 34  0 0 0  0 0 0  2 2 2  5 5 5
++4 4 4  4 4 4  4 4 4  1 1 1  0 0 0  1 0 0
++37 38 37  131 129 131  205 212 215  220 221 221  193 200 203  174 174 174
++174 174 174  174 174 174  167 166 167  165 164 165  166 165 166  167 166 167
++158 157 158  125 124 125  37 38 37  4 0 0  4 0 0  4 0 0
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  4 3 3  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++26 28 28  125 124 125  205 212 215  220 221 221  220 221 221  220 221 221
++205 212 215  220 221 221  205 212 215  220 221 221  220 221 221  244 246 246
++244 246 246  190 197 201  60 74 84  16 19 21  4 0 0  0 0 0
++0 0 0  0 0 0  0 0 0  0 0 0  16 19 21  120 125 127
++177 184 187  220 221 221  205 212 215  177 184 187  174 174 174  177 184 187
++174 174 174  174 174 174  167 166 167  174 174 174  166 165 166  137 136 137
++60 73 81  13 16 17  4 0 0  4 0 0  4 3 3  6 6 6
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++5 5 5  4 3 3  5 5 5  4 3 3  6 6 6  4 0 0
++6 6 6  6 6 6  4 0 0  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  37 38 37  137 136 137  193 200 203  220 221 221
++220 221 221  205 212 215  220 221 221  205 212 215  205 212 215  220 221 221
++220 221 221  220 221 221  244 246 246  166 165 166  43 57 68  2 2 2
++0 0 0  4 0 0  16 19 21  60 73 81  157 156 157  202 210 214
++220 221 221  193 200 203  177 184 187  177 184 187  177 184 187  174 174 174
++174 174 174  174 174 174  174 174 174  157 156 157  60 74 84  24 26 27
++4 0 0  4 0 0  4 0 0  6 6 6  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  4 3 3  5 5 5  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  6 6 6  4 0 0
++4 0 0  4 0 0  6 6 6  24 26 27  60 73 81  167 166 167
++220 221 221  220 221 221  220 221 221  205 212 215  205 212 215  205 212 215
++205 212 215  220 221 221  220 221 221  220 221 221  205 212 215  137 136 137
++60 74 84  125 124 125  137 136 137  190 197 201  220 221 221  193 200 203
++177 184 187  177 184 187  177 184 187  174 174 174  174 174 174  177 184 187
++190 197 201  174 174 174  125 124 125  37 38 37  6 6 6  4 0 0
++4 0 0  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  5 5 5  4 3 3  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  4 0 0  4 0 0  6 6 6  6 6 6
++125 124 125  193 200 203  244 246 246  220 221 221  205 212 215  205 212 215
++205 212 215  193 200 203  205 212 215  205 212 215  220 221 221  220 221 221
++193 200 203  193 200 203  205 212 215  193 200 203  193 200 203  177 184 187
++190 197 201  190 197 201  174 174 174  190 197 201  193 200 203  190 197 201
++153 152 153  60 73 81  4 0 0  4 0 0  4 0 0  3 2 2
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  4 3 3
++6 6 6  4 3 3  4 3 3  4 3 3  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  4 0 0  4 0 0
++4 0 0  26 28 28  131 129 131  220 221 221  244 246 246  220 221 221
++205 212 215  193 200 203  205 212 215  193 200 203  193 200 203  205 212 215
++220 221 221  193 200 203  193 200 203  193 200 203  190 197 201  174 174 174
++174 174 174  190 197 201  193 200 203  193 200 203  167 166 167  125 124 125
++6 6 6  4 0 0  4 0 0  4 3 3  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++5 5 5  4 3 3  5 5 5  6 6 6  4 3 3  5 5 5
++6 6 6  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++4 0 0  4 0 0  6 6 6  41 54 63  158 157 158  220 221 221
++220 221 221  220 221 221  193 200 203  193 200 203  193 200 203  190 197 201
++190 197 201  190 197 201  190 197 201  190 197 201  174 174 174  193 200 203
++193 200 203  220 221 221  174 174 174  125 124 125  37 38 37  4 0 0
++4 0 0  4 3 3  6 6 6  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  4 3 3  4 3 3  5 5 5
++4 3 3  6 6 6  5 5 5  4 3 3  6 6 6  6 6 6
++6 6 6  6 6 6  4 0 0  4 0 0  13 16 17  60 73 81
++174 174 174  220 221 221  220 221 221  205 212 215  190 197 201  174 174 174
++193 200 203  174 174 174  190 197 201  174 174 174  193 200 203  220 221 221
++193 200 203  131 129 131  37 38 37  6 6 6  4 0 0  4 0 0
++6 6 6  6 6 6  4 3 3  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  5 5 5  5 5 5
++5 5 5  4 3 3  4 3 3  5 5 5  4 3 3  4 3 3
++5 5 5  6 6 6  6 6 6  4 0 0  6 6 6  6 6 6
++6 6 6  125 124 125  174 174 174  220 221 221  220 221 221  193 200 203
++193 200 203  193 200 203  193 200 203  193 200 203  220 221 221  158 157 158
++60 73 81  6 6 6  4 0 0  4 0 0  5 5 5  6 6 6
++5 5 5  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  5 5 5  4 3 3  5 5 5  4 3 3
++5 5 5  5 5 5  6 6 6  6 6 6  4 0 0  4 0 0
++4 0 0  4 0 0  26 28 28  125 124 125  174 174 174  193 200 203
++193 200 203  174 174 174  193 200 203  167 166 167  125 124 125  6 6 6
++6 6 6  6 6 6  4 0 0  6 6 6  6 6 6  5 5 5
++4 3 3  5 5 5  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++4 3 3  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++6 6 6  4 0 0  4 0 0  6 6 6  37 38 37  125 124 125
++153 152 153  131 129 131  125 124 125  37 38 37  6 6 6  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  4 3 3  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  5 5 5  4 3 3  5 5 5  4 3 3
++6 6 6  6 6 6  4 0 0  4 0 0  6 6 6  6 6 6
++24 26 27  24 26 27  6 6 6  6 6 6  6 6 6  4 0 0
++6 6 6  6 6 6  4 0 0  6 6 6  5 5 5  4 3 3
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  5 5 5  4 3 3  5 5 5  6 6 6
++4 0 0  6 6 6  6 6 6  6 6 6  6 6 6  6 6 6
++6 6 6  6 6 6  6 6 6  4 0 0  6 6 6  6 6 6
++4 0 0  6 6 6  6 6 6  4 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  5 5 5
++5 5 5  5 5 5  4 0 0  6 6 6  4 0 0  6 6 6
++6 6 6  6 6 6  6 6 6  4 0 0  6 6 6  4 0 0
++6 6 6  4 3 3  5 5 5  4 3 3  5 5 5  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  5 5 5
++4 3 3  6 6 6  4 3 3  6 6 6  6 6 6  6 6 6
++4 0 0  6 6 6  4 0 0  6 6 6  6 6 6  6 6 6
++6 6 6  4 3 3  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  5 5 5  4 0 0  6 6 6
++6 6 6  4 0 0  6 6 6  6 6 6  4 0 0  6 6 6
++4 3 3  5 5 5  5 5 5  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  5 5 5  4 3 3  5 5 5  6 6 6  4 3 3
++4 3 3  6 6 6  6 6 6  4 3 3  6 6 6  4 3 3
++5 5 5  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  5 5 5  4 3 3  6 6 6
++5 5 5  4 3 3  4 3 3  4 3 3  5 5 5  5 5 5
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  5 5 5  4 3 3
++5 5 5  4 3 3  5 5 5  5 5 5  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4  4 4 4  4 4 4  4 4 4  4 4 4
++4 4 4  4 4 4
+diff -urNp linux-3.0.4/drivers/video/udlfb.c linux-3.0.4/drivers/video/udlfb.c
+--- linux-3.0.4/drivers/video/udlfb.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/udlfb.c  2011-08-23 21:47:56.000000000 -0400
 @@ -586,11 +586,11 @@ int dlfb_handle_damage(struct dlfb_data 
                dlfb_urb_completion(urb);
  
@@ -33606,9 +36359,9 @@ diff -urNp linux-3.0.3/drivers/video/udlfb.c linux-3.0.3/drivers/video/udlfb.c
  
        return count;
  }
-diff -urNp linux-3.0.3/drivers/video/uvesafb.c linux-3.0.3/drivers/video/uvesafb.c
---- linux-3.0.3/drivers/video/uvesafb.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/uvesafb.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/uvesafb.c linux-3.0.4/drivers/video/uvesafb.c
+--- linux-3.0.4/drivers/video/uvesafb.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/uvesafb.c        2011-08-23 21:47:56.000000000 -0400
 @@ -19,6 +19,7 @@
  #include <linux/io.h>
  #include <linux/mutex.h>
@@ -33684,9 +36437,9 @@ diff -urNp linux-3.0.3/drivers/video/uvesafb.c linux-3.0.3/drivers/video/uvesafb
                }
  
                framebuffer_release(info);
-diff -urNp linux-3.0.3/drivers/video/vesafb.c linux-3.0.3/drivers/video/vesafb.c
---- linux-3.0.3/drivers/video/vesafb.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/vesafb.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/vesafb.c linux-3.0.4/drivers/video/vesafb.c
+--- linux-3.0.4/drivers/video/vesafb.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/vesafb.c 2011-08-23 21:47:56.000000000 -0400
 @@ -9,6 +9,7 @@
   */
  
@@ -33789,9 +36542,9 @@ diff -urNp linux-3.0.3/drivers/video/vesafb.c linux-3.0.3/drivers/video/vesafb.c
        if (info->screen_base)
                iounmap(info->screen_base);
        framebuffer_release(info);
-diff -urNp linux-3.0.3/drivers/video/via/via_clock.h linux-3.0.3/drivers/video/via/via_clock.h
---- linux-3.0.3/drivers/video/via/via_clock.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/video/via/via_clock.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/drivers/video/via/via_clock.h linux-3.0.4/drivers/video/via/via_clock.h
+--- linux-3.0.4/drivers/video/via/via_clock.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/video/via/via_clock.h  2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@ struct via_clock {
  
        void (*set_engine_pll_state)(u8 state);
@@ -33801,9 +36554,9 @@ diff -urNp linux-3.0.3/drivers/video/via/via_clock.h linux-3.0.3/drivers/video/v
  
  
  static inline u32 get_pll_internal_frequency(u32 ref_freq,
-diff -urNp linux-3.0.3/drivers/virtio/virtio_balloon.c linux-3.0.3/drivers/virtio/virtio_balloon.c
---- linux-3.0.3/drivers/virtio/virtio_balloon.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/drivers/virtio/virtio_balloon.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/drivers/virtio/virtio_balloon.c linux-3.0.4/drivers/virtio/virtio_balloon.c
+--- linux-3.0.4/drivers/virtio/virtio_balloon.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/drivers/virtio/virtio_balloon.c        2011-08-23 21:48:14.000000000 -0400
 @@ -174,6 +174,8 @@ static void update_balloon_stats(struct 
        struct sysinfo i;
        int idx = 0;
@@ -33813,9 +36566,9 @@ diff -urNp linux-3.0.3/drivers/virtio/virtio_balloon.c linux-3.0.3/drivers/virti
        all_vm_events(events);
        si_meminfo(&i);
  
-diff -urNp linux-3.0.3/fs/9p/vfs_inode.c linux-3.0.3/fs/9p/vfs_inode.c
---- linux-3.0.3/fs/9p/vfs_inode.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/9p/vfs_inode.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/9p/vfs_inode.c linux-3.0.4/fs/9p/vfs_inode.c
+--- linux-3.0.4/fs/9p/vfs_inode.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/9p/vfs_inode.c      2011-08-23 21:47:56.000000000 -0400
 @@ -1210,7 +1210,7 @@ static void *v9fs_vfs_follow_link(struct
  void
  v9fs_vfs_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -33825,9 +36578,9 @@ diff -urNp linux-3.0.3/fs/9p/vfs_inode.c linux-3.0.3/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-3.0.3/fs/aio.c linux-3.0.3/fs/aio.c
---- linux-3.0.3/fs/aio.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/aio.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/aio.c linux-3.0.4/fs/aio.c
+--- linux-3.0.4/fs/aio.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/aio.c       2011-08-23 21:48:14.000000000 -0400
 @@ -119,7 +119,7 @@ static int aio_setup_ring(struct kioctx 
        size += sizeof(struct io_event) * nr_events;
        nr_pages = (size + PAGE_SIZE-1) >> PAGE_SHIFT;
@@ -33876,9 +36629,9 @@ diff -urNp linux-3.0.3/fs/aio.c linux-3.0.3/fs/aio.c
        kiocb->ki_nr_segs = kiocb->ki_nbytes;
        kiocb->ki_cur_seg = 0;
        /* ki_nbytes/left now reflect bytes instead of segs */
-diff -urNp linux-3.0.3/fs/attr.c linux-3.0.3/fs/attr.c
---- linux-3.0.3/fs/attr.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/attr.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/attr.c linux-3.0.4/fs/attr.c
+--- linux-3.0.4/fs/attr.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/attr.c      2011-08-23 21:48:14.000000000 -0400
 @@ -98,6 +98,7 @@ int inode_newsize_ok(const struct inode 
                unsigned long limit;
  
@@ -33887,10 +36640,10 @@ diff -urNp linux-3.0.3/fs/attr.c linux-3.0.3/fs/attr.c
                if (limit != RLIM_INFINITY && offset > limit)
                        goto out_sig;
                if (offset > inode->i_sb->s_maxbytes)
-diff -urNp linux-3.0.3/fs/befs/linuxvfs.c linux-3.0.3/fs/befs/linuxvfs.c
---- linux-3.0.3/fs/befs/linuxvfs.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/befs/linuxvfs.c     2011-08-23 21:47:56.000000000 -0400
-@@ -498,7 +498,7 @@ static void befs_put_link(struct dentry 
+diff -urNp linux-3.0.4/fs/befs/linuxvfs.c linux-3.0.4/fs/befs/linuxvfs.c
+--- linux-3.0.4/fs/befs/linuxvfs.c     2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/fs/befs/linuxvfs.c     2011-08-29 23:26:27.000000000 -0400
+@@ -503,7 +503,7 @@ static void befs_put_link(struct dentry 
  {
        befs_inode_info *befs_ino = BEFS_I(dentry->d_inode);
        if (befs_ino->i_flags & BEFS_LONG_SYMLINK) {
@@ -33899,9 +36652,9 @@ diff -urNp linux-3.0.3/fs/befs/linuxvfs.c linux-3.0.3/fs/befs/linuxvfs.c
                if (!IS_ERR(link))
                        kfree(link);
        }
-diff -urNp linux-3.0.3/fs/binfmt_aout.c linux-3.0.3/fs/binfmt_aout.c
---- linux-3.0.3/fs/binfmt_aout.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/binfmt_aout.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/binfmt_aout.c linux-3.0.4/fs/binfmt_aout.c
+--- linux-3.0.4/fs/binfmt_aout.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/binfmt_aout.c       2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/string.h>
  #include <linux/fs.h>
@@ -33978,9 +36731,9 @@ diff -urNp linux-3.0.3/fs/binfmt_aout.c linux-3.0.3/fs/binfmt_aout.c
                                MAP_FIXED | MAP_PRIVATE | MAP_DENYWRITE | MAP_EXECUTABLE,
                                fd_offset + ex.a_text);
                up_write(&current->mm->mmap_sem);
-diff -urNp linux-3.0.3/fs/binfmt_elf.c linux-3.0.3/fs/binfmt_elf.c
---- linux-3.0.3/fs/binfmt_elf.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/binfmt_elf.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/binfmt_elf.c linux-3.0.4/fs/binfmt_elf.c
+--- linux-3.0.4/fs/binfmt_elf.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/binfmt_elf.c        2011-08-23 21:48:14.000000000 -0400
 @@ -51,6 +51,10 @@ static int elf_core_dump(struct coredump
  #define elf_core_dump NULL
  #endif
@@ -34684,9 +37437,9 @@ diff -urNp linux-3.0.3/fs/binfmt_elf.c linux-3.0.3/fs/binfmt_elf.c
  static int __init init_elf_binfmt(void)
  {
        return register_binfmt(&elf_format);
-diff -urNp linux-3.0.3/fs/binfmt_flat.c linux-3.0.3/fs/binfmt_flat.c
---- linux-3.0.3/fs/binfmt_flat.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/binfmt_flat.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/binfmt_flat.c linux-3.0.4/fs/binfmt_flat.c
+--- linux-3.0.4/fs/binfmt_flat.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/binfmt_flat.c       2011-08-23 21:47:56.000000000 -0400
 @@ -567,7 +567,9 @@ static int load_flat_file(struct linux_b
                                realdatastart = (unsigned long) -ENOMEM;
                        printk("Unable to allocate RAM for process data, errno %d\n",
@@ -34719,9 +37472,9 @@ diff -urNp linux-3.0.3/fs/binfmt_flat.c linux-3.0.3/fs/binfmt_flat.c
                        ret = result;
                        goto err;
                }
-diff -urNp linux-3.0.3/fs/bio.c linux-3.0.3/fs/bio.c
---- linux-3.0.3/fs/bio.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/bio.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/bio.c linux-3.0.4/fs/bio.c
+--- linux-3.0.4/fs/bio.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/bio.c       2011-08-23 21:47:56.000000000 -0400
 @@ -1233,7 +1233,7 @@ static void bio_copy_kern_endio(struct b
        const int read = bio_data_dir(bio) == READ;
        struct bio_map_data *bmd = bio->bi_private;
@@ -34731,9 +37484,9 @@ diff -urNp linux-3.0.3/fs/bio.c linux-3.0.3/fs/bio.c
  
        __bio_for_each_segment(bvec, bio, i, 0) {
                char *addr = page_address(bvec->bv_page);
-diff -urNp linux-3.0.3/fs/block_dev.c linux-3.0.3/fs/block_dev.c
---- linux-3.0.3/fs/block_dev.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/block_dev.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/block_dev.c linux-3.0.4/fs/block_dev.c
+--- linux-3.0.4/fs/block_dev.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/block_dev.c 2011-08-23 21:47:56.000000000 -0400
 @@ -671,7 +671,7 @@ static bool bd_may_claim(struct block_de
        else if (bdev->bd_contains == bdev)
                return true;     /* is a whole device which isn't held */
@@ -34743,9 +37496,9 @@ diff -urNp linux-3.0.3/fs/block_dev.c linux-3.0.3/fs/block_dev.c
                return true;     /* is a partition of a device that is being partitioned */
        else if (whole->bd_holder != NULL)
                return false;    /* is a partition of a held device */
-diff -urNp linux-3.0.3/fs/btrfs/ctree.c linux-3.0.3/fs/btrfs/ctree.c
---- linux-3.0.3/fs/btrfs/ctree.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/ctree.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/ctree.c linux-3.0.4/fs/btrfs/ctree.c
+--- linux-3.0.4/fs/btrfs/ctree.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/ctree.c       2011-08-23 21:47:56.000000000 -0400
 @@ -454,9 +454,12 @@ static noinline int __btrfs_cow_block(st
                free_extent_buffer(buf);
                add_root_to_dirty_list(root);
@@ -34762,9 +37515,9 @@ diff -urNp linux-3.0.3/fs/btrfs/ctree.c linux-3.0.3/fs/btrfs/ctree.c
                        parent_start = 0;
  
                WARN_ON(trans->transid != btrfs_header_generation(parent));
-diff -urNp linux-3.0.3/fs/btrfs/inode.c linux-3.0.3/fs/btrfs/inode.c
---- linux-3.0.3/fs/btrfs/inode.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/inode.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/inode.c linux-3.0.4/fs/btrfs/inode.c
+--- linux-3.0.4/fs/btrfs/inode.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/inode.c       2011-08-23 21:48:14.000000000 -0400
 @@ -6895,7 +6895,7 @@ fail:
        return -ENOMEM;
  }
@@ -34789,9 +37542,9 @@ diff -urNp linux-3.0.3/fs/btrfs/inode.c linux-3.0.3/fs/btrfs/inode.c
  /*
   * If a file is moved, it will inherit the cow and compression flags of the new
   * directory.
-diff -urNp linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3/fs/btrfs/ioctl.c
---- linux-3.0.3/fs/btrfs/ioctl.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/ioctl.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/ioctl.c linux-3.0.4/fs/btrfs/ioctl.c
+--- linux-3.0.4/fs/btrfs/ioctl.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/ioctl.c       2011-08-23 21:48:14.000000000 -0400
 @@ -2676,9 +2676,12 @@ long btrfs_ioctl_space_info(struct btrfs
        for (i = 0; i < num_types; i++) {
                struct btrfs_space_info *tmp;
@@ -34816,9 +37569,9 @@ diff -urNp linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3/fs/btrfs/ioctl.c
                }
                up_read(&info->groups_sem);
        }
-diff -urNp linux-3.0.3/fs/btrfs/relocation.c linux-3.0.3/fs/btrfs/relocation.c
---- linux-3.0.3/fs/btrfs/relocation.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/btrfs/relocation.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/btrfs/relocation.c linux-3.0.4/fs/btrfs/relocation.c
+--- linux-3.0.4/fs/btrfs/relocation.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/btrfs/relocation.c  2011-08-23 21:47:56.000000000 -0400
 @@ -1242,7 +1242,7 @@ static int __update_reloc_root(struct bt
        }
        spin_unlock(&rc->reloc_root_tree.lock);
@@ -34828,9 +37581,9 @@ diff -urNp linux-3.0.3/fs/btrfs/relocation.c linux-3.0.3/fs/btrfs/relocation.c
  
        if (!del) {
                spin_lock(&rc->reloc_root_tree.lock);
-diff -urNp linux-3.0.3/fs/cachefiles/bind.c linux-3.0.3/fs/cachefiles/bind.c
---- linux-3.0.3/fs/cachefiles/bind.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/bind.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/bind.c linux-3.0.4/fs/cachefiles/bind.c
+--- linux-3.0.4/fs/cachefiles/bind.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/bind.c   2011-08-23 21:47:56.000000000 -0400
 @@ -39,13 +39,11 @@ int cachefiles_daemon_bind(struct cachef
               args);
  
@@ -34847,9 +37600,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/bind.c linux-3.0.3/fs/cachefiles/bind.c
               cache->bcull_percent < cache->brun_percent &&
               cache->brun_percent  < 100);
  
-diff -urNp linux-3.0.3/fs/cachefiles/daemon.c linux-3.0.3/fs/cachefiles/daemon.c
---- linux-3.0.3/fs/cachefiles/daemon.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/daemon.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/daemon.c linux-3.0.4/fs/cachefiles/daemon.c
+--- linux-3.0.4/fs/cachefiles/daemon.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/daemon.c 2011-08-23 21:47:56.000000000 -0400
 @@ -196,7 +196,7 @@ static ssize_t cachefiles_daemon_read(st
        if (n > buflen)
                return -EMSGSIZE;
@@ -34886,9 +37639,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/daemon.c linux-3.0.3/fs/cachefiles/daemon.c
                return cachefiles_daemon_range_error(cache, args);
  
        cache->bstop_percent = bstop;
-diff -urNp linux-3.0.3/fs/cachefiles/internal.h linux-3.0.3/fs/cachefiles/internal.h
---- linux-3.0.3/fs/cachefiles/internal.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/internal.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/internal.h linux-3.0.4/fs/cachefiles/internal.h
+--- linux-3.0.4/fs/cachefiles/internal.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/internal.h       2011-08-23 21:47:56.000000000 -0400
 @@ -57,7 +57,7 @@ struct cachefiles_cache {
        wait_queue_head_t               daemon_pollwq;  /* poll waitqueue for daemon */
        struct rb_root                  active_nodes;   /* active nodes (can't be culled) */
@@ -34923,9 +37676,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/internal.h linux-3.0.3/fs/cachefiles/intern
  }
  
  #else
-diff -urNp linux-3.0.3/fs/cachefiles/namei.c linux-3.0.3/fs/cachefiles/namei.c
---- linux-3.0.3/fs/cachefiles/namei.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/namei.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/namei.c linux-3.0.4/fs/cachefiles/namei.c
+--- linux-3.0.4/fs/cachefiles/namei.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/namei.c  2011-08-23 21:47:56.000000000 -0400
 @@ -318,7 +318,7 @@ try_again:
        /* first step is to make up a grave dentry in the graveyard */
        sprintf(nbuffer, "%08x%08x",
@@ -34935,9 +37688,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/namei.c linux-3.0.3/fs/cachefiles/namei.c
  
        /* do the multiway lock magic */
        trap = lock_rename(cache->graveyard, dir);
-diff -urNp linux-3.0.3/fs/cachefiles/proc.c linux-3.0.3/fs/cachefiles/proc.c
---- linux-3.0.3/fs/cachefiles/proc.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/proc.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/proc.c linux-3.0.4/fs/cachefiles/proc.c
+--- linux-3.0.4/fs/cachefiles/proc.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/proc.c   2011-08-23 21:47:56.000000000 -0400
 @@ -14,9 +14,9 @@
  #include <linux/seq_file.h>
  #include "internal.h"
@@ -34964,9 +37717,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/proc.c linux-3.0.3/fs/cachefiles/proc.c
                if (x == 0 && y == 0 && z == 0)
                        return 0;
  
-diff -urNp linux-3.0.3/fs/cachefiles/rdwr.c linux-3.0.3/fs/cachefiles/rdwr.c
---- linux-3.0.3/fs/cachefiles/rdwr.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cachefiles/rdwr.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cachefiles/rdwr.c linux-3.0.4/fs/cachefiles/rdwr.c
+--- linux-3.0.4/fs/cachefiles/rdwr.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cachefiles/rdwr.c   2011-08-23 21:47:56.000000000 -0400
 @@ -945,7 +945,7 @@ int cachefiles_write_page(struct fscache
                        old_fs = get_fs();
                        set_fs(KERNEL_DS);
@@ -34976,9 +37729,9 @@ diff -urNp linux-3.0.3/fs/cachefiles/rdwr.c linux-3.0.3/fs/cachefiles/rdwr.c
                        set_fs(old_fs);
                        kunmap(page);
                        if (ret != len)
-diff -urNp linux-3.0.3/fs/ceph/dir.c linux-3.0.3/fs/ceph/dir.c
---- linux-3.0.3/fs/ceph/dir.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ceph/dir.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ceph/dir.c linux-3.0.4/fs/ceph/dir.c
+--- linux-3.0.4/fs/ceph/dir.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ceph/dir.c  2011-08-23 21:47:56.000000000 -0400
 @@ -226,7 +226,7 @@ static int ceph_readdir(struct file *fil
        struct ceph_fs_client *fsc = ceph_inode_to_client(inode);
        struct ceph_mds_client *mdsc = fsc->mdsc;
@@ -34988,9 +37741,20 @@ diff -urNp linux-3.0.3/fs/ceph/dir.c linux-3.0.3/fs/ceph/dir.c
        int err;
        u32 ftype;
        struct ceph_mds_reply_info_parsed *rinfo;
-diff -urNp linux-3.0.3/fs/cifs/cifs_debug.c linux-3.0.3/fs/cifs/cifs_debug.c
---- linux-3.0.3/fs/cifs/cifs_debug.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cifs/cifs_debug.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/cifs_debug.c linux-3.0.4/fs/cifs/cifs_debug.c
+--- linux-3.0.4/fs/cifs/cifs_debug.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/cifs_debug.c   2011-08-25 17:18:05.000000000 -0400
+@@ -265,8 +265,8 @@ static ssize_t cifs_stats_proc_write(str
+ 
+       if (c == '1' || c == 'y' || c == 'Y' || c == '0') {
+ #ifdef CONFIG_CIFS_STATS2
+-              atomic_set(&totBufAllocCount, 0);
+-              atomic_set(&totSmBufAllocCount, 0);
++              atomic_set_unchecked(&totBufAllocCount, 0);
++              atomic_set_unchecked(&totSmBufAllocCount, 0);
+ #endif /* CONFIG_CIFS_STATS2 */
+               spin_lock(&cifs_tcp_ses_lock);
+               list_for_each(tmp1, &cifs_tcp_ses_list) {
 @@ -279,25 +279,25 @@ static ssize_t cifs_stats_proc_write(str
                                        tcon = list_entry(tmp3,
                                                          struct cifs_tcon,
@@ -35036,6 +37800,17 @@ diff -urNp linux-3.0.3/fs/cifs/cifs_debug.c linux-3.0.3/fs/cifs/cifs_debug.c
                                }
                        }
                }
+@@ -327,8 +327,8 @@ static int cifs_stats_proc_show(struct s
+                       smBufAllocCount.counter, cifs_min_small);
+ #ifdef CONFIG_CIFS_STATS2
+       seq_printf(m, "Total Large %d Small %d Allocations\n",
+-                              atomic_read(&totBufAllocCount),
+-                              atomic_read(&totSmBufAllocCount));
++                              atomic_read_unchecked(&totBufAllocCount),
++                              atomic_read_unchecked(&totSmBufAllocCount));
+ #endif /* CONFIG_CIFS_STATS2 */
+ 
+       seq_printf(m, "Operations (MIDs): %d\n", atomic_read(&midCount));
 @@ -357,41 +357,41 @@ static int cifs_stats_proc_show(struct s
                                if (tcon->need_reconnect)
                                        seq_puts(m, "\tDISCONNECTED ");
@@ -35098,9 +37873,41 @@ diff -urNp linux-3.0.3/fs/cifs/cifs_debug.c linux-3.0.3/fs/cifs/cifs_debug.c
                        }
                }
        }
-diff -urNp linux-3.0.3/fs/cifs/cifsglob.h linux-3.0.3/fs/cifs/cifsglob.h
---- linux-3.0.3/fs/cifs/cifsglob.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cifs/cifsglob.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/cifsfs.c linux-3.0.4/fs/cifs/cifsfs.c
+--- linux-3.0.4/fs/cifs/cifsfs.c       2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/cifs/cifsfs.c       2011-08-25 17:18:05.000000000 -0400
+@@ -994,7 +994,7 @@ cifs_init_request_bufs(void)
+       cifs_req_cachep = kmem_cache_create("cifs_request",
+                                           CIFSMaxBufSize +
+                                           MAX_CIFS_HDR_SIZE, 0,
+-                                          SLAB_HWCACHE_ALIGN, NULL);
++                                          SLAB_HWCACHE_ALIGN | SLAB_USERCOPY, NULL);
+       if (cifs_req_cachep == NULL)
+               return -ENOMEM;
+ 
+@@ -1021,7 +1021,7 @@ cifs_init_request_bufs(void)
+       efficient to alloc 1 per page off the slab compared to 17K (5page)
+       alloc of large cifs buffers even when page debugging is on */
+       cifs_sm_req_cachep = kmem_cache_create("cifs_small_rq",
+-                      MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN,
++                      MAX_CIFS_SMALL_BUFFER_SIZE, 0, SLAB_HWCACHE_ALIGN | SLAB_USERCOPY,
+                       NULL);
+       if (cifs_sm_req_cachep == NULL) {
+               mempool_destroy(cifs_req_poolp);
+@@ -1106,8 +1106,8 @@ init_cifs(void)
+       atomic_set(&bufAllocCount, 0);
+       atomic_set(&smBufAllocCount, 0);
+ #ifdef CONFIG_CIFS_STATS2
+-      atomic_set(&totBufAllocCount, 0);
+-      atomic_set(&totSmBufAllocCount, 0);
++      atomic_set_unchecked(&totBufAllocCount, 0);
++      atomic_set_unchecked(&totSmBufAllocCount, 0);
+ #endif /* CONFIG_CIFS_STATS2 */
+ 
+       atomic_set(&midCount, 0);
+diff -urNp linux-3.0.4/fs/cifs/cifsglob.h linux-3.0.4/fs/cifs/cifsglob.h
+--- linux-3.0.4/fs/cifs/cifsglob.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/cifsglob.h     2011-08-25 17:18:05.000000000 -0400
 @@ -381,28 +381,28 @@ struct cifs_tcon {
        __u16 Flags;            /* optional support bits */
        enum statusEnum tidStatus;
@@ -35161,9 +37968,20 @@ diff -urNp linux-3.0.3/fs/cifs/cifsglob.h linux-3.0.3/fs/cifs/cifsglob.h
  
  static inline void cifs_stats_bytes_written(struct cifs_tcon *tcon,
                                            unsigned int bytes)
-diff -urNp linux-3.0.3/fs/cifs/link.c linux-3.0.3/fs/cifs/link.c
---- linux-3.0.3/fs/cifs/link.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/cifs/link.c 2011-08-23 21:47:56.000000000 -0400
+@@ -911,8 +911,8 @@ GLOBAL_EXTERN atomic_t tconInfoReconnect
+ /* Various Debug counters */
+ GLOBAL_EXTERN atomic_t bufAllocCount;    /* current number allocated  */
+ #ifdef CONFIG_CIFS_STATS2
+-GLOBAL_EXTERN atomic_t totBufAllocCount; /* total allocated over all time */
+-GLOBAL_EXTERN atomic_t totSmBufAllocCount;
++GLOBAL_EXTERN atomic_unchecked_t totBufAllocCount; /* total allocated over all time */
++GLOBAL_EXTERN atomic_unchecked_t totSmBufAllocCount;
+ #endif
+ GLOBAL_EXTERN atomic_t smBufAllocCount;
+ GLOBAL_EXTERN atomic_t midCount;
+diff -urNp linux-3.0.4/fs/cifs/link.c linux-3.0.4/fs/cifs/link.c
+--- linux-3.0.4/fs/cifs/link.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/link.c 2011-08-23 21:47:56.000000000 -0400
 @@ -587,7 +587,7 @@ symlink_exit:
  
  void cifs_put_link(struct dentry *direntry, struct nameidata *nd, void *cookie)
@@ -35173,9 +37991,30 @@ diff -urNp linux-3.0.3/fs/cifs/link.c linux-3.0.3/fs/cifs/link.c
        if (!IS_ERR(p))
                kfree(p);
  }
-diff -urNp linux-3.0.3/fs/coda/cache.c linux-3.0.3/fs/coda/cache.c
---- linux-3.0.3/fs/coda/cache.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/coda/cache.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/cifs/misc.c linux-3.0.4/fs/cifs/misc.c
+--- linux-3.0.4/fs/cifs/misc.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/cifs/misc.c 2011-08-25 17:18:05.000000000 -0400
+@@ -156,7 +156,7 @@ cifs_buf_get(void)
+               memset(ret_buf, 0, sizeof(struct smb_hdr) + 3);
+               atomic_inc(&bufAllocCount);
+ #ifdef CONFIG_CIFS_STATS2
+-              atomic_inc(&totBufAllocCount);
++              atomic_inc_unchecked(&totBufAllocCount);
+ #endif /* CONFIG_CIFS_STATS2 */
+       }
+ 
+@@ -191,7 +191,7 @@ cifs_small_buf_get(void)
+       /*      memset(ret_buf, 0, sizeof(struct smb_hdr) + 27);*/
+               atomic_inc(&smBufAllocCount);
+ #ifdef CONFIG_CIFS_STATS2
+-              atomic_inc(&totSmBufAllocCount);
++              atomic_inc_unchecked(&totSmBufAllocCount);
+ #endif /* CONFIG_CIFS_STATS2 */
+ 
+       }
+diff -urNp linux-3.0.4/fs/coda/cache.c linux-3.0.4/fs/coda/cache.c
+--- linux-3.0.4/fs/coda/cache.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/coda/cache.c        2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@
  #include "coda_linux.h"
  #include "coda_cache.h"
@@ -35220,9 +38059,9 @@ diff -urNp linux-3.0.3/fs/coda/cache.c linux-3.0.3/fs/coda/cache.c
        spin_unlock(&cii->c_lock);
  
        return hit;
-diff -urNp linux-3.0.3/fs/compat_binfmt_elf.c linux-3.0.3/fs/compat_binfmt_elf.c
---- linux-3.0.3/fs/compat_binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/compat_binfmt_elf.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/compat_binfmt_elf.c linux-3.0.4/fs/compat_binfmt_elf.c
+--- linux-3.0.4/fs/compat_binfmt_elf.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/compat_binfmt_elf.c 2011-08-23 21:47:56.000000000 -0400
 @@ -30,11 +30,13 @@
  #undef        elf_phdr
  #undef        elf_shdr
@@ -35237,9 +38076,9 @@ diff -urNp linux-3.0.3/fs/compat_binfmt_elf.c linux-3.0.3/fs/compat_binfmt_elf.c
  #define elf_addr_t    Elf32_Addr
  
  /*
-diff -urNp linux-3.0.3/fs/compat.c linux-3.0.3/fs/compat.c
---- linux-3.0.3/fs/compat.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/compat.c    2011-08-23 22:49:33.000000000 -0400
+diff -urNp linux-3.0.4/fs/compat.c linux-3.0.4/fs/compat.c
+--- linux-3.0.4/fs/compat.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/compat.c    2011-08-23 22:49:33.000000000 -0400
 @@ -566,7 +566,7 @@ ssize_t compat_rw_copy_check_uvector(int
                goto out;
  
@@ -35339,9 +38178,9 @@ diff -urNp linux-3.0.3/fs/compat.c linux-3.0.3/fs/compat.c
        if (n < 0)
                goto out_nofds;
  
-diff -urNp linux-3.0.3/fs/compat_ioctl.c linux-3.0.3/fs/compat_ioctl.c
---- linux-3.0.3/fs/compat_ioctl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/compat_ioctl.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/compat_ioctl.c linux-3.0.4/fs/compat_ioctl.c
+--- linux-3.0.4/fs/compat_ioctl.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/compat_ioctl.c      2011-08-23 21:47:56.000000000 -0400
 @@ -208,6 +208,8 @@ static int do_video_set_spu_palette(unsi
  
        err  = get_user(palp, &up->palette);
@@ -35362,9 +38201,9 @@ diff -urNp linux-3.0.3/fs/compat_ioctl.c linux-3.0.3/fs/compat_ioctl.c
        if (a > b)
                return 1;
        if (a < b)
-diff -urNp linux-3.0.3/fs/configfs/dir.c linux-3.0.3/fs/configfs/dir.c
---- linux-3.0.3/fs/configfs/dir.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/configfs/dir.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/configfs/dir.c linux-3.0.4/fs/configfs/dir.c
+--- linux-3.0.4/fs/configfs/dir.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/configfs/dir.c      2011-08-23 21:47:56.000000000 -0400
 @@ -1575,7 +1575,8 @@ static int configfs_readdir(struct file 
                        }
                        for (p=q->next; p!= &parent_sd->s_children; p=p->next) {
@@ -35389,9 +38228,9 @@ diff -urNp linux-3.0.3/fs/configfs/dir.c linux-3.0.3/fs/configfs/dir.c
  
                                /*
                                 * We'll have a dentry and an inode for
-diff -urNp linux-3.0.3/fs/dcache.c linux-3.0.3/fs/dcache.c
---- linux-3.0.3/fs/dcache.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/dcache.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/dcache.c linux-3.0.4/fs/dcache.c
+--- linux-3.0.4/fs/dcache.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/dcache.c    2011-08-23 21:47:56.000000000 -0400
 @@ -3089,7 +3089,7 @@ void __init vfs_caches_init(unsigned lon
        mempages -= reserve;
  
@@ -35401,9 +38240,9 @@ diff -urNp linux-3.0.3/fs/dcache.c linux-3.0.3/fs/dcache.c
  
        dcache_init();
        inode_init();
-diff -urNp linux-3.0.3/fs/ecryptfs/inode.c linux-3.0.3/fs/ecryptfs/inode.c
---- linux-3.0.3/fs/ecryptfs/inode.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/ecryptfs/inode.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ecryptfs/inode.c linux-3.0.4/fs/ecryptfs/inode.c
+--- linux-3.0.4/fs/ecryptfs/inode.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/ecryptfs/inode.c    2011-08-23 21:47:56.000000000 -0400
 @@ -704,7 +704,7 @@ static int ecryptfs_readlink_lower(struc
        old_fs = get_fs();
        set_fs(get_ds());
@@ -35431,9 +38270,9 @@ diff -urNp linux-3.0.3/fs/ecryptfs/inode.c linux-3.0.3/fs/ecryptfs/inode.c
        if (!IS_ERR(buf)) {
                /* Free the char* */
                kfree(buf);
-diff -urNp linux-3.0.3/fs/ecryptfs/miscdev.c linux-3.0.3/fs/ecryptfs/miscdev.c
---- linux-3.0.3/fs/ecryptfs/miscdev.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ecryptfs/miscdev.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ecryptfs/miscdev.c linux-3.0.4/fs/ecryptfs/miscdev.c
+--- linux-3.0.4/fs/ecryptfs/miscdev.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ecryptfs/miscdev.c  2011-08-23 21:47:56.000000000 -0400
 @@ -328,7 +328,7 @@ check_list:
                goto out_unlock_msg_ctx;
        i = 5;
@@ -35443,9 +38282,9 @@ diff -urNp linux-3.0.3/fs/ecryptfs/miscdev.c linux-3.0.3/fs/ecryptfs/miscdev.c
                        goto out_unlock_msg_ctx;
                i += packet_length_size;
                if (copy_to_user(&buf[i], msg_ctx->msg, msg_ctx->msg_size))
-diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
---- linux-3.0.3/fs/exec.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/exec.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/exec.c linux-3.0.4/fs/exec.c
+--- linux-3.0.4/fs/exec.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/exec.c      2011-08-25 17:26:58.000000000 -0400
 @@ -55,12 +55,24 @@
  #include <linux/pipe_fs_i.h>
  #include <linux/oom.h>
@@ -35668,7 +38507,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
                bprm->unsafe |= LSM_UNSAFE_SHARE;
        } else {
                res = -EAGAIN;
-@@ -1428,6 +1445,11 @@ static int do_execve_common(const char *
+@@ -1428,11 +1445,35 @@ static int do_execve_common(const char *
                                struct user_arg_ptr envp,
                                struct pt_regs *regs)
  {
@@ -35680,7 +38519,31 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        struct linux_binprm *bprm;
        struct file *file;
        struct files_struct *displaced;
-@@ -1464,6 +1486,23 @@ static int do_execve_common(const char *
+       bool clear_in_exec;
+       int retval;
++      const struct cred *cred = current_cred();
++
++      gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
++
++      /*
++       * We move the actual failure in case of RLIMIT_NPROC excess from
++       * set*uid() to execve() because too many poorly written programs
++       * don't check setuid() return code.  Here we additionally recheck
++       * whether NPROC limit is still exceeded.
++       */
++      if ((current->flags & PF_NPROC_EXCEEDED) &&
++          atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) {
++              retval = -EAGAIN;
++              goto out_ret;
++      }
++
++      /* We're below the limit (still or again), so we don't want to make
++       * further execve() calls fail. */
++      current->flags &= ~PF_NPROC_EXCEEDED;
+ 
+       retval = unshare_files(&displaced);
+       if (retval)
+@@ -1464,6 +1505,16 @@ static int do_execve_common(const char *
        bprm->filename = filename;
        bprm->interp = filename;
  
@@ -35689,13 +38552,6 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
 +              goto out_file;
 +      }
 +
-+      gr_learn_resource(current, RLIMIT_NPROC, atomic_read(&current->cred->user->processes), 1);
-+
-+      if (gr_handle_nproc()) {
-+              retval = -EAGAIN;
-+              goto out_file;
-+      }
-+
 +      if (!gr_acl_handle_execve(file->f_dentry, file->f_vfsmnt)) {
 +              retval = -EACCES;
 +              goto out_file;
@@ -35704,7 +38560,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        retval = bprm_mm_init(bprm);
        if (retval)
                goto out_file;
-@@ -1493,9 +1532,40 @@ static int do_execve_common(const char *
+@@ -1493,9 +1544,40 @@ static int do_execve_common(const char *
        if (retval < 0)
                goto out;
  
@@ -35746,7 +38602,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
  
        /* execve succeeded */
        current->fs->in_exec = 0;
-@@ -1506,6 +1576,14 @@ static int do_execve_common(const char *
+@@ -1506,6 +1588,14 @@ static int do_execve_common(const char *
                put_files_struct(displaced);
        return retval;
  
@@ -35761,7 +38617,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
  out:
        if (bprm->mm) {
                acct_arg_size(bprm, 0);
-@@ -1579,7 +1657,7 @@ static int expand_corename(struct core_n
+@@ -1579,7 +1669,7 @@ static int expand_corename(struct core_n
  {
        char *old_corename = cn->corename;
  
@@ -35770,7 +38626,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        cn->corename = krealloc(old_corename, cn->size, GFP_KERNEL);
  
        if (!cn->corename) {
-@@ -1667,7 +1745,7 @@ static int format_corename(struct core_n
+@@ -1667,7 +1757,7 @@ static int format_corename(struct core_n
        int pid_in_pattern = 0;
        int err = 0;
  
@@ -35779,7 +38635,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        cn->corename = kmalloc(cn->size, GFP_KERNEL);
        cn->used = 0;
  
-@@ -1758,6 +1836,219 @@ out:
+@@ -1758,6 +1848,219 @@ out:
        return ispipe;
  }
  
@@ -35999,7 +38855,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
  static int zap_process(struct task_struct *start, int exit_code)
  {
        struct task_struct *t;
-@@ -1969,17 +2260,17 @@ static void wait_for_dump_helpers(struct
+@@ -1969,17 +2272,17 @@ static void wait_for_dump_helpers(struct
        pipe = file->f_path.dentry->d_inode->i_pipe;
  
        pipe_lock(pipe);
@@ -36022,7 +38878,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        pipe_unlock(pipe);
  
  }
-@@ -2040,7 +2331,7 @@ void do_coredump(long signr, int exit_co
+@@ -2040,7 +2343,7 @@ void do_coredump(long signr, int exit_co
        int retval = 0;
        int flag = 0;
        int ispipe;
@@ -36031,7 +38887,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        struct coredump_params cprm = {
                .signr = signr,
                .regs = regs,
-@@ -2055,6 +2346,9 @@ void do_coredump(long signr, int exit_co
+@@ -2055,6 +2358,9 @@ void do_coredump(long signr, int exit_co
  
        audit_core_dumps(signr);
  
@@ -36041,7 +38897,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        binfmt = mm->binfmt;
        if (!binfmt || !binfmt->core_dump)
                goto fail;
-@@ -2095,6 +2389,8 @@ void do_coredump(long signr, int exit_co
+@@ -2095,6 +2401,8 @@ void do_coredump(long signr, int exit_co
                goto fail_corename;
        }
  
@@ -36050,7 +38906,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
        if (ispipe) {
                int dump_count;
                char **helper_argv;
-@@ -2122,7 +2418,7 @@ void do_coredump(long signr, int exit_co
+@@ -2122,7 +2430,7 @@ void do_coredump(long signr, int exit_co
                }
                cprm.limit = RLIM_INFINITY;
  
@@ -36059,7 +38915,7 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
                if (core_pipe_limit && (core_pipe_limit < dump_count)) {
                        printk(KERN_WARNING "Pid %d(%s) over core_pipe_limit\n",
                               task_tgid_vnr(current), current->comm);
-@@ -2192,7 +2488,7 @@ close_fail:
+@@ -2192,7 +2500,7 @@ close_fail:
                filp_close(cprm.file, NULL);
  fail_dropcount:
        if (ispipe)
@@ -36068,9 +38924,9 @@ diff -urNp linux-3.0.3/fs/exec.c linux-3.0.3/fs/exec.c
  fail_unlock:
        kfree(cn.corename);
  fail_corename:
-diff -urNp linux-3.0.3/fs/ext2/balloc.c linux-3.0.3/fs/ext2/balloc.c
---- linux-3.0.3/fs/ext2/balloc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ext2/balloc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext2/balloc.c linux-3.0.4/fs/ext2/balloc.c
+--- linux-3.0.4/fs/ext2/balloc.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ext2/balloc.c       2011-08-23 21:48:14.000000000 -0400
 @@ -1192,7 +1192,7 @@ static int ext2_has_free_blocks(struct e
  
        free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -36080,9 +38936,9 @@ diff -urNp linux-3.0.3/fs/ext2/balloc.c linux-3.0.3/fs/ext2/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-3.0.3/fs/ext3/balloc.c linux-3.0.3/fs/ext3/balloc.c
---- linux-3.0.3/fs/ext3/balloc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ext3/balloc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext3/balloc.c linux-3.0.4/fs/ext3/balloc.c
+--- linux-3.0.4/fs/ext3/balloc.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ext3/balloc.c       2011-08-23 21:48:14.000000000 -0400
 @@ -1441,7 +1441,7 @@ static int ext3_has_free_blocks(struct e
  
        free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);
@@ -36092,9 +38948,9 @@ diff -urNp linux-3.0.3/fs/ext3/balloc.c linux-3.0.3/fs/ext3/balloc.c
                sbi->s_resuid != current_fsuid() &&
                (sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {
                return 0;
-diff -urNp linux-3.0.3/fs/ext4/balloc.c linux-3.0.3/fs/ext4/balloc.c
---- linux-3.0.3/fs/ext4/balloc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ext4/balloc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext4/balloc.c linux-3.0.4/fs/ext4/balloc.c
+--- linux-3.0.4/fs/ext4/balloc.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ext4/balloc.c       2011-08-23 21:48:14.000000000 -0400
 @@ -394,8 +394,8 @@ static int ext4_has_free_blocks(struct e
        /* Hm, nope.  Are (enough) root reserved blocks available? */
        if (sbi->s_resuid == current_fsuid() ||
@@ -36106,9 +38962,9 @@ diff -urNp linux-3.0.3/fs/ext4/balloc.c linux-3.0.3/fs/ext4/balloc.c
  
                if (free_blocks >= (nblocks + dirty_blocks))
                        return 1;
-diff -urNp linux-3.0.3/fs/ext4/ext4.h linux-3.0.3/fs/ext4/ext4.h
---- linux-3.0.3/fs/ext4/ext4.h 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/ext4/ext4.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext4/ext4.h linux-3.0.4/fs/ext4/ext4.h
+--- linux-3.0.4/fs/ext4/ext4.h 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/ext4/ext4.h 2011-08-23 21:47:56.000000000 -0400
 @@ -1177,19 +1177,19 @@ struct ext4_sb_info {
        unsigned long s_mb_last_start;
  
@@ -36139,9 +38995,9 @@ diff -urNp linux-3.0.3/fs/ext4/ext4.h linux-3.0.3/fs/ext4/ext4.h
        atomic_t s_lock_busy;
  
        /* locality groups */
-diff -urNp linux-3.0.3/fs/ext4/mballoc.c linux-3.0.3/fs/ext4/mballoc.c
---- linux-3.0.3/fs/ext4/mballoc.c      2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/ext4/mballoc.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ext4/mballoc.c linux-3.0.4/fs/ext4/mballoc.c
+--- linux-3.0.4/fs/ext4/mballoc.c      2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/ext4/mballoc.c      2011-08-23 21:48:14.000000000 -0400
 @@ -1793,7 +1793,7 @@ void ext4_mb_simple_scan_group(struct ex
                BUG_ON(ac->ac_b_ex.fe_len != ac->ac_g_ex.fe_len);
  
@@ -36264,9 +39120,9 @@ diff -urNp linux-3.0.3/fs/ext4/mballoc.c linux-3.0.3/fs/ext4/mballoc.c
        trace_ext4_mballoc_discard(sb, NULL, group, bit, pa->pa_len);
  
        return 0;
-diff -urNp linux-3.0.3/fs/fcntl.c linux-3.0.3/fs/fcntl.c
---- linux-3.0.3/fs/fcntl.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fcntl.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/fcntl.c linux-3.0.4/fs/fcntl.c
+--- linux-3.0.4/fs/fcntl.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fcntl.c     2011-08-23 21:48:14.000000000 -0400
 @@ -224,6 +224,11 @@ int __f_setown(struct file *filp, struct
        if (err)
                return err;
@@ -36304,9 +39160,9 @@ diff -urNp linux-3.0.3/fs/fcntl.c linux-3.0.3/fs/fcntl.c
                ));
  
        fasync_cache = kmem_cache_create("fasync_cache",
-diff -urNp linux-3.0.3/fs/fifo.c linux-3.0.3/fs/fifo.c
---- linux-3.0.3/fs/fifo.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fifo.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fifo.c linux-3.0.4/fs/fifo.c
+--- linux-3.0.4/fs/fifo.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fifo.c      2011-08-23 21:47:56.000000000 -0400
 @@ -58,10 +58,10 @@ static int fifo_open(struct inode *inode
         */
                filp->f_op = &read_pipefifo_fops;
@@ -36377,9 +39233,9 @@ diff -urNp linux-3.0.3/fs/fifo.c linux-3.0.3/fs/fifo.c
                free_pipe_info(inode);
  
  err_nocleanup:
-diff -urNp linux-3.0.3/fs/file.c linux-3.0.3/fs/file.c
---- linux-3.0.3/fs/file.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/file.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/file.c linux-3.0.4/fs/file.c
+--- linux-3.0.4/fs/file.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/file.c      2011-08-23 21:48:14.000000000 -0400
 @@ -15,6 +15,7 @@
  #include <linux/slab.h>
  #include <linux/vmalloc.h>
@@ -36396,9 +39252,9 @@ diff -urNp linux-3.0.3/fs/file.c linux-3.0.3/fs/file.c
        if (nr >= rlimit(RLIMIT_NOFILE))
                return -EMFILE;
  
-diff -urNp linux-3.0.3/fs/filesystems.c linux-3.0.3/fs/filesystems.c
---- linux-3.0.3/fs/filesystems.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/filesystems.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/filesystems.c linux-3.0.4/fs/filesystems.c
+--- linux-3.0.4/fs/filesystems.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/filesystems.c       2011-08-23 21:48:14.000000000 -0400
 @@ -274,7 +274,12 @@ struct file_system_type *get_fs_type(con
        int len = dot ? dot - name : strlen(name);
  
@@ -36412,9 +39268,9 @@ diff -urNp linux-3.0.3/fs/filesystems.c linux-3.0.3/fs/filesystems.c
                fs = __get_fs_type(name, len);
  
        if (dot && fs && !(fs->fs_flags & FS_HAS_SUBTYPE)) {
-diff -urNp linux-3.0.3/fs/fscache/cookie.c linux-3.0.3/fs/fscache/cookie.c
---- linux-3.0.3/fs/fscache/cookie.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/cookie.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/cookie.c linux-3.0.4/fs/fscache/cookie.c
+--- linux-3.0.4/fs/fscache/cookie.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/cookie.c    2011-08-23 21:47:56.000000000 -0400
 @@ -68,11 +68,11 @@ struct fscache_cookie *__fscache_acquire
               parent ? (char *) parent->def->name : "<no-parent>",
               def->name, netfs_data);
@@ -36533,9 +39389,9 @@ diff -urNp linux-3.0.3/fs/fscache/cookie.c linux-3.0.3/fs/fscache/cookie.c
                wait_on_bit(&cookie->flags, FSCACHE_COOKIE_CREATING,
                            fscache_wait_bit, TASK_UNINTERRUPTIBLE);
        }
-diff -urNp linux-3.0.3/fs/fscache/internal.h linux-3.0.3/fs/fscache/internal.h
---- linux-3.0.3/fs/fscache/internal.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/internal.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/internal.h linux-3.0.4/fs/fscache/internal.h
+--- linux-3.0.4/fs/fscache/internal.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/internal.h  2011-08-23 21:47:56.000000000 -0400
 @@ -144,94 +144,94 @@ extern void fscache_proc_cleanup(void);
  extern atomic_t fscache_n_ops_processed[FSCACHE_MAX_THREADS];
  extern atomic_t fscache_n_objs_processed[FSCACHE_MAX_THREADS];
@@ -36739,9 +39595,9 @@ diff -urNp linux-3.0.3/fs/fscache/internal.h linux-3.0.3/fs/fscache/internal.h
  #define fscache_stat_d(stat) do {} while (0)
  #endif
  
-diff -urNp linux-3.0.3/fs/fscache/object.c linux-3.0.3/fs/fscache/object.c
---- linux-3.0.3/fs/fscache/object.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/object.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/object.c linux-3.0.4/fs/fscache/object.c
+--- linux-3.0.4/fs/fscache/object.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/object.c    2011-08-23 21:47:56.000000000 -0400
 @@ -128,7 +128,7 @@ static void fscache_object_state_machine
                /* update the object metadata on disk */
        case FSCACHE_OBJECT_UPDATING:
@@ -36853,9 +39709,9 @@ diff -urNp linux-3.0.3/fs/fscache/object.c linux-3.0.3/fs/fscache/object.c
                break;
  
        default:
-diff -urNp linux-3.0.3/fs/fscache/operation.c linux-3.0.3/fs/fscache/operation.c
---- linux-3.0.3/fs/fscache/operation.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/operation.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/operation.c linux-3.0.4/fs/fscache/operation.c
+--- linux-3.0.4/fs/fscache/operation.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/operation.c 2011-08-23 21:47:56.000000000 -0400
 @@ -17,7 +17,7 @@
  #include <linux/slab.h>
  #include "internal.h"
@@ -36971,9 +39827,9 @@ diff -urNp linux-3.0.3/fs/fscache/operation.c linux-3.0.3/fs/fscache/operation.c
  
                ASSERTCMP(atomic_read(&op->usage), ==, 0);
  
-diff -urNp linux-3.0.3/fs/fscache/page.c linux-3.0.3/fs/fscache/page.c
---- linux-3.0.3/fs/fscache/page.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/page.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/page.c linux-3.0.4/fs/fscache/page.c
+--- linux-3.0.4/fs/fscache/page.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/page.c      2011-08-23 21:47:56.000000000 -0400
 @@ -60,7 +60,7 @@ bool __fscache_maybe_release_page(struct
        val = radix_tree_lookup(&cookie->stores, page->index);
        if (!val) {
@@ -37357,9 +40213,9 @@ diff -urNp linux-3.0.3/fs/fscache/page.c linux-3.0.3/fs/fscache/page.c
  #endif
  
        for (loop = 0; loop < pagevec->nr; loop++) {
-diff -urNp linux-3.0.3/fs/fscache/stats.c linux-3.0.3/fs/fscache/stats.c
---- linux-3.0.3/fs/fscache/stats.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fscache/stats.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fscache/stats.c linux-3.0.4/fs/fscache/stats.c
+--- linux-3.0.4/fs/fscache/stats.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fscache/stats.c     2011-08-23 21:47:56.000000000 -0400
 @@ -18,95 +18,95 @@
  /*
   * operation counters
@@ -37735,9 +40591,9 @@ diff -urNp linux-3.0.3/fs/fscache/stats.c linux-3.0.3/fs/fscache/stats.c
  
        seq_printf(m, "CacheOp: alo=%d luo=%d luc=%d gro=%d\n",
                   atomic_read(&fscache_n_cop_alloc_object),
-diff -urNp linux-3.0.3/fs/fs_struct.c linux-3.0.3/fs/fs_struct.c
---- linux-3.0.3/fs/fs_struct.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fs_struct.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/fs_struct.c linux-3.0.4/fs/fs_struct.c
+--- linux-3.0.4/fs/fs_struct.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fs_struct.c 2011-08-23 21:48:14.000000000 -0400
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -37827,9 +40683,9 @@ diff -urNp linux-3.0.3/fs/fs_struct.c linux-3.0.3/fs/fs_struct.c
                spin_unlock(&fs->lock);
  
                task_unlock(current);
-diff -urNp linux-3.0.3/fs/fuse/cuse.c linux-3.0.3/fs/fuse/cuse.c
---- linux-3.0.3/fs/fuse/cuse.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fuse/cuse.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fuse/cuse.c linux-3.0.4/fs/fuse/cuse.c
+--- linux-3.0.4/fs/fuse/cuse.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fuse/cuse.c 2011-08-23 21:47:56.000000000 -0400
 @@ -586,10 +586,12 @@ static int __init cuse_init(void)
                INIT_LIST_HEAD(&cuse_conntbl[i]);
  
@@ -37847,9 +40703,9 @@ diff -urNp linux-3.0.3/fs/fuse/cuse.c linux-3.0.3/fs/fuse/cuse.c
  
        cuse_class = class_create(THIS_MODULE, "cuse");
        if (IS_ERR(cuse_class))
-diff -urNp linux-3.0.3/fs/fuse/dev.c linux-3.0.3/fs/fuse/dev.c
---- linux-3.0.3/fs/fuse/dev.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fuse/dev.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fuse/dev.c linux-3.0.4/fs/fuse/dev.c
+--- linux-3.0.4/fs/fuse/dev.c  2011-08-29 23:26:14.000000000 -0400
++++ linux-3.0.4/fs/fuse/dev.c  2011-08-29 23:26:27.000000000 -0400
 @@ -1238,7 +1238,7 @@ static ssize_t fuse_dev_splice_read(stru
        ret = 0;
        pipe_lock(pipe);
@@ -37859,9 +40715,9 @@ diff -urNp linux-3.0.3/fs/fuse/dev.c linux-3.0.3/fs/fuse/dev.c
                send_sig(SIGPIPE, current, 0);
                if (!ret)
                        ret = -EPIPE;
-diff -urNp linux-3.0.3/fs/fuse/dir.c linux-3.0.3/fs/fuse/dir.c
---- linux-3.0.3/fs/fuse/dir.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/fuse/dir.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/fuse/dir.c linux-3.0.4/fs/fuse/dir.c
+--- linux-3.0.4/fs/fuse/dir.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/fuse/dir.c  2011-08-23 21:47:56.000000000 -0400
 @@ -1148,7 +1148,7 @@ static char *read_link(struct dentry *de
        return link;
  }
@@ -37871,9 +40727,9 @@ diff -urNp linux-3.0.3/fs/fuse/dir.c linux-3.0.3/fs/fuse/dir.c
  {
        if (!IS_ERR(link))
                free_page((unsigned long) link);
-diff -urNp linux-3.0.3/fs/gfs2/inode.c linux-3.0.3/fs/gfs2/inode.c
---- linux-3.0.3/fs/gfs2/inode.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/gfs2/inode.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/gfs2/inode.c linux-3.0.4/fs/gfs2/inode.c
+--- linux-3.0.4/fs/gfs2/inode.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/gfs2/inode.c        2011-08-23 21:47:56.000000000 -0400
 @@ -1525,7 +1525,7 @@ out:
  
  static void gfs2_put_link(struct dentry *dentry, struct nameidata *nd, void *p)
@@ -37883,9 +40739,9 @@ diff -urNp linux-3.0.3/fs/gfs2/inode.c linux-3.0.3/fs/gfs2/inode.c
        if (!IS_ERR(s))
                kfree(s);
  }
-diff -urNp linux-3.0.3/fs/hfsplus/catalog.c linux-3.0.3/fs/hfsplus/catalog.c
---- linux-3.0.3/fs/hfsplus/catalog.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/catalog.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/catalog.c linux-3.0.4/fs/hfsplus/catalog.c
+--- linux-3.0.4/fs/hfsplus/catalog.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/catalog.c   2011-08-23 21:48:14.000000000 -0400
 @@ -179,6 +179,8 @@ int hfsplus_find_cat(struct super_block 
        int err;
        u16 type;
@@ -37913,9 +40769,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/catalog.c linux-3.0.3/fs/hfsplus/catalog.c
        dprint(DBG_CAT_MOD, "rename_cat: %u - %lu,%s - %lu,%s\n",
                cnid, src_dir->i_ino, src_name->name,
                dst_dir->i_ino, dst_name->name);
-diff -urNp linux-3.0.3/fs/hfsplus/dir.c linux-3.0.3/fs/hfsplus/dir.c
---- linux-3.0.3/fs/hfsplus/dir.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/dir.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/dir.c linux-3.0.4/fs/hfsplus/dir.c
+--- linux-3.0.4/fs/hfsplus/dir.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/dir.c       2011-08-23 21:48:14.000000000 -0400
 @@ -129,6 +129,8 @@ static int hfsplus_readdir(struct file *
        struct hfsplus_readdir_data *rd;
        u16 type;
@@ -37925,9 +40781,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/dir.c linux-3.0.3/fs/hfsplus/dir.c
        if (filp->f_pos >= inode->i_size)
                return 0;
  
-diff -urNp linux-3.0.3/fs/hfsplus/inode.c linux-3.0.3/fs/hfsplus/inode.c
---- linux-3.0.3/fs/hfsplus/inode.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/inode.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/inode.c linux-3.0.4/fs/hfsplus/inode.c
+--- linux-3.0.4/fs/hfsplus/inode.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/inode.c     2011-08-23 21:48:14.000000000 -0400
 @@ -489,6 +489,8 @@ int hfsplus_cat_read_inode(struct inode 
        int res = 0;
        u16 type;
@@ -37946,9 +40802,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/inode.c linux-3.0.3/fs/hfsplus/inode.c
        if (HFSPLUS_IS_RSRC(inode))
                main_inode = HFSPLUS_I(inode)->rsrc_inode;
  
-diff -urNp linux-3.0.3/fs/hfsplus/ioctl.c linux-3.0.3/fs/hfsplus/ioctl.c
---- linux-3.0.3/fs/hfsplus/ioctl.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/ioctl.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/ioctl.c linux-3.0.4/fs/hfsplus/ioctl.c
+--- linux-3.0.4/fs/hfsplus/ioctl.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/ioctl.c     2011-08-23 21:48:14.000000000 -0400
 @@ -122,6 +122,8 @@ int hfsplus_setxattr(struct dentry *dent
        struct hfsplus_cat_file *file;
        int res;
@@ -37967,9 +40823,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/ioctl.c linux-3.0.3/fs/hfsplus/ioctl.c
        if (!S_ISREG(inode->i_mode) || HFSPLUS_IS_RSRC(inode))
                return -EOPNOTSUPP;
  
-diff -urNp linux-3.0.3/fs/hfsplus/super.c linux-3.0.3/fs/hfsplus/super.c
---- linux-3.0.3/fs/hfsplus/super.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hfsplus/super.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hfsplus/super.c linux-3.0.4/fs/hfsplus/super.c
+--- linux-3.0.4/fs/hfsplus/super.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hfsplus/super.c     2011-08-23 21:48:14.000000000 -0400
 @@ -340,6 +340,8 @@ static int hfsplus_fill_super(struct sup
        struct nls_table *nls = NULL;
        int err;
@@ -37979,9 +40835,9 @@ diff -urNp linux-3.0.3/fs/hfsplus/super.c linux-3.0.3/fs/hfsplus/super.c
        err = -EINVAL;
        sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
        if (!sbi)
-diff -urNp linux-3.0.3/fs/hugetlbfs/inode.c linux-3.0.3/fs/hugetlbfs/inode.c
---- linux-3.0.3/fs/hugetlbfs/inode.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/hugetlbfs/inode.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/hugetlbfs/inode.c linux-3.0.4/fs/hugetlbfs/inode.c
+--- linux-3.0.4/fs/hugetlbfs/inode.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/hugetlbfs/inode.c   2011-08-23 21:48:14.000000000 -0400
 @@ -914,7 +914,7 @@ static struct file_system_type hugetlbfs
        .kill_sb        = kill_litter_super,
  };
@@ -37991,9 +40847,9 @@ diff -urNp linux-3.0.3/fs/hugetlbfs/inode.c linux-3.0.3/fs/hugetlbfs/inode.c
  
  static int can_do_hugetlb_shm(void)
  {
-diff -urNp linux-3.0.3/fs/inode.c linux-3.0.3/fs/inode.c
---- linux-3.0.3/fs/inode.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/inode.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/inode.c linux-3.0.4/fs/inode.c
+--- linux-3.0.4/fs/inode.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/inode.c     2011-08-23 21:47:56.000000000 -0400
 @@ -829,8 +829,8 @@ unsigned int get_next_ino(void)
  
  #ifdef CONFIG_SMP
@@ -38005,9 +40861,9 @@ diff -urNp linux-3.0.3/fs/inode.c linux-3.0.3/fs/inode.c
  
                res = next - LAST_INO_BATCH;
        }
-diff -urNp linux-3.0.3/fs/jbd/checkpoint.c linux-3.0.3/fs/jbd/checkpoint.c
---- linux-3.0.3/fs/jbd/checkpoint.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jbd/checkpoint.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jbd/checkpoint.c linux-3.0.4/fs/jbd/checkpoint.c
+--- linux-3.0.4/fs/jbd/checkpoint.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jbd/checkpoint.c    2011-08-23 21:48:14.000000000 -0400
 @@ -350,6 +350,8 @@ int log_do_checkpoint(journal_t *journal
        tid_t this_tid;
        int result;
@@ -38017,9 +40873,9 @@ diff -urNp linux-3.0.3/fs/jbd/checkpoint.c linux-3.0.3/fs/jbd/checkpoint.c
        jbd_debug(1, "Start checkpoint\n");
  
        /*
-diff -urNp linux-3.0.3/fs/jffs2/compr_rtime.c linux-3.0.3/fs/jffs2/compr_rtime.c
---- linux-3.0.3/fs/jffs2/compr_rtime.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/compr_rtime.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/compr_rtime.c linux-3.0.4/fs/jffs2/compr_rtime.c
+--- linux-3.0.4/fs/jffs2/compr_rtime.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/compr_rtime.c 2011-08-23 21:48:14.000000000 -0400
 @@ -37,6 +37,8 @@ static int jffs2_rtime_compress(unsigned
        int outpos = 0;
        int pos=0;
@@ -38038,9 +40894,9 @@ diff -urNp linux-3.0.3/fs/jffs2/compr_rtime.c linux-3.0.3/fs/jffs2/compr_rtime.c
        memset(positions,0,sizeof(positions));
  
        while (outpos<destlen) {
-diff -urNp linux-3.0.3/fs/jffs2/compr_rubin.c linux-3.0.3/fs/jffs2/compr_rubin.c
---- linux-3.0.3/fs/jffs2/compr_rubin.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/compr_rubin.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/compr_rubin.c linux-3.0.4/fs/jffs2/compr_rubin.c
+--- linux-3.0.4/fs/jffs2/compr_rubin.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/compr_rubin.c 2011-08-23 21:48:14.000000000 -0400
 @@ -314,6 +314,8 @@ static int jffs2_dynrubin_compress(unsig
        int ret;
        uint32_t mysrclen, mydstlen;
@@ -38050,9 +40906,9 @@ diff -urNp linux-3.0.3/fs/jffs2/compr_rubin.c linux-3.0.3/fs/jffs2/compr_rubin.c
        mysrclen = *sourcelen;
        mydstlen = *dstlen - 8;
  
-diff -urNp linux-3.0.3/fs/jffs2/erase.c linux-3.0.3/fs/jffs2/erase.c
---- linux-3.0.3/fs/jffs2/erase.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/erase.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/erase.c linux-3.0.4/fs/jffs2/erase.c
+--- linux-3.0.4/fs/jffs2/erase.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/erase.c       2011-08-23 21:47:56.000000000 -0400
 @@ -439,7 +439,8 @@ static void jffs2_mark_erased_block(stru
                struct jffs2_unknown_node marker = {
                        .magic =        cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -38063,9 +40919,9 @@ diff -urNp linux-3.0.3/fs/jffs2/erase.c linux-3.0.3/fs/jffs2/erase.c
                };
  
                jffs2_prealloc_raw_node_refs(c, jeb, 1);
-diff -urNp linux-3.0.3/fs/jffs2/wbuf.c linux-3.0.3/fs/jffs2/wbuf.c
---- linux-3.0.3/fs/jffs2/wbuf.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/wbuf.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/wbuf.c linux-3.0.4/fs/jffs2/wbuf.c
+--- linux-3.0.4/fs/jffs2/wbuf.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/wbuf.c        2011-08-23 21:47:56.000000000 -0400
 @@ -1012,7 +1012,8 @@ static const struct jffs2_unknown_node o
  {
        .magic = constant_cpu_to_je16(JFFS2_MAGIC_BITMASK),
@@ -38076,9 +40932,9 @@ diff -urNp linux-3.0.3/fs/jffs2/wbuf.c linux-3.0.3/fs/jffs2/wbuf.c
  };
  
  /*
-diff -urNp linux-3.0.3/fs/jffs2/xattr.c linux-3.0.3/fs/jffs2/xattr.c
---- linux-3.0.3/fs/jffs2/xattr.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jffs2/xattr.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/jffs2/xattr.c linux-3.0.4/fs/jffs2/xattr.c
+--- linux-3.0.4/fs/jffs2/xattr.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jffs2/xattr.c       2011-08-23 21:48:14.000000000 -0400
 @@ -773,6 +773,8 @@ void jffs2_build_xattr_subsystem(struct 
  
        BUG_ON(!(c->flags & JFFS2_SB_FLAG_BUILDING));
@@ -38088,9 +40944,9 @@ diff -urNp linux-3.0.3/fs/jffs2/xattr.c linux-3.0.3/fs/jffs2/xattr.c
        /* Phase.1 : Merge same xref */
        for (i=0; i < XREF_TMPHASH_SIZE; i++)
                xref_tmphash[i] = NULL;
-diff -urNp linux-3.0.3/fs/jfs/super.c linux-3.0.3/fs/jfs/super.c
---- linux-3.0.3/fs/jfs/super.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/jfs/super.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/jfs/super.c linux-3.0.4/fs/jfs/super.c
+--- linux-3.0.4/fs/jfs/super.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/jfs/super.c 2011-08-23 21:47:56.000000000 -0400
 @@ -803,7 +803,7 @@ static int __init init_jfs_fs(void)
  
        jfs_inode_cachep =
@@ -38100,9 +40956,9 @@ diff -urNp linux-3.0.3/fs/jfs/super.c linux-3.0.3/fs/jfs/super.c
                            init_once);
        if (jfs_inode_cachep == NULL)
                return -ENOMEM;
-diff -urNp linux-3.0.3/fs/Kconfig.binfmt linux-3.0.3/fs/Kconfig.binfmt
---- linux-3.0.3/fs/Kconfig.binfmt      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/Kconfig.binfmt      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/Kconfig.binfmt linux-3.0.4/fs/Kconfig.binfmt
+--- linux-3.0.4/fs/Kconfig.binfmt      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/Kconfig.binfmt      2011-08-23 21:47:56.000000000 -0400
 @@ -86,7 +86,7 @@ config HAVE_AOUT
  
  config BINFMT_AOUT
@@ -38112,9 +40968,9 @@ diff -urNp linux-3.0.3/fs/Kconfig.binfmt linux-3.0.3/fs/Kconfig.binfmt
        ---help---
          A.out (Assembler.OUTput) is a set of formats for libraries and
          executables used in the earliest versions of UNIX.  Linux used
-diff -urNp linux-3.0.3/fs/libfs.c linux-3.0.3/fs/libfs.c
---- linux-3.0.3/fs/libfs.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/libfs.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/libfs.c linux-3.0.4/fs/libfs.c
+--- linux-3.0.4/fs/libfs.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/libfs.c     2011-08-23 21:47:56.000000000 -0400
 @@ -163,6 +163,9 @@ int dcache_readdir(struct file * filp, v
  
                        for (p=q->next; p != &dentry->d_subdirs; p=p->next) {
@@ -38139,9 +40995,9 @@ diff -urNp linux-3.0.3/fs/libfs.c linux-3.0.3/fs/libfs.c
                                            next->d_name.len, filp->f_pos, 
                                            next->d_inode->i_ino, 
                                            dt_type(next->d_inode)) < 0)
-diff -urNp linux-3.0.3/fs/lockd/clntproc.c linux-3.0.3/fs/lockd/clntproc.c
---- linux-3.0.3/fs/lockd/clntproc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/lockd/clntproc.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/lockd/clntproc.c linux-3.0.4/fs/lockd/clntproc.c
+--- linux-3.0.4/fs/lockd/clntproc.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/lockd/clntproc.c    2011-08-23 21:48:14.000000000 -0400
 @@ -36,11 +36,11 @@ static const struct rpc_call_ops nlmclnt
  /*
   * Cookie counter for NLM requests
@@ -38165,9 +41021,9 @@ diff -urNp linux-3.0.3/fs/lockd/clntproc.c linux-3.0.3/fs/lockd/clntproc.c
        req = &reqst;
        memset(req, 0, sizeof(*req));
        locks_init_lock(&req->a_args.lock.fl);
-diff -urNp linux-3.0.3/fs/locks.c linux-3.0.3/fs/locks.c
---- linux-3.0.3/fs/locks.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/locks.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/locks.c linux-3.0.4/fs/locks.c
+--- linux-3.0.4/fs/locks.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/locks.c     2011-08-23 21:47:56.000000000 -0400
 @@ -2043,16 +2043,16 @@ void locks_remove_flock(struct file *fil
                return;
  
@@ -38189,9 +41045,9 @@ diff -urNp linux-3.0.3/fs/locks.c linux-3.0.3/fs/locks.c
        }
  
        lock_flocks();
-diff -urNp linux-3.0.3/fs/logfs/super.c linux-3.0.3/fs/logfs/super.c
---- linux-3.0.3/fs/logfs/super.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/logfs/super.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/logfs/super.c linux-3.0.4/fs/logfs/super.c
+--- linux-3.0.4/fs/logfs/super.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/logfs/super.c       2011-08-23 21:48:14.000000000 -0400
 @@ -266,6 +266,8 @@ static int logfs_recover_sb(struct super
        struct logfs_disk_super _ds1, *ds1 = &_ds1;
        int err, valid0, valid1;
@@ -38201,9 +41057,9 @@ diff -urNp linux-3.0.3/fs/logfs/super.c linux-3.0.3/fs/logfs/super.c
        /* read first superblock */
        err = wbuf_read(sb, super->s_sb_ofs[0], sizeof(*ds0), ds0);
        if (err)
-diff -urNp linux-3.0.3/fs/namei.c linux-3.0.3/fs/namei.c
---- linux-3.0.3/fs/namei.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/namei.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/namei.c linux-3.0.4/fs/namei.c
+--- linux-3.0.4/fs/namei.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/namei.c     2011-08-23 21:48:14.000000000 -0400
 @@ -237,21 +237,31 @@ int generic_permission(struct inode *ino
                return ret;
  
@@ -38671,9 +41527,9 @@ diff -urNp linux-3.0.3/fs/namei.c linux-3.0.3/fs/namei.c
                len = -EFAULT;
  out:
        return len;
-diff -urNp linux-3.0.3/fs/namespace.c linux-3.0.3/fs/namespace.c
---- linux-3.0.3/fs/namespace.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/namespace.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/namespace.c linux-3.0.4/fs/namespace.c
+--- linux-3.0.4/fs/namespace.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/namespace.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1328,6 +1328,9 @@ static int do_umount(struct vfsmount *mn
                if (!(sb->s_flags & MS_RDONLY))
                        retval = do_remount_sb(sb, MS_RDONLY, NULL, 0);
@@ -38733,9 +41589,9 @@ diff -urNp linux-3.0.3/fs/namespace.c linux-3.0.3/fs/namespace.c
        get_fs_root(current->fs, &root);
        error = lock_mount(&old);
        if (error)
-diff -urNp linux-3.0.3/fs/ncpfs/dir.c linux-3.0.3/fs/ncpfs/dir.c
---- linux-3.0.3/fs/ncpfs/dir.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ncpfs/dir.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ncpfs/dir.c linux-3.0.4/fs/ncpfs/dir.c
+--- linux-3.0.4/fs/ncpfs/dir.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ncpfs/dir.c 2011-08-23 21:48:14.000000000 -0400
 @@ -299,6 +299,8 @@ ncp_lookup_validate(struct dentry *dentr
        int res, val = 0, len;
        __u8 __name[NCP_MAXPATHLEN + 1];
@@ -38781,9 +41637,9 @@ diff -urNp linux-3.0.3/fs/ncpfs/dir.c linux-3.0.3/fs/ncpfs/dir.c
        DPRINTK("ncp_rename: %s/%s to %s/%s\n",
                old_dentry->d_parent->d_name.name, old_dentry->d_name.name,
                new_dentry->d_parent->d_name.name, new_dentry->d_name.name);
-diff -urNp linux-3.0.3/fs/ncpfs/inode.c linux-3.0.3/fs/ncpfs/inode.c
---- linux-3.0.3/fs/ncpfs/inode.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ncpfs/inode.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ncpfs/inode.c linux-3.0.4/fs/ncpfs/inode.c
+--- linux-3.0.4/fs/ncpfs/inode.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ncpfs/inode.c       2011-08-23 21:48:14.000000000 -0400
 @@ -461,6 +461,8 @@ static int ncp_fill_super(struct super_b
  #endif
        struct ncp_entry_info finfo;
@@ -38793,9 +41649,9 @@ diff -urNp linux-3.0.3/fs/ncpfs/inode.c linux-3.0.3/fs/ncpfs/inode.c
        memset(&data, 0, sizeof(data));
        server = kzalloc(sizeof(struct ncp_server), GFP_KERNEL);
        if (!server)
-diff -urNp linux-3.0.3/fs/nfs/inode.c linux-3.0.3/fs/nfs/inode.c
---- linux-3.0.3/fs/nfs/inode.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/nfs/inode.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfs/inode.c linux-3.0.4/fs/nfs/inode.c
+--- linux-3.0.4/fs/nfs/inode.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/nfs/inode.c 2011-08-23 21:47:56.000000000 -0400
 @@ -150,7 +150,7 @@ static void nfs_zap_caches_locked(struct
        nfsi->attrtimeo = NFS_MINATTRTIMEO(inode);
        nfsi->attrtimeo_timestamp = jiffies;
@@ -38825,9 +41681,9 @@ diff -urNp linux-3.0.3/fs/nfs/inode.c linux-3.0.3/fs/nfs/inode.c
  }
  
  void nfs_fattr_init(struct nfs_fattr *fattr)
-diff -urNp linux-3.0.3/fs/nfsd/nfs4state.c linux-3.0.3/fs/nfsd/nfs4state.c
---- linux-3.0.3/fs/nfsd/nfs4state.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/nfsd/nfs4state.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfsd/nfs4state.c linux-3.0.4/fs/nfsd/nfs4state.c
+--- linux-3.0.4/fs/nfsd/nfs4state.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/nfsd/nfs4state.c    2011-08-23 21:48:14.000000000 -0400
 @@ -3794,6 +3794,8 @@ nfsd4_lock(struct svc_rqst *rqstp, struc
        unsigned int strhashval;
        int err;
@@ -38837,9 +41693,9 @@ diff -urNp linux-3.0.3/fs/nfsd/nfs4state.c linux-3.0.3/fs/nfsd/nfs4state.c
        dprintk("NFSD: nfsd4_lock: start=%Ld length=%Ld\n",
                (long long) lock->lk_offset,
                (long long) lock->lk_length);
-diff -urNp linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3/fs/nfsd/nfs4xdr.c
---- linux-3.0.3/fs/nfsd/nfs4xdr.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/nfsd/nfs4xdr.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfsd/nfs4xdr.c linux-3.0.4/fs/nfsd/nfs4xdr.c
+--- linux-3.0.4/fs/nfsd/nfs4xdr.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/nfsd/nfs4xdr.c      2011-08-23 21:48:14.000000000 -0400
 @@ -1788,6 +1788,8 @@ nfsd4_encode_fattr(struct svc_fh *fhp, s
                .dentry = dentry,
        };
@@ -38849,9 +41705,9 @@ diff -urNp linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3/fs/nfsd/nfs4xdr.c
        BUG_ON(bmval1 & NFSD_WRITEONLY_ATTRS_WORD1);
        BUG_ON(bmval0 & ~nfsd_suppattrs0(minorversion));
        BUG_ON(bmval1 & ~nfsd_suppattrs1(minorversion));
-diff -urNp linux-3.0.3/fs/nfsd/vfs.c linux-3.0.3/fs/nfsd/vfs.c
---- linux-3.0.3/fs/nfsd/vfs.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/nfsd/vfs.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/nfsd/vfs.c linux-3.0.4/fs/nfsd/vfs.c
+--- linux-3.0.4/fs/nfsd/vfs.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/nfsd/vfs.c  2011-08-23 21:47:56.000000000 -0400
 @@ -896,7 +896,7 @@ nfsd_vfs_read(struct svc_rqst *rqstp, st
        } else {
                oldfs = get_fs();
@@ -38879,9 +41735,9 @@ diff -urNp linux-3.0.3/fs/nfsd/vfs.c linux-3.0.3/fs/nfsd/vfs.c
        set_fs(oldfs);
  
        if (host_err < 0)
-diff -urNp linux-3.0.3/fs/notify/fanotify/fanotify_user.c linux-3.0.3/fs/notify/fanotify/fanotify_user.c
---- linux-3.0.3/fs/notify/fanotify/fanotify_user.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/notify/fanotify/fanotify_user.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/notify/fanotify/fanotify_user.c linux-3.0.4/fs/notify/fanotify/fanotify_user.c
+--- linux-3.0.4/fs/notify/fanotify/fanotify_user.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/notify/fanotify/fanotify_user.c     2011-08-23 21:48:14.000000000 -0400
 @@ -276,7 +276,8 @@ static ssize_t copy_event_to_user(struct
                goto out_close_fd;
  
@@ -38892,9 +41748,9 @@ diff -urNp linux-3.0.3/fs/notify/fanotify/fanotify_user.c linux-3.0.3/fs/notify/
                         fanotify_event_metadata.event_len))
                goto out_kill_access_response;
  
-diff -urNp linux-3.0.3/fs/notify/notification.c linux-3.0.3/fs/notify/notification.c
---- linux-3.0.3/fs/notify/notification.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/notify/notification.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/notify/notification.c linux-3.0.4/fs/notify/notification.c
+--- linux-3.0.4/fs/notify/notification.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/notify/notification.c       2011-08-23 21:47:56.000000000 -0400
 @@ -57,7 +57,7 @@ static struct kmem_cache *fsnotify_event
   * get set to 0 so it will never get 'freed'
   */
@@ -38913,9 +41769,9 @@ diff -urNp linux-3.0.3/fs/notify/notification.c linux-3.0.3/fs/notify/notificati
  }
  EXPORT_SYMBOL_GPL(fsnotify_get_cookie);
  
-diff -urNp linux-3.0.3/fs/ntfs/dir.c linux-3.0.3/fs/ntfs/dir.c
---- linux-3.0.3/fs/ntfs/dir.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ntfs/dir.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ntfs/dir.c linux-3.0.4/fs/ntfs/dir.c
+--- linux-3.0.4/fs/ntfs/dir.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ntfs/dir.c  2011-08-23 21:47:56.000000000 -0400
 @@ -1329,7 +1329,7 @@ find_next_index_buffer:
        ia = (INDEX_ALLOCATION*)(kaddr + (ia_pos & ~PAGE_CACHE_MASK &
                        ~(s64)(ndir->itype.index.block_size - 1)));
@@ -38925,9 +41781,9 @@ diff -urNp linux-3.0.3/fs/ntfs/dir.c linux-3.0.3/fs/ntfs/dir.c
                ntfs_error(sb, "Out of bounds check failed. Corrupt directory "
                                "inode 0x%lx or driver bug.", vdir->i_ino);
                goto err_out;
-diff -urNp linux-3.0.3/fs/ntfs/file.c linux-3.0.3/fs/ntfs/file.c
---- linux-3.0.3/fs/ntfs/file.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ntfs/file.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ntfs/file.c linux-3.0.4/fs/ntfs/file.c
+--- linux-3.0.4/fs/ntfs/file.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ntfs/file.c 2011-08-23 21:47:56.000000000 -0400
 @@ -2222,6 +2222,6 @@ const struct inode_operations ntfs_file_
  #endif /* NTFS_RW */
  };
@@ -38937,9 +41793,9 @@ diff -urNp linux-3.0.3/fs/ntfs/file.c linux-3.0.3/fs/ntfs/file.c
  
 -const struct inode_operations ntfs_empty_inode_ops = {};
 +const struct inode_operations ntfs_empty_inode_ops __read_only;
-diff -urNp linux-3.0.3/fs/ocfs2/localalloc.c linux-3.0.3/fs/ocfs2/localalloc.c
---- linux-3.0.3/fs/ocfs2/localalloc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/localalloc.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/localalloc.c linux-3.0.4/fs/ocfs2/localalloc.c
+--- linux-3.0.4/fs/ocfs2/localalloc.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/localalloc.c  2011-08-23 21:47:56.000000000 -0400
 @@ -1283,7 +1283,7 @@ static int ocfs2_local_alloc_slide_windo
                goto bail;
        }
@@ -38949,9 +41805,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/localalloc.c linux-3.0.3/fs/ocfs2/localalloc.c
  
  bail:
        if (handle)
-diff -urNp linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3/fs/ocfs2/namei.c
---- linux-3.0.3/fs/ocfs2/namei.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/namei.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/namei.c linux-3.0.4/fs/ocfs2/namei.c
+--- linux-3.0.4/fs/ocfs2/namei.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/namei.c       2011-08-23 21:48:14.000000000 -0400
 @@ -1063,6 +1063,8 @@ static int ocfs2_rename(struct inode *ol
        struct ocfs2_dir_lookup_result orphan_insert = { NULL, };
        struct ocfs2_dir_lookup_result target_insert = { NULL, };
@@ -38961,9 +41817,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3/fs/ocfs2/namei.c
        /* At some point it might be nice to break this function up a
         * bit. */
  
-diff -urNp linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3/fs/ocfs2/ocfs2.h
---- linux-3.0.3/fs/ocfs2/ocfs2.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/ocfs2.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/ocfs2.h linux-3.0.4/fs/ocfs2/ocfs2.h
+--- linux-3.0.4/fs/ocfs2/ocfs2.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/ocfs2.h       2011-08-23 21:47:56.000000000 -0400
 @@ -235,11 +235,11 @@ enum ocfs2_vol_state
  
  struct ocfs2_alloc_stats
@@ -38981,9 +41837,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3/fs/ocfs2/ocfs2.h
  };
  
  enum ocfs2_local_alloc_state
-diff -urNp linux-3.0.3/fs/ocfs2/suballoc.c linux-3.0.3/fs/ocfs2/suballoc.c
---- linux-3.0.3/fs/ocfs2/suballoc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/suballoc.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/suballoc.c linux-3.0.4/fs/ocfs2/suballoc.c
+--- linux-3.0.4/fs/ocfs2/suballoc.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/suballoc.c    2011-08-23 21:47:56.000000000 -0400
 @@ -872,7 +872,7 @@ static int ocfs2_reserve_suballoc_bits(s
                                mlog_errno(status);
                        goto bail;
@@ -39038,9 +41894,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/suballoc.c linux-3.0.3/fs/ocfs2/suballoc.c
                        *num_clusters = res.sr_bits;
                }
        }
-diff -urNp linux-3.0.3/fs/ocfs2/super.c linux-3.0.3/fs/ocfs2/super.c
---- linux-3.0.3/fs/ocfs2/super.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/super.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/super.c linux-3.0.4/fs/ocfs2/super.c
+--- linux-3.0.4/fs/ocfs2/super.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/super.c       2011-08-23 21:47:56.000000000 -0400
 @@ -300,11 +300,11 @@ static int ocfs2_osb_dump(struct ocfs2_s
                        "%10s => GlobalAllocs: %d  LocalAllocs: %d  "
                        "SubAllocs: %d  LAWinMoves: %d  SAExtends: %d\n",
@@ -39075,9 +41931,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/super.c linux-3.0.3/fs/ocfs2/super.c
  
        /* Copy the blockcheck stats from the superblock probe */
        osb->osb_ecc_stats = *stats;
-diff -urNp linux-3.0.3/fs/ocfs2/symlink.c linux-3.0.3/fs/ocfs2/symlink.c
---- linux-3.0.3/fs/ocfs2/symlink.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/ocfs2/symlink.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/ocfs2/symlink.c linux-3.0.4/fs/ocfs2/symlink.c
+--- linux-3.0.4/fs/ocfs2/symlink.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/ocfs2/symlink.c     2011-08-23 21:47:56.000000000 -0400
 @@ -142,7 +142,7 @@ bail:
  
  static void ocfs2_fast_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -39087,9 +41943,9 @@ diff -urNp linux-3.0.3/fs/ocfs2/symlink.c linux-3.0.3/fs/ocfs2/symlink.c
        if (!IS_ERR(link))
                kfree(link);
  }
-diff -urNp linux-3.0.3/fs/open.c linux-3.0.3/fs/open.c
---- linux-3.0.3/fs/open.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/open.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/open.c linux-3.0.4/fs/open.c
+--- linux-3.0.4/fs/open.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/open.c      2011-08-23 21:48:14.000000000 -0400
 @@ -112,6 +112,10 @@ static long do_sys_truncate(const char _
        error = locks_verify_truncate(inode, NULL, length);
        if (!error)
@@ -39227,9 +42083,9 @@ diff -urNp linux-3.0.3/fs/open.c linux-3.0.3/fs/open.c
                        if (IS_ERR(f)) {
                                put_unused_fd(fd);
                                fd = PTR_ERR(f);
-diff -urNp linux-3.0.3/fs/partitions/ldm.c linux-3.0.3/fs/partitions/ldm.c
---- linux-3.0.3/fs/partitions/ldm.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/partitions/ldm.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/partitions/ldm.c linux-3.0.4/fs/partitions/ldm.c
+--- linux-3.0.4/fs/partitions/ldm.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/partitions/ldm.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1311,6 +1311,7 @@ static bool ldm_frag_add (const u8 *data
                ldm_error ("A VBLK claims to have %d parts.", num);
                return false;
@@ -39247,9 +42103,9 @@ diff -urNp linux-3.0.3/fs/partitions/ldm.c linux-3.0.3/fs/partitions/ldm.c
        if (!f) {
                ldm_crit ("Out of memory.");
                return false;
-diff -urNp linux-3.0.3/fs/pipe.c linux-3.0.3/fs/pipe.c
---- linux-3.0.3/fs/pipe.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/pipe.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/pipe.c linux-3.0.4/fs/pipe.c
+--- linux-3.0.4/fs/pipe.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/pipe.c      2011-08-23 21:48:14.000000000 -0400
 @@ -420,9 +420,9 @@ redo:
                }
                if (bufs)       /* More to do? */
@@ -39373,9 +42229,9 @@ diff -urNp linux-3.0.3/fs/pipe.c linux-3.0.3/fs/pipe.c
        inode->i_fop = &rdwr_pipefifo_fops;
  
        /*
-diff -urNp linux-3.0.3/fs/proc/array.c linux-3.0.3/fs/proc/array.c
---- linux-3.0.3/fs/proc/array.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/array.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/array.c linux-3.0.4/fs/proc/array.c
+--- linux-3.0.4/fs/proc/array.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/array.c        2011-08-23 21:48:14.000000000 -0400
 @@ -60,6 +60,7 @@
  #include <linux/tty.h>
  #include <linux/string.h>
@@ -39499,9 +42355,9 @@ diff -urNp linux-3.0.3/fs/proc/array.c linux-3.0.3/fs/proc/array.c
 +      return sprintf(buffer, "%pI4\n", &curr_ip);
 +}
 +#endif
-diff -urNp linux-3.0.3/fs/proc/base.c linux-3.0.3/fs/proc/base.c
---- linux-3.0.3/fs/proc/base.c 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/fs/proc/base.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/base.c linux-3.0.4/fs/proc/base.c
+--- linux-3.0.4/fs/proc/base.c 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/fs/proc/base.c 2011-08-23 21:48:14.000000000 -0400
 @@ -107,6 +107,22 @@ struct pid_entry {
        union proc_op op;
  };
@@ -39933,9 +42789,9 @@ diff -urNp linux-3.0.3/fs/proc/base.c linux-3.0.3/fs/proc/base.c
        ONE("stack",      S_IRUGO, proc_pid_stack),
  #endif
  #ifdef CONFIG_SCHEDSTATS
-diff -urNp linux-3.0.3/fs/proc/cmdline.c linux-3.0.3/fs/proc/cmdline.c
---- linux-3.0.3/fs/proc/cmdline.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/cmdline.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/cmdline.c linux-3.0.4/fs/proc/cmdline.c
+--- linux-3.0.4/fs/proc/cmdline.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/cmdline.c      2011-08-23 21:48:14.000000000 -0400
 @@ -23,7 +23,11 @@ static const struct file_operations cmdl
  
  static int __init proc_cmdline_init(void)
@@ -39948,9 +42804,9 @@ diff -urNp linux-3.0.3/fs/proc/cmdline.c linux-3.0.3/fs/proc/cmdline.c
        return 0;
  }
  module_init(proc_cmdline_init);
-diff -urNp linux-3.0.3/fs/proc/devices.c linux-3.0.3/fs/proc/devices.c
---- linux-3.0.3/fs/proc/devices.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/devices.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/devices.c linux-3.0.4/fs/proc/devices.c
+--- linux-3.0.4/fs/proc/devices.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/devices.c      2011-08-23 21:48:14.000000000 -0400
 @@ -64,7 +64,11 @@ static const struct file_operations proc
  
  static int __init proc_devices_init(void)
@@ -39963,9 +42819,9 @@ diff -urNp linux-3.0.3/fs/proc/devices.c linux-3.0.3/fs/proc/devices.c
        return 0;
  }
  module_init(proc_devices_init);
-diff -urNp linux-3.0.3/fs/proc/inode.c linux-3.0.3/fs/proc/inode.c
---- linux-3.0.3/fs/proc/inode.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/inode.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/inode.c linux-3.0.4/fs/proc/inode.c
+--- linux-3.0.4/fs/proc/inode.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/inode.c        2011-08-23 21:48:14.000000000 -0400
 @@ -440,7 +440,11 @@ struct inode *proc_get_inode(struct supe
                if (de->mode) {
                        inode->i_mode = de->mode;
@@ -39978,9 +42834,9 @@ diff -urNp linux-3.0.3/fs/proc/inode.c linux-3.0.3/fs/proc/inode.c
                }
                if (de->size)
                        inode->i_size = de->size;
-diff -urNp linux-3.0.3/fs/proc/internal.h linux-3.0.3/fs/proc/internal.h
---- linux-3.0.3/fs/proc/internal.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/internal.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/internal.h linux-3.0.4/fs/proc/internal.h
+--- linux-3.0.4/fs/proc/internal.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/internal.h     2011-08-23 21:48:14.000000000 -0400
 @@ -51,6 +51,9 @@ extern int proc_pid_status(struct seq_fi
                                struct pid *pid, struct task_struct *task);
  extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns,
@@ -39991,9 +42847,9 @@ diff -urNp linux-3.0.3/fs/proc/internal.h linux-3.0.3/fs/proc/internal.h
  extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns,
                                struct pid *pid, struct task_struct *task);
  
-diff -urNp linux-3.0.3/fs/proc/Kconfig linux-3.0.3/fs/proc/Kconfig
---- linux-3.0.3/fs/proc/Kconfig        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/Kconfig        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/Kconfig linux-3.0.4/fs/proc/Kconfig
+--- linux-3.0.4/fs/proc/Kconfig        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/Kconfig        2011-08-23 21:48:14.000000000 -0400
 @@ -30,12 +30,12 @@ config PROC_FS
  
  config PROC_KCORE
@@ -40021,9 +42877,9 @@ diff -urNp linux-3.0.3/fs/proc/Kconfig linux-3.0.3/fs/proc/Kconfig
        bool "Enable /proc page monitoring" if EXPERT
        help
          Various /proc files exist to monitor process memory utilization:
-diff -urNp linux-3.0.3/fs/proc/kcore.c linux-3.0.3/fs/proc/kcore.c
---- linux-3.0.3/fs/proc/kcore.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/kcore.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/kcore.c linux-3.0.4/fs/proc/kcore.c
+--- linux-3.0.4/fs/proc/kcore.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/kcore.c        2011-08-23 21:48:14.000000000 -0400
 @@ -321,6 +321,8 @@ static void elf_kcore_store_hdr(char *bu
        off_t offset = 0;
        struct kcore_list *m;
@@ -40091,9 +42947,9 @@ diff -urNp linux-3.0.3/fs/proc/kcore.c linux-3.0.3/fs/proc/kcore.c
        if (!capable(CAP_SYS_RAWIO))
                return -EPERM;
        if (kcore_need_update)
-diff -urNp linux-3.0.3/fs/proc/meminfo.c linux-3.0.3/fs/proc/meminfo.c
---- linux-3.0.3/fs/proc/meminfo.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/meminfo.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/meminfo.c linux-3.0.4/fs/proc/meminfo.c
+--- linux-3.0.4/fs/proc/meminfo.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/meminfo.c      2011-08-23 21:48:14.000000000 -0400
 @@ -29,6 +29,8 @@ static int meminfo_proc_show(struct seq_
        unsigned long pages[NR_LRU_LISTS];
        int lru;
@@ -40112,9 +42968,9 @@ diff -urNp linux-3.0.3/fs/proc/meminfo.c linux-3.0.3/fs/proc/meminfo.c
  #endif
  #ifdef CONFIG_TRANSPARENT_HUGEPAGE
                ,K(global_page_state(NR_ANON_TRANSPARENT_HUGEPAGES) *
-diff -urNp linux-3.0.3/fs/proc/nommu.c linux-3.0.3/fs/proc/nommu.c
---- linux-3.0.3/fs/proc/nommu.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/nommu.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/nommu.c linux-3.0.4/fs/proc/nommu.c
+--- linux-3.0.4/fs/proc/nommu.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/nommu.c        2011-08-23 21:47:56.000000000 -0400
 @@ -66,7 +66,7 @@ static int nommu_region_show(struct seq_
                if (len < 1)
                        len = 1;
@@ -40124,9 +42980,9 @@ diff -urNp linux-3.0.3/fs/proc/nommu.c linux-3.0.3/fs/proc/nommu.c
        }
  
        seq_putc(m, '\n');
-diff -urNp linux-3.0.3/fs/proc/proc_net.c linux-3.0.3/fs/proc/proc_net.c
---- linux-3.0.3/fs/proc/proc_net.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/proc_net.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/proc_net.c linux-3.0.4/fs/proc/proc_net.c
+--- linux-3.0.4/fs/proc/proc_net.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/proc_net.c     2011-08-23 21:48:14.000000000 -0400
 @@ -105,6 +105,17 @@ static struct net *get_proc_task_net(str
        struct task_struct *task;
        struct nsproxy *ns;
@@ -40145,9 +43001,9 @@ diff -urNp linux-3.0.3/fs/proc/proc_net.c linux-3.0.3/fs/proc/proc_net.c
  
        rcu_read_lock();
        task = pid_task(proc_pid(dir), PIDTYPE_PID);
-diff -urNp linux-3.0.3/fs/proc/proc_sysctl.c linux-3.0.3/fs/proc/proc_sysctl.c
---- linux-3.0.3/fs/proc/proc_sysctl.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/proc_sysctl.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/proc_sysctl.c linux-3.0.4/fs/proc/proc_sysctl.c
+--- linux-3.0.4/fs/proc/proc_sysctl.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/proc_sysctl.c  2011-08-23 21:48:14.000000000 -0400
 @@ -8,6 +8,8 @@
  #include <linux/namei.h>
  #include "internal.h"
@@ -40187,9 +43043,9 @@ diff -urNp linux-3.0.3/fs/proc/proc_sysctl.c linux-3.0.3/fs/proc/proc_sysctl.c
        generic_fillattr(inode, stat);
        if (table)
                stat->mode = (stat->mode & S_IFMT) | table->mode;
-diff -urNp linux-3.0.3/fs/proc/root.c linux-3.0.3/fs/proc/root.c
---- linux-3.0.3/fs/proc/root.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/root.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/root.c linux-3.0.4/fs/proc/root.c
+--- linux-3.0.4/fs/proc/root.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/root.c 2011-08-23 21:48:14.000000000 -0400
 @@ -123,7 +123,15 @@ void __init proc_root_init(void)
  #ifdef CONFIG_PROC_DEVICETREE
        proc_device_tree_init();
@@ -40206,9 +43062,9 @@ diff -urNp linux-3.0.3/fs/proc/root.c linux-3.0.3/fs/proc/root.c
        proc_sys_init();
  }
  
-diff -urNp linux-3.0.3/fs/proc/task_mmu.c linux-3.0.3/fs/proc/task_mmu.c
---- linux-3.0.3/fs/proc/task_mmu.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/task_mmu.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/task_mmu.c linux-3.0.4/fs/proc/task_mmu.c
+--- linux-3.0.4/fs/proc/task_mmu.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/task_mmu.c     2011-08-23 21:48:14.000000000 -0400
 @@ -51,8 +51,13 @@ void task_mem(struct seq_file *m, struct
                "VmExe:\t%8lu kB\n"
                "VmLib:\t%8lu kB\n"
@@ -40348,9 +43204,9 @@ diff -urNp linux-3.0.3/fs/proc/task_mmu.c linux-3.0.3/fs/proc/task_mmu.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-3.0.3/fs/proc/task_nommu.c linux-3.0.3/fs/proc/task_nommu.c
---- linux-3.0.3/fs/proc/task_nommu.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/proc/task_nommu.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/proc/task_nommu.c linux-3.0.4/fs/proc/task_nommu.c
+--- linux-3.0.4/fs/proc/task_nommu.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/proc/task_nommu.c   2011-08-23 21:47:56.000000000 -0400
 @@ -51,7 +51,7 @@ void task_mem(struct seq_file *m, struct
        else
                bytes += kobjsize(mm);
@@ -40369,9 +43225,9 @@ diff -urNp linux-3.0.3/fs/proc/task_nommu.c linux-3.0.3/fs/proc/task_nommu.c
        } else if (mm) {
                if (vma->vm_start <= mm->start_stack &&
                        vma->vm_end >= mm->start_stack) {
-diff -urNp linux-3.0.3/fs/quota/netlink.c linux-3.0.3/fs/quota/netlink.c
---- linux-3.0.3/fs/quota/netlink.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/quota/netlink.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/quota/netlink.c linux-3.0.4/fs/quota/netlink.c
+--- linux-3.0.4/fs/quota/netlink.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/quota/netlink.c     2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@ static struct genl_family quota_genl_fam
  void quota_send_warning(short type, unsigned int id, dev_t dev,
                        const char warntype)
@@ -40390,9 +43246,9 @@ diff -urNp linux-3.0.3/fs/quota/netlink.c linux-3.0.3/fs/quota/netlink.c
                        &quota_genl_family, 0, QUOTA_NL_C_WARNING);
        if (!msg_head) {
                printk(KERN_ERR
-diff -urNp linux-3.0.3/fs/readdir.c linux-3.0.3/fs/readdir.c
---- linux-3.0.3/fs/readdir.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/readdir.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/readdir.c linux-3.0.4/fs/readdir.c
+--- linux-3.0.4/fs/readdir.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/readdir.c   2011-08-23 21:48:14.000000000 -0400
 @@ -17,6 +17,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -40482,9 +43338,9 @@ diff -urNp linux-3.0.3/fs/readdir.c linux-3.0.3/fs/readdir.c
        buf.count = count;
        buf.error = 0;
  
-diff -urNp linux-3.0.3/fs/reiserfs/dir.c linux-3.0.3/fs/reiserfs/dir.c
---- linux-3.0.3/fs/reiserfs/dir.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/dir.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/dir.c linux-3.0.4/fs/reiserfs/dir.c
+--- linux-3.0.4/fs/reiserfs/dir.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/dir.c      2011-08-23 21:48:14.000000000 -0400
 @@ -66,6 +66,8 @@ int reiserfs_readdir_dentry(struct dentr
        struct reiserfs_dir_entry de;
        int ret = 0;
@@ -40494,9 +43350,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/dir.c linux-3.0.3/fs/reiserfs/dir.c
        reiserfs_write_lock(inode->i_sb);
  
        reiserfs_check_lock_depth(inode->i_sb, "readdir");
-diff -urNp linux-3.0.3/fs/reiserfs/do_balan.c linux-3.0.3/fs/reiserfs/do_balan.c
---- linux-3.0.3/fs/reiserfs/do_balan.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/do_balan.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/do_balan.c linux-3.0.4/fs/reiserfs/do_balan.c
+--- linux-3.0.4/fs/reiserfs/do_balan.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/do_balan.c 2011-08-23 21:47:56.000000000 -0400
 @@ -2051,7 +2051,7 @@ void do_balance(struct tree_balance *tb,
                return;
        }
@@ -40506,9 +43362,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/do_balan.c linux-3.0.3/fs/reiserfs/do_balan.c
        do_balance_starts(tb);
  
        /* balance leaf returns 0 except if combining L R and S into
-diff -urNp linux-3.0.3/fs/reiserfs/journal.c linux-3.0.3/fs/reiserfs/journal.c
---- linux-3.0.3/fs/reiserfs/journal.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/journal.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/journal.c linux-3.0.4/fs/reiserfs/journal.c
+--- linux-3.0.4/fs/reiserfs/journal.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/journal.c  2011-08-23 21:48:14.000000000 -0400
 @@ -2299,6 +2299,8 @@ static struct buffer_head *reiserfs_brea
        struct buffer_head *bh;
        int i, j;
@@ -40518,9 +43374,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/journal.c linux-3.0.3/fs/reiserfs/journal.c
        bh = __getblk(dev, block, bufsize);
        if (buffer_uptodate(bh))
                return (bh);
-diff -urNp linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3/fs/reiserfs/namei.c
---- linux-3.0.3/fs/reiserfs/namei.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/namei.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/namei.c linux-3.0.4/fs/reiserfs/namei.c
+--- linux-3.0.4/fs/reiserfs/namei.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/namei.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1225,6 +1225,8 @@ static int reiserfs_rename(struct inode 
        unsigned long savelink = 1;
        struct timespec ctime;
@@ -40530,9 +43386,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3/fs/reiserfs/namei.c
        /* three balancings: (1) old name removal, (2) new name insertion
           and (3) maybe "save" link insertion
           stat data updates: (1) old directory,
-diff -urNp linux-3.0.3/fs/reiserfs/procfs.c linux-3.0.3/fs/reiserfs/procfs.c
---- linux-3.0.3/fs/reiserfs/procfs.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/procfs.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/procfs.c linux-3.0.4/fs/reiserfs/procfs.c
+--- linux-3.0.4/fs/reiserfs/procfs.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/procfs.c   2011-08-23 21:48:14.000000000 -0400
 @@ -113,7 +113,7 @@ static int show_super(struct seq_file *m
                   "SMALL_TAILS " : "NO_TAILS ",
                   replay_only(sb) ? "REPLAY_ONLY " : "",
@@ -40551,9 +43407,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/procfs.c linux-3.0.3/fs/reiserfs/procfs.c
        seq_printf(m,           /* on-disk fields */
                   "jp_journal_1st_block: \t%i\n"
                   "jp_journal_dev: \t%s[%x]\n"
-diff -urNp linux-3.0.3/fs/reiserfs/stree.c linux-3.0.3/fs/reiserfs/stree.c
---- linux-3.0.3/fs/reiserfs/stree.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/stree.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/stree.c linux-3.0.4/fs/reiserfs/stree.c
+--- linux-3.0.4/fs/reiserfs/stree.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/stree.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1196,6 +1196,8 @@ int reiserfs_delete_item(struct reiserfs
        int iter = 0;
  #endif
@@ -40599,9 +43455,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/stree.c linux-3.0.3/fs/reiserfs/stree.c
        BUG_ON(!th->t_trans_id);
  
        if (inode) {            /* Do we count quotas for item? */
-diff -urNp linux-3.0.3/fs/reiserfs/super.c linux-3.0.3/fs/reiserfs/super.c
---- linux-3.0.3/fs/reiserfs/super.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/reiserfs/super.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/reiserfs/super.c linux-3.0.4/fs/reiserfs/super.c
+--- linux-3.0.4/fs/reiserfs/super.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/reiserfs/super.c    2011-08-23 21:48:14.000000000 -0400
 @@ -927,6 +927,8 @@ static int reiserfs_parse_options(struct
                {.option_name = NULL}
        };
@@ -40611,9 +43467,9 @@ diff -urNp linux-3.0.3/fs/reiserfs/super.c linux-3.0.3/fs/reiserfs/super.c
        *blocks = 0;
        if (!options || !*options)
                /* use default configuration: create tails, journaling on, no
-diff -urNp linux-3.0.3/fs/select.c linux-3.0.3/fs/select.c
---- linux-3.0.3/fs/select.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/select.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/select.c linux-3.0.4/fs/select.c
+--- linux-3.0.4/fs/select.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/select.c    2011-08-23 21:48:14.000000000 -0400
 @@ -20,6 +20,7 @@
  #include <linux/module.h>
  #include <linux/slab.h>
@@ -40650,9 +43506,9 @@ diff -urNp linux-3.0.3/fs/select.c linux-3.0.3/fs/select.c
        if (nfds > rlimit(RLIMIT_NOFILE))
                return -EINVAL;
  
-diff -urNp linux-3.0.3/fs/seq_file.c linux-3.0.3/fs/seq_file.c
---- linux-3.0.3/fs/seq_file.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/seq_file.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/seq_file.c linux-3.0.4/fs/seq_file.c
+--- linux-3.0.4/fs/seq_file.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/seq_file.c  2011-08-23 21:47:56.000000000 -0400
 @@ -76,7 +76,8 @@ static int traverse(struct seq_file *m, 
                return 0;
        }
@@ -40702,9 +43558,9 @@ diff -urNp linux-3.0.3/fs/seq_file.c linux-3.0.3/fs/seq_file.c
        int res = -ENOMEM;
  
        if (op) {
-diff -urNp linux-3.0.3/fs/splice.c linux-3.0.3/fs/splice.c
---- linux-3.0.3/fs/splice.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/splice.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/splice.c linux-3.0.4/fs/splice.c
+--- linux-3.0.4/fs/splice.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/splice.c    2011-08-23 21:48:14.000000000 -0400
 @@ -194,7 +194,7 @@ ssize_t splice_to_pipe(struct pipe_inode
        pipe_lock(pipe);
  
@@ -40870,9 +43726,9 @@ diff -urNp linux-3.0.3/fs/splice.c linux-3.0.3/fs/splice.c
                ret = -EAGAIN;
  
        pipe_unlock(ipipe);
-diff -urNp linux-3.0.3/fs/sysfs/file.c linux-3.0.3/fs/sysfs/file.c
---- linux-3.0.3/fs/sysfs/file.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/sysfs/file.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/sysfs/file.c linux-3.0.4/fs/sysfs/file.c
+--- linux-3.0.4/fs/sysfs/file.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/sysfs/file.c        2011-08-23 21:47:56.000000000 -0400
 @@ -37,7 +37,7 @@ static DEFINE_SPINLOCK(sysfs_open_dirent
  
  struct sysfs_open_dirent {
@@ -40918,9 +43774,9 @@ diff -urNp linux-3.0.3/fs/sysfs/file.c linux-3.0.3/fs/sysfs/file.c
                wake_up_interruptible(&od->poll);
        }
  
-diff -urNp linux-3.0.3/fs/sysfs/mount.c linux-3.0.3/fs/sysfs/mount.c
---- linux-3.0.3/fs/sysfs/mount.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/sysfs/mount.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/sysfs/mount.c linux-3.0.4/fs/sysfs/mount.c
+--- linux-3.0.4/fs/sysfs/mount.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/sysfs/mount.c       2011-08-23 21:48:14.000000000 -0400
 @@ -36,7 +36,11 @@ struct sysfs_dirent sysfs_root = {
        .s_name         = "",
        .s_count        = ATOMIC_INIT(1),
@@ -40933,9 +43789,9 @@ diff -urNp linux-3.0.3/fs/sysfs/mount.c linux-3.0.3/fs/sysfs/mount.c
        .s_ino          = 1,
  };
  
-diff -urNp linux-3.0.3/fs/sysfs/symlink.c linux-3.0.3/fs/sysfs/symlink.c
---- linux-3.0.3/fs/sysfs/symlink.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/sysfs/symlink.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/sysfs/symlink.c linux-3.0.4/fs/sysfs/symlink.c
+--- linux-3.0.4/fs/sysfs/symlink.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/sysfs/symlink.c     2011-08-23 21:47:56.000000000 -0400
 @@ -286,7 +286,7 @@ static void *sysfs_follow_link(struct de
  
  static void sysfs_put_link(struct dentry *dentry, struct nameidata *nd, void *cookie)
@@ -40945,9 +43801,9 @@ diff -urNp linux-3.0.3/fs/sysfs/symlink.c linux-3.0.3/fs/sysfs/symlink.c
        if (!IS_ERR(page))
                free_page((unsigned long)page);
  }
-diff -urNp linux-3.0.3/fs/udf/inode.c linux-3.0.3/fs/udf/inode.c
---- linux-3.0.3/fs/udf/inode.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/udf/inode.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/udf/inode.c linux-3.0.4/fs/udf/inode.c
+--- linux-3.0.4/fs/udf/inode.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/udf/inode.c 2011-08-23 21:48:14.000000000 -0400
 @@ -560,6 +560,8 @@ static struct buffer_head *inode_getblk(
        int goal = 0, pgoal = iinfo->i_location.logicalBlockNum;
        int lastblock = 0;
@@ -40957,9 +43813,9 @@ diff -urNp linux-3.0.3/fs/udf/inode.c linux-3.0.3/fs/udf/inode.c
        prev_epos.offset = udf_file_entry_alloc_offset(inode);
        prev_epos.block = iinfo->i_location;
        prev_epos.bh = NULL;
-diff -urNp linux-3.0.3/fs/udf/misc.c linux-3.0.3/fs/udf/misc.c
---- linux-3.0.3/fs/udf/misc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/udf/misc.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/udf/misc.c linux-3.0.4/fs/udf/misc.c
+--- linux-3.0.4/fs/udf/misc.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/udf/misc.c  2011-08-23 21:47:56.000000000 -0400
 @@ -286,7 +286,7 @@ void udf_new_tag(char *data, uint16_t id
  
  u8 udf_tag_checksum(const struct tag *t)
@@ -40969,9 +43825,9 @@ diff -urNp linux-3.0.3/fs/udf/misc.c linux-3.0.3/fs/udf/misc.c
        u8 checksum = 0;
        int i;
        for (i = 0; i < sizeof(struct tag); ++i)
-diff -urNp linux-3.0.3/fs/utimes.c linux-3.0.3/fs/utimes.c
---- linux-3.0.3/fs/utimes.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/utimes.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/utimes.c linux-3.0.4/fs/utimes.c
+--- linux-3.0.4/fs/utimes.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/utimes.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1,6 +1,7 @@
  #include <linux/compiler.h>
  #include <linux/file.h>
@@ -40993,9 +43849,9 @@ diff -urNp linux-3.0.3/fs/utimes.c linux-3.0.3/fs/utimes.c
        mutex_lock(&inode->i_mutex);
        error = notify_change(path->dentry, &newattrs);
        mutex_unlock(&inode->i_mutex);
-diff -urNp linux-3.0.3/fs/xattr_acl.c linux-3.0.3/fs/xattr_acl.c
---- linux-3.0.3/fs/xattr_acl.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xattr_acl.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xattr_acl.c linux-3.0.4/fs/xattr_acl.c
+--- linux-3.0.4/fs/xattr_acl.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xattr_acl.c 2011-08-23 21:47:56.000000000 -0400
 @@ -17,8 +17,8 @@
  struct posix_acl *
  posix_acl_from_xattr(const void *value, size_t size)
@@ -41007,9 +43863,9 @@ diff -urNp linux-3.0.3/fs/xattr_acl.c linux-3.0.3/fs/xattr_acl.c
        int count;
        struct posix_acl *acl;
        struct posix_acl_entry *acl_e;
-diff -urNp linux-3.0.3/fs/xattr.c linux-3.0.3/fs/xattr.c
---- linux-3.0.3/fs/xattr.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xattr.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/xattr.c linux-3.0.4/fs/xattr.c
+--- linux-3.0.4/fs/xattr.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xattr.c     2011-08-23 21:48:14.000000000 -0400
 @@ -254,7 +254,7 @@ EXPORT_SYMBOL_GPL(vfs_removexattr);
   * Extended attribute SET operations
   */
@@ -41072,9 +43928,9 @@ diff -urNp linux-3.0.3/fs/xattr.c linux-3.0.3/fs/xattr.c
                mnt_drop_write(f->f_path.mnt);
        }
        fput(f);
-diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl32.c 2011-08-23 21:48:14.000000000 -0400
 @@ -73,6 +73,7 @@ xfs_compat_ioc_fsgeometry_v1(
        xfs_fsop_geom_t           fsgeo;
        int                       error;
@@ -41083,9 +43939,9 @@ diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl32.c linux-3.0.3/fs/xfs/linux-2
        error = xfs_fs_geometry(mp, &fsgeo, 3);
        if (error)
                return -error;
-diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/linux-2.6/xfs_ioctl.c   2011-08-23 21:47:56.000000000 -0400
 @@ -128,7 +128,7 @@ xfs_find_handle(
        }
  
@@ -41095,9 +43951,9 @@ diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3/fs/xfs/linux-2.6
            copy_to_user(hreq->ohandlen, &hsize, sizeof(__s32)))
                goto out_put;
  
-diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/linux-2.6/xfs_iops.c    2011-08-23 21:47:56.000000000 -0400
 @@ -437,7 +437,7 @@ xfs_vn_put_link(
        struct nameidata *nd,
        void            *p)
@@ -41107,9 +43963,9 @@ diff -urNp linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3/fs/xfs/linux-2.6/
  
        if (!IS_ERR(s))
                kfree(s);
-diff -urNp linux-3.0.3/fs/xfs/xfs_bmap.c linux-3.0.3/fs/xfs/xfs_bmap.c
---- linux-3.0.3/fs/xfs/xfs_bmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/xfs_bmap.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/xfs_bmap.c linux-3.0.4/fs/xfs/xfs_bmap.c
+--- linux-3.0.4/fs/xfs/xfs_bmap.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/xfs_bmap.c      2011-08-23 21:47:56.000000000 -0400
 @@ -253,7 +253,7 @@ xfs_bmap_validate_ret(
        int                     nmap,
        int                     ret_nmap);
@@ -41119,9 +43975,9 @@ diff -urNp linux-3.0.3/fs/xfs/xfs_bmap.c linux-3.0.3/fs/xfs/xfs_bmap.c
  #endif /* DEBUG */
  
  STATIC int
-diff -urNp linux-3.0.3/fs/xfs/xfs_dir2_sf.c linux-3.0.3/fs/xfs/xfs_dir2_sf.c
---- linux-3.0.3/fs/xfs/xfs_dir2_sf.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/fs/xfs/xfs_dir2_sf.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/fs/xfs/xfs_dir2_sf.c linux-3.0.4/fs/xfs/xfs_dir2_sf.c
+--- linux-3.0.4/fs/xfs/xfs_dir2_sf.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/fs/xfs/xfs_dir2_sf.c   2011-08-23 21:47:56.000000000 -0400
 @@ -780,7 +780,15 @@ xfs_dir2_sf_getdents(
                }
  
@@ -41139,9 +43995,9 @@ diff -urNp linux-3.0.3/fs/xfs/xfs_dir2_sf.c linux-3.0.3/fs/xfs/xfs_dir2_sf.c
                            off & 0x7fffffff, ino, DT_UNKNOWN)) {
                        *offset = off & 0x7fffffff;
                        return 0;
-diff -urNp linux-3.0.3/grsecurity/gracl_alloc.c linux-3.0.3/grsecurity/gracl_alloc.c
---- linux-3.0.3/grsecurity/gracl_alloc.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_alloc.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_alloc.c linux-3.0.4/grsecurity/gracl_alloc.c
+--- linux-3.0.4/grsecurity/gracl_alloc.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_alloc.c       2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,105 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -41248,9 +44104,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_alloc.c linux-3.0.3/grsecurity/gracl_all
 +      else
 +              return 1;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl.c linux-3.0.3/grsecurity/gracl.c
---- linux-3.0.3/grsecurity/gracl.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl.c linux-3.0.4/grsecurity/gracl.c
+--- linux-3.0.4/grsecurity/gracl.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl.c     2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,4106 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -45358,9 +48214,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl.c linux-3.0.3/grsecurity/gracl.c
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
 +
-diff -urNp linux-3.0.3/grsecurity/gracl_cap.c linux-3.0.3/grsecurity/gracl_cap.c
---- linux-3.0.3/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_cap.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_cap.c linux-3.0.4/grsecurity/gracl_cap.c
+--- linux-3.0.4/grsecurity/gracl_cap.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_cap.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,139 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -45501,9 +48357,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_cap.c linux-3.0.3/grsecurity/gracl_cap.c
 +      return 0;
 +}
 +
-diff -urNp linux-3.0.3/grsecurity/gracl_fs.c linux-3.0.3/grsecurity/gracl_fs.c
---- linux-3.0.3/grsecurity/gracl_fs.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_fs.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_fs.c linux-3.0.4/grsecurity/gracl_fs.c
+--- linux-3.0.4/grsecurity/gracl_fs.c  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_fs.c  2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,431 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -45936,9 +48792,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_fs.c linux-3.0.3/grsecurity/gracl_fs.c
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_ip.c linux-3.0.3/grsecurity/gracl_ip.c
---- linux-3.0.3/grsecurity/gracl_ip.c  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_ip.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_ip.c linux-3.0.4/grsecurity/gracl_ip.c
+--- linux-3.0.4/grsecurity/gracl_ip.c  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_ip.c  2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,381 @@
 +#include <linux/kernel.h>
 +#include <asm/uaccess.h>
@@ -46321,9 +49177,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_ip.c linux-3.0.3/grsecurity/gracl_ip.c
 +
 +      return gr_search_connectbind(GR_CONNECT | GR_CONNECTOVERRIDE, sk, &sin, SOCK_DGRAM);
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_learn.c linux-3.0.3/grsecurity/gracl_learn.c
---- linux-3.0.3/grsecurity/gracl_learn.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_learn.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_learn.c linux-3.0.4/grsecurity/gracl_learn.c
+--- linux-3.0.4/grsecurity/gracl_learn.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_learn.c       2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,207 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -46532,9 +49388,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_learn.c linux-3.0.3/grsecurity/gracl_lea
 +      .release        = close_learn,
 +      .poll           = poll_learn,
 +};
-diff -urNp linux-3.0.3/grsecurity/gracl_res.c linux-3.0.3/grsecurity/gracl_res.c
---- linux-3.0.3/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_res.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_res.c linux-3.0.4/grsecurity/gracl_res.c
+--- linux-3.0.4/grsecurity/gracl_res.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_res.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,68 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -46604,9 +49460,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_res.c linux-3.0.3/grsecurity/gracl_res.c
 +      rcu_read_unlock();
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_segv.c linux-3.0.3/grsecurity/gracl_segv.c
---- linux-3.0.3/grsecurity/gracl_segv.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_segv.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_segv.c linux-3.0.4/grsecurity/gracl_segv.c
+--- linux-3.0.4/grsecurity/gracl_segv.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_segv.c        2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,299 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -46907,9 +49763,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_segv.c linux-3.0.3/grsecurity/gracl_segv
 +
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/gracl_shm.c linux-3.0.3/grsecurity/gracl_shm.c
---- linux-3.0.3/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/gracl_shm.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/gracl_shm.c linux-3.0.4/grsecurity/gracl_shm.c
+--- linux-3.0.4/grsecurity/gracl_shm.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/gracl_shm.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,40 @@
 +#include <linux/kernel.h>
 +#include <linux/mm.h>
@@ -46951,9 +49807,9 @@ diff -urNp linux-3.0.3/grsecurity/gracl_shm.c linux-3.0.3/grsecurity/gracl_shm.c
 +
 +      return 1;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_chdir.c linux-3.0.3/grsecurity/grsec_chdir.c
---- linux-3.0.3/grsecurity/grsec_chdir.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_chdir.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_chdir.c linux-3.0.4/grsecurity/grsec_chdir.c
+--- linux-3.0.4/grsecurity/grsec_chdir.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_chdir.c       2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -46974,9 +49830,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_chdir.c linux-3.0.3/grsecurity/grsec_chd
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_chroot.c linux-3.0.3/grsecurity/grsec_chroot.c
---- linux-3.0.3/grsecurity/grsec_chroot.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_chroot.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_chroot.c linux-3.0.4/grsecurity/grsec_chroot.c
+--- linux-3.0.4/grsecurity/grsec_chroot.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_chroot.c      2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,349 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -47327,9 +50183,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_chroot.c linux-3.0.3/grsecurity/grsec_ch
 +#ifdef CONFIG_SECURITY
 +EXPORT_SYMBOL(gr_handle_chroot_caps);
 +#endif
-diff -urNp linux-3.0.3/grsecurity/grsec_disabled.c linux-3.0.3/grsecurity/grsec_disabled.c
---- linux-3.0.3/grsecurity/grsec_disabled.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_disabled.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_disabled.c linux-3.0.4/grsecurity/grsec_disabled.c
+--- linux-3.0.4/grsecurity/grsec_disabled.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_disabled.c    2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,447 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -47778,10 +50634,10 @@ diff -urNp linux-3.0.3/grsecurity/grsec_disabled.c linux-3.0.3/grsecurity/grsec_
 +EXPORT_SYMBOL(gr_check_user_change);
 +EXPORT_SYMBOL(gr_check_group_change);
 +#endif
-diff -urNp linux-3.0.3/grsecurity/grsec_exec.c linux-3.0.3/grsecurity/grsec_exec.c
---- linux-3.0.3/grsecurity/grsec_exec.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_exec.c        2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,87 @@
+diff -urNp linux-3.0.4/grsecurity/grsec_exec.c linux-3.0.4/grsecurity/grsec_exec.c
+--- linux-3.0.4/grsecurity/grsec_exec.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_exec.c        2011-08-25 17:25:59.000000000 -0400
+@@ -0,0 +1,72 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/file.h>
@@ -47800,21 +50656,6 @@ diff -urNp linux-3.0.3/grsecurity/grsec_exec.c linux-3.0.3/grsecurity/grsec_exec
 +static DEFINE_MUTEX(gr_exec_arg_mutex);
 +#endif
 +
-+int
-+gr_handle_nproc(void)
-+{
-+#ifdef CONFIG_GRKERNSEC_EXECVE
-+      const struct cred *cred = current_cred();
-+      if (grsec_enable_execve && cred->user &&
-+          (atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) &&
-+          !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE)) {
-+              gr_log_noargs(GR_DONT_AUDIT, GR_NPROC_MSG);
-+              return -EAGAIN;
-+      }
-+#endif
-+      return 0;
-+}
-+
 +extern const char __user *get_user_arg_ptr(struct user_arg_ptr argv, int nr);
 +
 +void
@@ -47869,9 +50710,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_exec.c linux-3.0.3/grsecurity/grsec_exec
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_fifo.c linux-3.0.3/grsecurity/grsec_fifo.c
---- linux-3.0.3/grsecurity/grsec_fifo.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_fifo.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_fifo.c linux-3.0.4/grsecurity/grsec_fifo.c
+--- linux-3.0.4/grsecurity/grsec_fifo.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_fifo.c        2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,24 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47897,9 +50738,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_fifo.c linux-3.0.3/grsecurity/grsec_fifo
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_fork.c linux-3.0.3/grsecurity/grsec_fork.c
---- linux-3.0.3/grsecurity/grsec_fork.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_fork.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_fork.c linux-3.0.4/grsecurity/grsec_fork.c
+--- linux-3.0.4/grsecurity/grsec_fork.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_fork.c        2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,23 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -47924,10 +50765,10 @@ diff -urNp linux-3.0.3/grsecurity/grsec_fork.c linux-3.0.3/grsecurity/grsec_fork
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_init.c linux-3.0.3/grsecurity/grsec_init.c
---- linux-3.0.3/grsecurity/grsec_init.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_init.c        2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,273 @@
+diff -urNp linux-3.0.4/grsecurity/grsec_init.c linux-3.0.4/grsecurity/grsec_init.c
+--- linux-3.0.4/grsecurity/grsec_init.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_init.c        2011-08-25 17:25:12.000000000 -0400
+@@ -0,0 +1,269 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/mm.h>
@@ -47942,7 +50783,6 @@ diff -urNp linux-3.0.3/grsecurity/grsec_init.c linux-3.0.3/grsecurity/grsec_init
 +int grsec_enable_dmesg;
 +int grsec_enable_harden_ptrace;
 +int grsec_enable_fifo;
-+int grsec_enable_execve;
 +int grsec_enable_execlog;
 +int grsec_enable_signal;
 +int grsec_enable_forkfail;
@@ -48115,9 +50955,6 @@ diff -urNp linux-3.0.3/grsecurity/grsec_init.c linux-3.0.3/grsecurity/grsec_init
 +#ifdef CONFIG_GRKERNSEC_FIFO
 +      grsec_enable_fifo = 1;
 +#endif
-+#ifdef CONFIG_GRKERNSEC_EXECVE
-+      grsec_enable_execve = 1;
-+#endif
 +#ifdef CONFIG_GRKERNSEC_EXECLOG
 +      grsec_enable_execlog = 1;
 +#endif
@@ -48201,9 +51038,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_init.c linux-3.0.3/grsecurity/grsec_init
 +
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_link.c linux-3.0.3/grsecurity/grsec_link.c
---- linux-3.0.3/grsecurity/grsec_link.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_link.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_link.c linux-3.0.4/grsecurity/grsec_link.c
+--- linux-3.0.4/grsecurity/grsec_link.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_link.c        2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,43 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48248,9 +51085,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_link.c linux-3.0.3/grsecurity/grsec_link
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_log.c linux-3.0.3/grsecurity/grsec_log.c
---- linux-3.0.3/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_log.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_log.c linux-3.0.4/grsecurity/grsec_log.c
+--- linux-3.0.4/grsecurity/grsec_log.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_log.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,310 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48562,9 +51399,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_log.c linux-3.0.3/grsecurity/grsec_log.c
 +      gr_log_end(audit);
 +      END_LOCKS(audit);
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_mem.c linux-3.0.3/grsecurity/grsec_mem.c
---- linux-3.0.3/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_mem.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_mem.c linux-3.0.4/grsecurity/grsec_mem.c
+--- linux-3.0.4/grsecurity/grsec_mem.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_mem.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,33 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48599,9 +51436,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_mem.c linux-3.0.3/grsecurity/grsec_mem.c
 +      gr_log_noargs(GR_DONT_AUDIT, GR_VM86_MSG);
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_mount.c linux-3.0.3/grsecurity/grsec_mount.c
---- linux-3.0.3/grsecurity/grsec_mount.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_mount.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_mount.c linux-3.0.4/grsecurity/grsec_mount.c
+--- linux-3.0.4/grsecurity/grsec_mount.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_mount.c       2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,62 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48665,9 +51502,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_mount.c linux-3.0.3/grsecurity/grsec_mou
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_pax.c linux-3.0.3/grsecurity/grsec_pax.c
---- linux-3.0.3/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_pax.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_pax.c linux-3.0.4/grsecurity/grsec_pax.c
+--- linux-3.0.4/grsecurity/grsec_pax.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_pax.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,36 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48705,9 +51542,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_pax.c linux-3.0.3/grsecurity/grsec_pax.c
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_ptrace.c linux-3.0.3/grsecurity/grsec_ptrace.c
---- linux-3.0.3/grsecurity/grsec_ptrace.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_ptrace.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_ptrace.c linux-3.0.4/grsecurity/grsec_ptrace.c
+--- linux-3.0.4/grsecurity/grsec_ptrace.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_ptrace.c      2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,14 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48723,9 +51560,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_ptrace.c linux-3.0.3/grsecurity/grsec_pt
 +#endif
 +      return;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_sig.c linux-3.0.3/grsecurity/grsec_sig.c
---- linux-3.0.3/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_sig.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_sig.c linux-3.0.4/grsecurity/grsec_sig.c
+--- linux-3.0.4/grsecurity/grsec_sig.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_sig.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,206 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -48933,9 +51770,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_sig.c linux-3.0.3/grsecurity/grsec_sig.c
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_sock.c linux-3.0.3/grsecurity/grsec_sock.c
---- linux-3.0.3/grsecurity/grsec_sock.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_sock.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_sock.c linux-3.0.4/grsecurity/grsec_sock.c
+--- linux-3.0.4/grsecurity/grsec_sock.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_sock.c        2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,244 @@
 +#include <linux/kernel.h>
 +#include <linux/module.h>
@@ -49181,10 +52018,10 @@ diff -urNp linux-3.0.3/grsecurity/grsec_sock.c linux-3.0.3/grsecurity/grsec_sock
 +#endif
 +      return 0;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsec_sysctl.c linux-3.0.3/grsecurity/grsec_sysctl.c
---- linux-3.0.3/grsecurity/grsec_sysctl.c      1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_sysctl.c      2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,442 @@
+diff -urNp linux-3.0.4/grsecurity/grsec_sysctl.c linux-3.0.4/grsecurity/grsec_sysctl.c
+--- linux-3.0.4/grsecurity/grsec_sysctl.c      1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_sysctl.c      2011-08-25 17:26:15.000000000 -0400
+@@ -0,0 +1,433 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
 +#include <linux/sysctl.h>
@@ -49248,15 +52085,6 @@ diff -urNp linux-3.0.3/grsecurity/grsec_sysctl.c linux-3.0.3/grsecurity/grsec_sy
 +              .proc_handler   = &proc_dointvec,
 +      },
 +#endif
-+#ifdef CONFIG_GRKERNSEC_EXECVE
-+      {
-+              .procname       = "execve_limiting",
-+              .data           = &grsec_enable_execve,
-+              .maxlen         = sizeof(int),
-+              .mode           = 0600,
-+              .proc_handler   = &proc_dointvec,
-+      },
-+#endif
 +#ifdef CONFIG_GRKERNSEC_BLACKHOLE
 +      {
 +              .procname       = "ip_blackhole",
@@ -49627,9 +52455,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_sysctl.c linux-3.0.3/grsecurity/grsec_sy
 +      { }
 +};
 +#endif
-diff -urNp linux-3.0.3/grsecurity/grsec_time.c linux-3.0.3/grsecurity/grsec_time.c
---- linux-3.0.3/grsecurity/grsec_time.c        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_time.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_time.c linux-3.0.4/grsecurity/grsec_time.c
+--- linux-3.0.4/grsecurity/grsec_time.c        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_time.c        2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,16 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -49647,9 +52475,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_time.c linux-3.0.3/grsecurity/grsec_time
 +}
 +
 +EXPORT_SYMBOL(gr_log_timechange);
-diff -urNp linux-3.0.3/grsecurity/grsec_tpe.c linux-3.0.3/grsecurity/grsec_tpe.c
---- linux-3.0.3/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsec_tpe.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsec_tpe.c linux-3.0.4/grsecurity/grsec_tpe.c
+--- linux-3.0.4/grsecurity/grsec_tpe.c 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsec_tpe.c 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,39 @@
 +#include <linux/kernel.h>
 +#include <linux/sched.h>
@@ -49690,9 +52518,9 @@ diff -urNp linux-3.0.3/grsecurity/grsec_tpe.c linux-3.0.3/grsecurity/grsec_tpe.c
 +#endif
 +      return 1;
 +}
-diff -urNp linux-3.0.3/grsecurity/grsum.c linux-3.0.3/grsecurity/grsum.c
---- linux-3.0.3/grsecurity/grsum.c     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/grsum.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/grsum.c linux-3.0.4/grsecurity/grsum.c
+--- linux-3.0.4/grsecurity/grsum.c     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/grsum.c     2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,61 @@
 +#include <linux/err.h>
 +#include <linux/kernel.h>
@@ -49755,10 +52583,10 @@ diff -urNp linux-3.0.3/grsecurity/grsum.c linux-3.0.3/grsecurity/grsum.c
 +
 +      return retval;
 +}
-diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
---- linux-3.0.3/grsecurity/Kconfig     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/Kconfig     2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,1050 @@
+diff -urNp linux-3.0.4/grsecurity/Kconfig linux-3.0.4/grsecurity/Kconfig
+--- linux-3.0.4/grsecurity/Kconfig     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/Kconfig     2011-08-25 17:25:34.000000000 -0400
+@@ -0,0 +1,1038 @@
 +#
 +# grecurity configuration
 +#
@@ -49785,7 +52613,6 @@ diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
 +      bool "Low"
 +      select GRKERNSEC_LINK
 +      select GRKERNSEC_FIFO
-+      select GRKERNSEC_EXECVE
 +      select GRKERNSEC_RANDNET
 +      select GRKERNSEC_DMESG
 +      select GRKERNSEC_CHROOT
@@ -49802,7 +52629,6 @@ diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
 +
 +        - Linking restrictions
 +        - FIFO restrictions
-+        - Enforcing RLIMIT_NPROC on execve
 +        - Restricted dmesg
 +        - Enforced chdir("/") on chroot
 +        - Runtime module disabling
@@ -49818,7 +52644,6 @@ diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
 +      select GRKERNSEC_CHROOT_SYSCTL
 +      select GRKERNSEC_LINK
 +      select GRKERNSEC_FIFO
-+      select GRKERNSEC_EXECVE
 +      select GRKERNSEC_DMESG
 +      select GRKERNSEC_RANDNET
 +      select GRKERNSEC_FORKFAIL
@@ -49868,7 +52693,6 @@ diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
 +      bool "High"
 +      select GRKERNSEC_LINK
 +      select GRKERNSEC_FIFO
-+      select GRKERNSEC_EXECVE
 +      select GRKERNSEC_DMESG
 +      select GRKERNSEC_FORKFAIL
 +      select GRKERNSEC_TIME
@@ -50536,14 +53360,6 @@ diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
 +menu "Executable Protections"
 +depends on GRKERNSEC
 +
-+config GRKERNSEC_EXECVE
-+      bool "Enforce RLIMIT_NPROC on execs"
-+      help
-+        If you say Y here, users with a resource limit on processes will
-+        have the value checked during execve() calls.  The current system
-+        only checks the system limit during fork() calls.  If the sysctl option
-+        is enabled, a sysctl option with name "execve_limiting" is created.
-+
 +config GRKERNSEC_DMESG
 +      bool "Dmesg(8) restriction"
 +      help
@@ -50809,9 +53625,9 @@ diff -urNp linux-3.0.3/grsecurity/Kconfig linux-3.0.3/grsecurity/Kconfig
 +endmenu
 +
 +endmenu
-diff -urNp linux-3.0.3/grsecurity/Makefile linux-3.0.3/grsecurity/Makefile
---- linux-3.0.3/grsecurity/Makefile    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/grsecurity/Makefile    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/grsecurity/Makefile linux-3.0.4/grsecurity/Makefile
+--- linux-3.0.4/grsecurity/Makefile    1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/grsecurity/Makefile    2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,34 @@
 +# grsecurity's ACL system was originally written in 2001 by Michael Dalton
 +# during 2001-2009 it has been completely redesigned by Brad Spengler
@@ -50847,9 +53663,9 @@ diff -urNp linux-3.0.3/grsecurity/Makefile linux-3.0.3/grsecurity/Makefile
 +      @-chmod -f 700 .
 +      @echo '  grsec: protected kernel image paths'
 +endif
-diff -urNp linux-3.0.3/include/acpi/acpi_bus.h linux-3.0.3/include/acpi/acpi_bus.h
---- linux-3.0.3/include/acpi/acpi_bus.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/acpi/acpi_bus.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/acpi/acpi_bus.h linux-3.0.4/include/acpi/acpi_bus.h
+--- linux-3.0.4/include/acpi/acpi_bus.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/acpi/acpi_bus.h        2011-08-23 21:47:56.000000000 -0400
 @@ -107,7 +107,7 @@ struct acpi_device_ops {
        acpi_op_bind bind;
        acpi_op_unbind unbind;
@@ -50859,9 +53675,9 @@ diff -urNp linux-3.0.3/include/acpi/acpi_bus.h linux-3.0.3/include/acpi/acpi_bus
  
  #define ACPI_DRIVER_ALL_NOTIFY_EVENTS 0x1     /* system AND device events */
  
-diff -urNp linux-3.0.3/include/asm-generic/atomic-long.h linux-3.0.3/include/asm-generic/atomic-long.h
---- linux-3.0.3/include/asm-generic/atomic-long.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/atomic-long.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/atomic-long.h linux-3.0.4/include/asm-generic/atomic-long.h
+--- linux-3.0.4/include/asm-generic/atomic-long.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/atomic-long.h      2011-08-23 21:47:56.000000000 -0400
 @@ -22,6 +22,12 @@
  
  typedef atomic64_t atomic_long_t;
@@ -51162,9 +53978,9 @@ diff -urNp linux-3.0.3/include/asm-generic/atomic-long.h linux-3.0.3/include/asm
 +#endif
 +
  #endif  /*  _ASM_GENERIC_ATOMIC_LONG_H  */
-diff -urNp linux-3.0.3/include/asm-generic/cache.h linux-3.0.3/include/asm-generic/cache.h
---- linux-3.0.3/include/asm-generic/cache.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/cache.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/cache.h linux-3.0.4/include/asm-generic/cache.h
+--- linux-3.0.4/include/asm-generic/cache.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/cache.h    2011-08-23 21:47:56.000000000 -0400
 @@ -6,7 +6,7 @@
   * cache lines need to provide their own cache.h.
   */
@@ -51175,9 +53991,9 @@ diff -urNp linux-3.0.3/include/asm-generic/cache.h linux-3.0.3/include/asm-gener
 +#define L1_CACHE_BYTES                (1UL << L1_CACHE_SHIFT)
  
  #endif /* __ASM_GENERIC_CACHE_H */
-diff -urNp linux-3.0.3/include/asm-generic/int-l64.h linux-3.0.3/include/asm-generic/int-l64.h
---- linux-3.0.3/include/asm-generic/int-l64.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/int-l64.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/int-l64.h linux-3.0.4/include/asm-generic/int-l64.h
+--- linux-3.0.4/include/asm-generic/int-l64.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/int-l64.h  2011-08-23 21:47:56.000000000 -0400
 @@ -46,6 +46,8 @@ typedef unsigned int u32;
  typedef signed long s64;
  typedef unsigned long u64;
@@ -51187,9 +54003,9 @@ diff -urNp linux-3.0.3/include/asm-generic/int-l64.h linux-3.0.3/include/asm-gen
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.3/include/asm-generic/int-ll64.h linux-3.0.3/include/asm-generic/int-ll64.h
---- linux-3.0.3/include/asm-generic/int-ll64.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/int-ll64.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/int-ll64.h linux-3.0.4/include/asm-generic/int-ll64.h
+--- linux-3.0.4/include/asm-generic/int-ll64.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/int-ll64.h 2011-08-23 21:47:56.000000000 -0400
 @@ -51,6 +51,8 @@ typedef unsigned int u32;
  typedef signed long long s64;
  typedef unsigned long long u64;
@@ -51199,9 +54015,9 @@ diff -urNp linux-3.0.3/include/asm-generic/int-ll64.h linux-3.0.3/include/asm-ge
  #define S8_C(x)  x
  #define U8_C(x)  x ## U
  #define S16_C(x) x
-diff -urNp linux-3.0.3/include/asm-generic/kmap_types.h linux-3.0.3/include/asm-generic/kmap_types.h
---- linux-3.0.3/include/asm-generic/kmap_types.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/kmap_types.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/kmap_types.h linux-3.0.4/include/asm-generic/kmap_types.h
+--- linux-3.0.4/include/asm-generic/kmap_types.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/kmap_types.h       2011-08-23 21:47:56.000000000 -0400
 @@ -29,10 +29,11 @@ KMAP_D(16) KM_IRQ_PTE,
  KMAP_D(17)    KM_NMI,
  KMAP_D(18)    KM_NMI_PTE,
@@ -51215,9 +54031,9 @@ diff -urNp linux-3.0.3/include/asm-generic/kmap_types.h linux-3.0.3/include/asm-
  };
  
  #undef KMAP_D
-diff -urNp linux-3.0.3/include/asm-generic/pgtable.h linux-3.0.3/include/asm-generic/pgtable.h
---- linux-3.0.3/include/asm-generic/pgtable.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/pgtable.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/pgtable.h linux-3.0.4/include/asm-generic/pgtable.h
+--- linux-3.0.4/include/asm-generic/pgtable.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/pgtable.h  2011-08-23 21:47:56.000000000 -0400
 @@ -443,6 +443,14 @@ static inline int pmd_write(pmd_t pmd)
  #endif /* __HAVE_ARCH_PMD_WRITE */
  #endif
@@ -51233,9 +54049,9 @@ diff -urNp linux-3.0.3/include/asm-generic/pgtable.h linux-3.0.3/include/asm-gen
  #endif /* !__ASSEMBLY__ */
  
  #endif /* _ASM_GENERIC_PGTABLE_H */
-diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopmd.h linux-3.0.3/include/asm-generic/pgtable-nopmd.h
---- linux-3.0.3/include/asm-generic/pgtable-nopmd.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/pgtable-nopmd.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopmd.h linux-3.0.4/include/asm-generic/pgtable-nopmd.h
+--- linux-3.0.4/include/asm-generic/pgtable-nopmd.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/pgtable-nopmd.h    2011-08-23 21:47:56.000000000 -0400
 @@ -1,14 +1,19 @@
  #ifndef _PGTABLE_NOPMD_H
  #define _PGTABLE_NOPMD_H
@@ -51272,9 +54088,9 @@ diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopmd.h linux-3.0.3/include/a
  /*
   * The "pud_xxx()" functions here are trivial for a folded two-level
   * setup: the pmd is never bad, and a pmd always exists (as it's folded
-diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopud.h linux-3.0.3/include/asm-generic/pgtable-nopud.h
---- linux-3.0.3/include/asm-generic/pgtable-nopud.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/pgtable-nopud.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/pgtable-nopud.h linux-3.0.4/include/asm-generic/pgtable-nopud.h
+--- linux-3.0.4/include/asm-generic/pgtable-nopud.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/pgtable-nopud.h    2011-08-23 21:47:56.000000000 -0400
 @@ -1,10 +1,15 @@
  #ifndef _PGTABLE_NOPUD_H
  #define _PGTABLE_NOPUD_H
@@ -51305,9 +54121,9 @@ diff -urNp linux-3.0.3/include/asm-generic/pgtable-nopud.h linux-3.0.3/include/a
  /*
   * The "pgd_xxx()" functions here are trivial for a folded two-level
   * setup: the pud is never bad, and a pud always exists (as it's folded
-diff -urNp linux-3.0.3/include/asm-generic/vmlinux.lds.h linux-3.0.3/include/asm-generic/vmlinux.lds.h
---- linux-3.0.3/include/asm-generic/vmlinux.lds.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/asm-generic/vmlinux.lds.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/asm-generic/vmlinux.lds.h linux-3.0.4/include/asm-generic/vmlinux.lds.h
+--- linux-3.0.4/include/asm-generic/vmlinux.lds.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/asm-generic/vmlinux.lds.h      2011-08-23 21:47:56.000000000 -0400
 @@ -217,6 +217,7 @@
        .rodata           : AT(ADDR(.rodata) - LOAD_OFFSET) {           \
                VMLINUX_SYMBOL(__start_rodata) = .;                     \
@@ -51339,9 +54155,9 @@ diff -urNp linux-3.0.3/include/asm-generic/vmlinux.lds.h linux-3.0.3/include/asm
  
  /**
   * PERCPU_SECTION - define output section for percpu area, simple version
-diff -urNp linux-3.0.3/include/drm/drm_crtc_helper.h linux-3.0.3/include/drm/drm_crtc_helper.h
---- linux-3.0.3/include/drm/drm_crtc_helper.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/drm/drm_crtc_helper.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/drm/drm_crtc_helper.h linux-3.0.4/include/drm/drm_crtc_helper.h
+--- linux-3.0.4/include/drm/drm_crtc_helper.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/drm/drm_crtc_helper.h  2011-08-23 21:47:56.000000000 -0400
 @@ -74,7 +74,7 @@ struct drm_crtc_helper_funcs {
  
        /* disable crtc when not in use - more explicit than dpms off */
@@ -51360,9 +54176,9 @@ diff -urNp linux-3.0.3/include/drm/drm_crtc_helper.h linux-3.0.3/include/drm/drm
  
  struct drm_connector_helper_funcs {
        int (*get_modes)(struct drm_connector *connector);
-diff -urNp linux-3.0.3/include/drm/drmP.h linux-3.0.3/include/drm/drmP.h
---- linux-3.0.3/include/drm/drmP.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/drm/drmP.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/drm/drmP.h linux-3.0.4/include/drm/drmP.h
+--- linux-3.0.4/include/drm/drmP.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/drm/drmP.h     2011-08-23 21:47:56.000000000 -0400
 @@ -73,6 +73,7 @@
  #include <linux/workqueue.h>
  #include <linux/poll.h>
@@ -51389,9 +54205,9 @@ diff -urNp linux-3.0.3/include/drm/drmP.h linux-3.0.3/include/drm/drmP.h
        /*@} */
  
        struct list_head filelist;
-diff -urNp linux-3.0.3/include/drm/ttm/ttm_memory.h linux-3.0.3/include/drm/ttm/ttm_memory.h
---- linux-3.0.3/include/drm/ttm/ttm_memory.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/drm/ttm/ttm_memory.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/drm/ttm/ttm_memory.h linux-3.0.4/include/drm/ttm/ttm_memory.h
+--- linux-3.0.4/include/drm/ttm/ttm_memory.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/drm/ttm/ttm_memory.h   2011-08-23 21:47:56.000000000 -0400
 @@ -47,7 +47,7 @@
  
  struct ttm_mem_shrink {
@@ -51401,9 +54217,9 @@ diff -urNp linux-3.0.3/include/drm/ttm/ttm_memory.h linux-3.0.3/include/drm/ttm/
  
  /**
   * struct ttm_mem_global - Global memory accounting structure.
-diff -urNp linux-3.0.3/include/linux/a.out.h linux-3.0.3/include/linux/a.out.h
---- linux-3.0.3/include/linux/a.out.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/a.out.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/a.out.h linux-3.0.4/include/linux/a.out.h
+--- linux-3.0.4/include/linux/a.out.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/a.out.h  2011-08-23 21:47:56.000000000 -0400
 @@ -39,6 +39,14 @@ enum machine_type {
    M_MIPS2 = 152               /* MIPS R6000/R4000 binary */
  };
@@ -51419,9 +54235,9 @@ diff -urNp linux-3.0.3/include/linux/a.out.h linux-3.0.3/include/linux/a.out.h
  #if !defined (N_MAGIC)
  #define N_MAGIC(exec) ((exec).a_info & 0xffff)
  #endif
-diff -urNp linux-3.0.3/include/linux/atmdev.h linux-3.0.3/include/linux/atmdev.h
---- linux-3.0.3/include/linux/atmdev.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/atmdev.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/atmdev.h linux-3.0.4/include/linux/atmdev.h
+--- linux-3.0.4/include/linux/atmdev.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/atmdev.h 2011-08-23 21:47:56.000000000 -0400
 @@ -237,7 +237,7 @@ struct compat_atm_iobuf {
  #endif
  
@@ -51431,9 +54247,9 @@ diff -urNp linux-3.0.3/include/linux/atmdev.h linux-3.0.3/include/linux/atmdev.h
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.3/include/linux/binfmts.h linux-3.0.3/include/linux/binfmts.h
---- linux-3.0.3/include/linux/binfmts.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/binfmts.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/binfmts.h linux-3.0.4/include/linux/binfmts.h
+--- linux-3.0.4/include/linux/binfmts.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/binfmts.h        2011-08-23 21:47:56.000000000 -0400
 @@ -88,6 +88,7 @@ struct linux_binfmt {
        int (*load_binary)(struct linux_binprm *, struct  pt_regs * regs);
        int (*load_shlib)(struct file *);
@@ -51442,21 +54258,21 @@ diff -urNp linux-3.0.3/include/linux/binfmts.h linux-3.0.3/include/linux/binfmts
        unsigned long min_coredump;     /* minimal dump size */
  };
  
-diff -urNp linux-3.0.3/include/linux/blkdev.h linux-3.0.3/include/linux/blkdev.h
---- linux-3.0.3/include/linux/blkdev.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/blkdev.h 2011-08-23 21:47:56.000000000 -0400
-@@ -1307,7 +1307,7 @@ struct block_device_operations {
-       int (*getgeo)(struct block_device *, struct hd_geometry *);
+diff -urNp linux-3.0.4/include/linux/blkdev.h linux-3.0.4/include/linux/blkdev.h
+--- linux-3.0.4/include/linux/blkdev.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/blkdev.h 2011-08-26 19:49:56.000000000 -0400
+@@ -1308,7 +1308,7 @@ struct block_device_operations {
        /* this callback is with swap_lock and sometimes page table lock held */
        void (*swap_slot_free_notify) (struct block_device *, unsigned long);
--      struct module *owner;
-+      struct module * const owner;
- };
+       struct module *owner;
+-};
++} __do_const;
  
  extern int __blkdev_driver_ioctl(struct block_device *, fmode_t, unsigned int,
-diff -urNp linux-3.0.3/include/linux/blktrace_api.h linux-3.0.3/include/linux/blktrace_api.h
---- linux-3.0.3/include/linux/blktrace_api.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/blktrace_api.h   2011-08-23 21:47:56.000000000 -0400
+                                unsigned long);
+diff -urNp linux-3.0.4/include/linux/blktrace_api.h linux-3.0.4/include/linux/blktrace_api.h
+--- linux-3.0.4/include/linux/blktrace_api.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/blktrace_api.h   2011-08-23 21:47:56.000000000 -0400
 @@ -161,7 +161,7 @@ struct blk_trace {
        struct dentry *dir;
        struct dentry *dropped_file;
@@ -51466,9 +54282,9 @@ diff -urNp linux-3.0.3/include/linux/blktrace_api.h linux-3.0.3/include/linux/bl
  };
  
  extern int blk_trace_ioctl(struct block_device *, unsigned, char __user *);
-diff -urNp linux-3.0.3/include/linux/byteorder/little_endian.h linux-3.0.3/include/linux/byteorder/little_endian.h
---- linux-3.0.3/include/linux/byteorder/little_endian.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/byteorder/little_endian.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/byteorder/little_endian.h linux-3.0.4/include/linux/byteorder/little_endian.h
+--- linux-3.0.4/include/linux/byteorder/little_endian.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/byteorder/little_endian.h        2011-08-23 21:47:56.000000000 -0400
 @@ -42,51 +42,51 @@
  
  static inline __le64 __cpu_to_le64p(const __u64 *p)
@@ -51533,9 +54349,9 @@ diff -urNp linux-3.0.3/include/linux/byteorder/little_endian.h linux-3.0.3/inclu
  }
  #define __cpu_to_le64s(x) do { (void)(x); } while (0)
  #define __le64_to_cpus(x) do { (void)(x); } while (0)
-diff -urNp linux-3.0.3/include/linux/cache.h linux-3.0.3/include/linux/cache.h
---- linux-3.0.3/include/linux/cache.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/cache.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/cache.h linux-3.0.4/include/linux/cache.h
+--- linux-3.0.4/include/linux/cache.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/cache.h  2011-08-23 21:47:56.000000000 -0400
 @@ -16,6 +16,10 @@
  #define __read_mostly
  #endif
@@ -51547,9 +54363,9 @@ diff -urNp linux-3.0.3/include/linux/cache.h linux-3.0.3/include/linux/cache.h
  #ifndef ____cacheline_aligned
  #define ____cacheline_aligned __attribute__((__aligned__(SMP_CACHE_BYTES)))
  #endif
-diff -urNp linux-3.0.3/include/linux/capability.h linux-3.0.3/include/linux/capability.h
---- linux-3.0.3/include/linux/capability.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/capability.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/capability.h linux-3.0.4/include/linux/capability.h
+--- linux-3.0.4/include/linux/capability.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/capability.h     2011-08-23 21:48:14.000000000 -0400
 @@ -547,6 +547,9 @@ extern bool capable(int cap);
  extern bool ns_capable(struct user_namespace *ns, int cap);
  extern bool task_ns_capable(struct task_struct *t, int cap);
@@ -51560,9 +54376,9 @@ diff -urNp linux-3.0.3/include/linux/capability.h linux-3.0.3/include/linux/capa
  
  /* audit system wants to get cap info from files as well */
  extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
-diff -urNp linux-3.0.3/include/linux/cleancache.h linux-3.0.3/include/linux/cleancache.h
---- linux-3.0.3/include/linux/cleancache.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/cleancache.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/cleancache.h linux-3.0.4/include/linux/cleancache.h
+--- linux-3.0.4/include/linux/cleancache.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/cleancache.h     2011-08-23 21:47:56.000000000 -0400
 @@ -31,7 +31,7 @@ struct cleancache_ops {
        void (*flush_page)(int, struct cleancache_filekey, pgoff_t);
        void (*flush_inode)(int, struct cleancache_filekey);
@@ -51572,20 +54388,23 @@ diff -urNp linux-3.0.3/include/linux/cleancache.h linux-3.0.3/include/linux/clea
  
  extern struct cleancache_ops
        cleancache_register_ops(struct cleancache_ops *ops);
-diff -urNp linux-3.0.3/include/linux/compiler-gcc4.h linux-3.0.3/include/linux/compiler-gcc4.h
---- linux-3.0.3/include/linux/compiler-gcc4.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/compiler-gcc4.h  2011-08-23 21:47:56.000000000 -0400
-@@ -31,6 +31,9 @@
+diff -urNp linux-3.0.4/include/linux/compiler-gcc4.h linux-3.0.4/include/linux/compiler-gcc4.h
+--- linux-3.0.4/include/linux/compiler-gcc4.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/compiler-gcc4.h  2011-08-26 19:49:56.000000000 -0400
+@@ -31,6 +31,12 @@
  
  
  #if __GNUC_MINOR__ >= 5
 +
++#ifdef CONSTIFY_PLUGIN
 +#define __no_const __attribute__((no_const))
++#define __do_const __attribute__((do_const))
++#endif
 +
  /*
   * Mark a position in code as unreachable.  This can be used to
   * suppress control flow warnings after asm blocks that transfer
-@@ -46,6 +49,11 @@
+@@ -46,6 +52,11 @@
  #define __noclone     __attribute__((__noclone__))
  
  #endif
@@ -51597,21 +54416,25 @@ diff -urNp linux-3.0.3/include/linux/compiler-gcc4.h linux-3.0.3/include/linux/c
  #endif
  
  #if __GNUC_MINOR__ > 0
-diff -urNp linux-3.0.3/include/linux/compiler.h linux-3.0.3/include/linux/compiler.h
---- linux-3.0.3/include/linux/compiler.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/compiler.h       2011-08-23 21:47:56.000000000 -0400
-@@ -264,6 +264,10 @@ void ftrace_likely_update(struct ftrace_
+diff -urNp linux-3.0.4/include/linux/compiler.h linux-3.0.4/include/linux/compiler.h
+--- linux-3.0.4/include/linux/compiler.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/compiler.h       2011-08-26 19:49:56.000000000 -0400
+@@ -264,6 +264,14 @@ void ftrace_likely_update(struct ftrace_
  # define __attribute_const__  /* unimplemented */
  #endif
  
 +#ifndef __no_const
 +# define __no_const
 +#endif
++
++#ifndef __do_const
++# define __do_const
++#endif
 +
  /*
   * Tell gcc if a function is cold. The compiler will assume any path
   * directly leading to the call is unlikely.
-@@ -273,6 +277,22 @@ void ftrace_likely_update(struct ftrace_
+@@ -273,6 +281,22 @@ void ftrace_likely_update(struct ftrace_
  #define __cold
  #endif
  
@@ -51634,7 +54457,7 @@ diff -urNp linux-3.0.3/include/linux/compiler.h linux-3.0.3/include/linux/compil
  /* Simple shorthand for a section definition */
  #ifndef __section
  # define __section(S) __attribute__ ((__section__(#S)))
-@@ -306,6 +326,7 @@ void ftrace_likely_update(struct ftrace_
+@@ -306,6 +330,7 @@ void ftrace_likely_update(struct ftrace_
   * use is to mediate communication between process-level code and irq/NMI
   * handlers, all running on the same CPU.
   */
@@ -51643,9 +54466,9 @@ diff -urNp linux-3.0.3/include/linux/compiler.h linux-3.0.3/include/linux/compil
 +#define ACCESS_ONCE_RW(x) (*(volatile typeof(x) *)&(x))
  
  #endif /* __LINUX_COMPILER_H */
-diff -urNp linux-3.0.3/include/linux/cpuset.h linux-3.0.3/include/linux/cpuset.h
---- linux-3.0.3/include/linux/cpuset.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/cpuset.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/cpuset.h linux-3.0.4/include/linux/cpuset.h
+--- linux-3.0.4/include/linux/cpuset.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/cpuset.h 2011-08-23 21:47:56.000000000 -0400
 @@ -118,7 +118,7 @@ static inline void put_mems_allowed(void
         * nodemask.
         */
@@ -51655,9 +54478,9 @@ diff -urNp linux-3.0.3/include/linux/cpuset.h linux-3.0.3/include/linux/cpuset.h
  }
  
  static inline void set_mems_allowed(nodemask_t nodemask)
-diff -urNp linux-3.0.3/include/linux/crypto.h linux-3.0.3/include/linux/crypto.h
---- linux-3.0.3/include/linux/crypto.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/crypto.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/crypto.h linux-3.0.4/include/linux/crypto.h
+--- linux-3.0.4/include/linux/crypto.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/crypto.h 2011-08-23 21:47:56.000000000 -0400
 @@ -361,7 +361,7 @@ struct cipher_tfm {
                          const u8 *key, unsigned int keylen);
        void (*cit_encrypt_one)(struct crypto_tfm *tfm, u8 *dst, const u8 *src);
@@ -51683,9 +54506,9 @@ diff -urNp linux-3.0.3/include/linux/crypto.h linux-3.0.3/include/linux/crypto.h
  
  #define crt_ablkcipher        crt_u.ablkcipher
  #define crt_aead      crt_u.aead
-diff -urNp linux-3.0.3/include/linux/decompress/mm.h linux-3.0.3/include/linux/decompress/mm.h
---- linux-3.0.3/include/linux/decompress/mm.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/decompress/mm.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/decompress/mm.h linux-3.0.4/include/linux/decompress/mm.h
+--- linux-3.0.4/include/linux/decompress/mm.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/decompress/mm.h  2011-08-23 21:47:56.000000000 -0400
 @@ -77,7 +77,7 @@ static void free(void *where)
   * warnings when not needed (indeed large_malloc / large_free are not
   * needed by inflate */
@@ -51695,21 +54518,21 @@ diff -urNp linux-3.0.3/include/linux/decompress/mm.h linux-3.0.3/include/linux/d
  #define free(a) kfree(a)
  
  #define large_malloc(a) vmalloc(a)
-diff -urNp linux-3.0.3/include/linux/dma-mapping.h linux-3.0.3/include/linux/dma-mapping.h
---- linux-3.0.3/include/linux/dma-mapping.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/dma-mapping.h    2011-08-23 21:47:56.000000000 -0400
-@@ -49,7 +49,7 @@ struct dma_map_ops {
-       int (*mapping_error)(struct device *dev, dma_addr_t dma_addr);
+diff -urNp linux-3.0.4/include/linux/dma-mapping.h linux-3.0.4/include/linux/dma-mapping.h
+--- linux-3.0.4/include/linux/dma-mapping.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/dma-mapping.h    2011-08-26 19:49:56.000000000 -0400
+@@ -50,7 +50,7 @@ struct dma_map_ops {
        int (*dma_supported)(struct device *dev, u64 mask);
        int (*set_dma_mask)(struct device *dev, u64 mask);
--      int is_phys;
-+      const int is_phys;
- };
+       int is_phys;
+-};
++} __do_const;
  
  #define DMA_BIT_MASK(n)       (((n) == 64) ? ~0ULL : ((1ULL<<(n))-1))
-diff -urNp linux-3.0.3/include/linux/efi.h linux-3.0.3/include/linux/efi.h
---- linux-3.0.3/include/linux/efi.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/efi.h    2011-08-23 21:47:56.000000000 -0400
+ 
+diff -urNp linux-3.0.4/include/linux/efi.h linux-3.0.4/include/linux/efi.h
+--- linux-3.0.4/include/linux/efi.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/efi.h    2011-08-23 21:47:56.000000000 -0400
 @@ -410,7 +410,7 @@ struct efivar_operations {
        efi_get_variable_t *get_variable;
        efi_get_next_variable_t *get_next_variable;
@@ -51719,9 +54542,9 @@ diff -urNp linux-3.0.3/include/linux/efi.h linux-3.0.3/include/linux/efi.h
  
  struct efivars {
        /*
-diff -urNp linux-3.0.3/include/linux/elf.h linux-3.0.3/include/linux/elf.h
---- linux-3.0.3/include/linux/elf.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/elf.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/elf.h linux-3.0.4/include/linux/elf.h
+--- linux-3.0.4/include/linux/elf.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/elf.h    2011-08-23 21:47:56.000000000 -0400
 @@ -49,6 +49,17 @@ typedef __s64       Elf64_Sxword;
  #define PT_GNU_EH_FRAME               0x6474e550
  
@@ -51794,9 +54617,9 @@ diff -urNp linux-3.0.3/include/linux/elf.h linux-3.0.3/include/linux/elf.h
  
  #endif
  
-diff -urNp linux-3.0.3/include/linux/firewire.h linux-3.0.3/include/linux/firewire.h
---- linux-3.0.3/include/linux/firewire.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/firewire.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/firewire.h linux-3.0.4/include/linux/firewire.h
+--- linux-3.0.4/include/linux/firewire.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/firewire.h       2011-08-23 21:47:56.000000000 -0400
 @@ -428,7 +428,7 @@ struct fw_iso_context {
        union {
                fw_iso_callback_t sc;
@@ -51806,9 +54629,9 @@ diff -urNp linux-3.0.3/include/linux/firewire.h linux-3.0.3/include/linux/firewi
        void *callback_data;
  };
  
-diff -urNp linux-3.0.3/include/linux/fscache-cache.h linux-3.0.3/include/linux/fscache-cache.h
---- linux-3.0.3/include/linux/fscache-cache.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fscache-cache.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fscache-cache.h linux-3.0.4/include/linux/fscache-cache.h
+--- linux-3.0.4/include/linux/fscache-cache.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fscache-cache.h  2011-08-23 21:47:56.000000000 -0400
 @@ -102,7 +102,7 @@ struct fscache_operation {
        fscache_operation_release_t release;
  };
@@ -51827,9 +54650,9 @@ diff -urNp linux-3.0.3/include/linux/fscache-cache.h linux-3.0.3/include/linux/f
        op->processor = processor;
        op->release = release;
        INIT_LIST_HEAD(&op->pend_link);
-diff -urNp linux-3.0.3/include/linux/fs.h linux-3.0.3/include/linux/fs.h
---- linux-3.0.3/include/linux/fs.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fs.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fs.h linux-3.0.4/include/linux/fs.h
+--- linux-3.0.4/include/linux/fs.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fs.h     2011-08-26 19:49:56.000000000 -0400
 @@ -109,6 +109,11 @@ struct inodes_stat_t {
  /* File was opened by fanotify and shouldn't generate fanotify events */
  #define FMODE_NONOTIFY                ((__force fmode_t)0x1000000)
@@ -51842,26 +54665,19 @@ diff -urNp linux-3.0.3/include/linux/fs.h linux-3.0.3/include/linux/fs.h
  /*
   * The below are the various read and write types that we support. Some of
   * them include behavioral modifiers that send information down to the
-@@ -1544,7 +1549,7 @@ struct block_device_operations;
-  * the big kernel lock held in all filesystems.
-  */
- struct file_operations {
--      struct module *owner;
-+      struct module * const owner;
-       loff_t (*llseek) (struct file *, loff_t, int);
-       ssize_t (*read) (struct file *, char __user *, size_t, loff_t *);
-       ssize_t (*write) (struct file *, const char __user *, size_t, loff_t *);
-@@ -1572,6 +1577,7 @@ struct file_operations {
+@@ -1571,7 +1576,8 @@ struct file_operations {
+       int (*setlease)(struct file *, long, struct file_lock **);
        long (*fallocate)(struct file *file, int mode, loff_t offset,
                          loff_t len);
- };
+-};
++} __do_const;
 +typedef struct file_operations __no_const file_operations_no_const;
  
  #define IPERM_FLAG_RCU        0x0001
  
-diff -urNp linux-3.0.3/include/linux/fsnotify.h linux-3.0.3/include/linux/fsnotify.h
---- linux-3.0.3/include/linux/fsnotify.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fsnotify.h       2011-08-24 18:10:29.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fsnotify.h linux-3.0.4/include/linux/fsnotify.h
+--- linux-3.0.4/include/linux/fsnotify.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fsnotify.h       2011-08-24 18:10:29.000000000 -0400
 @@ -314,7 +314,7 @@ static inline void fsnotify_change(struc
   */
  static inline const unsigned char *fsnotify_oldname_init(const unsigned char *name)
@@ -51871,9 +54687,9 @@ diff -urNp linux-3.0.3/include/linux/fsnotify.h linux-3.0.3/include/linux/fsnoti
  }
  
  /*
-diff -urNp linux-3.0.3/include/linux/fs_struct.h linux-3.0.3/include/linux/fs_struct.h
---- linux-3.0.3/include/linux/fs_struct.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/fs_struct.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/fs_struct.h linux-3.0.4/include/linux/fs_struct.h
+--- linux-3.0.4/include/linux/fs_struct.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/fs_struct.h      2011-08-23 21:47:56.000000000 -0400
 @@ -6,7 +6,7 @@
  #include <linux/seqlock.h>
  
@@ -51883,9 +54699,9 @@ diff -urNp linux-3.0.3/include/linux/fs_struct.h linux-3.0.3/include/linux/fs_st
        spinlock_t lock;
        seqcount_t seq;
        int umask;
-diff -urNp linux-3.0.3/include/linux/ftrace_event.h linux-3.0.3/include/linux/ftrace_event.h
---- linux-3.0.3/include/linux/ftrace_event.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/ftrace_event.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/ftrace_event.h linux-3.0.4/include/linux/ftrace_event.h
+--- linux-3.0.4/include/linux/ftrace_event.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/ftrace_event.h   2011-08-23 21:47:56.000000000 -0400
 @@ -96,7 +96,7 @@ struct trace_event_functions {
        trace_print_func        raw;
        trace_print_func        hex;
@@ -51904,9 +54720,9 @@ diff -urNp linux-3.0.3/include/linux/ftrace_event.h linux-3.0.3/include/linux/ft
  
  int trace_set_clr_event(const char *system, const char *event, int set);
  
-diff -urNp linux-3.0.3/include/linux/genhd.h linux-3.0.3/include/linux/genhd.h
---- linux-3.0.3/include/linux/genhd.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/genhd.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/genhd.h linux-3.0.4/include/linux/genhd.h
+--- linux-3.0.4/include/linux/genhd.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/genhd.h  2011-08-23 21:47:56.000000000 -0400
 @@ -184,7 +184,7 @@ struct gendisk {
        struct kobject *slave_dir;
  
@@ -51916,9 +54732,9 @@ diff -urNp linux-3.0.3/include/linux/genhd.h linux-3.0.3/include/linux/genhd.h
        struct disk_events *ev;
  #ifdef  CONFIG_BLK_DEV_INTEGRITY
        struct blk_integrity *integrity;
-diff -urNp linux-3.0.3/include/linux/gracl.h linux-3.0.3/include/linux/gracl.h
---- linux-3.0.3/include/linux/gracl.h  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/gracl.h  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/gracl.h linux-3.0.4/include/linux/gracl.h
+--- linux-3.0.4/include/linux/gracl.h  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/gracl.h  2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,317 @@
 +#ifndef GR_ACL_H
 +#define GR_ACL_H
@@ -52237,9 +55053,9 @@ diff -urNp linux-3.0.3/include/linux/gracl.h linux-3.0.3/include/linux/gracl.h
 +
 +#endif
 +
-diff -urNp linux-3.0.3/include/linux/gralloc.h linux-3.0.3/include/linux/gralloc.h
---- linux-3.0.3/include/linux/gralloc.h        1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/gralloc.h        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/gralloc.h linux-3.0.4/include/linux/gralloc.h
+--- linux-3.0.4/include/linux/gralloc.h        1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/gralloc.h        2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef __GRALLOC_H
 +#define __GRALLOC_H
@@ -52250,9 +55066,9 @@ diff -urNp linux-3.0.3/include/linux/gralloc.h linux-3.0.3/include/linux/gralloc
 +void *acl_alloc_num(unsigned long num, unsigned long len);
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grdefs.h linux-3.0.3/include/linux/grdefs.h
---- linux-3.0.3/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grdefs.h 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grdefs.h linux-3.0.4/include/linux/grdefs.h
+--- linux-3.0.4/include/linux/grdefs.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grdefs.h 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,140 @@
 +#ifndef GRDEFS_H
 +#define GRDEFS_H
@@ -52394,9 +55210,9 @@ diff -urNp linux-3.0.3/include/linux/grdefs.h linux-3.0.3/include/linux/grdefs.h
 +};
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grinternal.h linux-3.0.3/include/linux/grinternal.h
---- linux-3.0.3/include/linux/grinternal.h     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grinternal.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grinternal.h linux-3.0.4/include/linux/grinternal.h
+--- linux-3.0.4/include/linux/grinternal.h     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grinternal.h     2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,219 @@
 +#ifndef __GRINTERNAL_H
 +#define __GRINTERNAL_H
@@ -52617,10 +55433,10 @@ diff -urNp linux-3.0.3/include/linux/grinternal.h linux-3.0.3/include/linux/grin
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grmsg.h linux-3.0.3/include/linux/grmsg.h
---- linux-3.0.3/include/linux/grmsg.h  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grmsg.h  2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,108 @@
+diff -urNp linux-3.0.4/include/linux/grmsg.h linux-3.0.4/include/linux/grmsg.h
+--- linux-3.0.4/include/linux/grmsg.h  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grmsg.h  2011-08-25 17:27:26.000000000 -0400
+@@ -0,0 +1,107 @@
 +#define DEFAULTSECMSG "%.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u, parent %.256s[%.16s:%d] uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_ACL_PROCACCT_MSG "%.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u run time:[%ud %uh %um %us] cpu time:[%ud %uh %um %us] %s with exit code %ld, parent %.256s[%.16s:%d] IP:%pI4 TTY:%.64s uid/euid:%u/%u gid/egid:%u/%u"
 +#define GR_PTRACE_ACL_MSG "denied ptrace of %.950s(%.16s:%d) by "
@@ -52654,7 +55470,6 @@ diff -urNp linux-3.0.3/include/linux/grmsg.h linux-3.0.3/include/linux/grmsg.h
 +#define GR_RENAME_ACL_MSG "%s rename of %.480s to %.480s by "
 +#define GR_UNSAFESHARE_EXEC_ACL_MSG "denied exec with cloned fs of %.950s by "
 +#define GR_PTRACE_EXEC_ACL_MSG "denied ptrace of %.950s by "
-+#define GR_NPROC_MSG "denied overstep of process limit by "
 +#define GR_EXEC_ACL_MSG "%s execution of %.950s by "
 +#define GR_EXEC_TPE_MSG "denied untrusted exec of %.950s by "
 +#define GR_SEGVSTART_ACL_MSG "possible exploit bruteforcing on " DEFAULTSECMSG " banning uid %u from login for %lu seconds"
@@ -52729,10 +55544,10 @@ diff -urNp linux-3.0.3/include/linux/grmsg.h linux-3.0.3/include/linux/grmsg.h
 +#define GR_VM86_MSG "denied use of vm86 by "
 +#define GR_PTRACE_AUDIT_MSG "process %.950s(%.16s:%d) attached to via ptrace by "
 +#define GR_INIT_TRANSFER_MSG "persistent special role transferred privilege to init by "
-diff -urNp linux-3.0.3/include/linux/grsecurity.h linux-3.0.3/include/linux/grsecurity.h
---- linux-3.0.3/include/linux/grsecurity.h     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grsecurity.h     2011-08-23 21:48:14.000000000 -0400
-@@ -0,0 +1,228 @@
+diff -urNp linux-3.0.4/include/linux/grsecurity.h linux-3.0.4/include/linux/grsecurity.h
+--- linux-3.0.4/include/linux/grsecurity.h     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grsecurity.h     2011-08-25 17:27:36.000000000 -0400
+@@ -0,0 +1,227 @@
 +#ifndef GR_SECURITY_H
 +#define GR_SECURITY_H
 +#include <linux/fs.h>
@@ -52810,7 +55625,6 @@ diff -urNp linux-3.0.3/include/linux/grsecurity.h linux-3.0.3/include/linux/grse
 +int gr_handle_chroot_unix(const pid_t pid);
 +
 +int gr_handle_rawio(const struct inode *inode);
-+int gr_handle_nproc(void);
 +
 +void gr_handle_ioperm(void);
 +void gr_handle_iopl(void);
@@ -52961,9 +55775,9 @@ diff -urNp linux-3.0.3/include/linux/grsecurity.h linux-3.0.3/include/linux/grse
 +#endif
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/grsock.h linux-3.0.3/include/linux/grsock.h
---- linux-3.0.3/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/grsock.h 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/grsock.h linux-3.0.4/include/linux/grsock.h
+--- linux-3.0.4/include/linux/grsock.h 1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/grsock.h 2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,19 @@
 +#ifndef __GRSOCK_H
 +#define __GRSOCK_H
@@ -52984,9 +55798,9 @@ diff -urNp linux-3.0.3/include/linux/grsock.h linux-3.0.3/include/linux/grsock.h
 +                          const int protocol);
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/hid.h linux-3.0.3/include/linux/hid.h
---- linux-3.0.3/include/linux/hid.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/hid.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/hid.h linux-3.0.4/include/linux/hid.h
+--- linux-3.0.4/include/linux/hid.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/hid.h    2011-08-23 21:47:56.000000000 -0400
 @@ -675,7 +675,7 @@ struct hid_ll_driver {
                        unsigned int code, int value);
  
@@ -52996,9 +55810,9 @@ diff -urNp linux-3.0.3/include/linux/hid.h linux-3.0.3/include/linux/hid.h
  
  #define       PM_HINT_FULLON  1<<5
  #define PM_HINT_NORMAL        1<<1
-diff -urNp linux-3.0.3/include/linux/highmem.h linux-3.0.3/include/linux/highmem.h
---- linux-3.0.3/include/linux/highmem.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/highmem.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/highmem.h linux-3.0.4/include/linux/highmem.h
+--- linux-3.0.4/include/linux/highmem.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/highmem.h        2011-08-23 21:47:56.000000000 -0400
 @@ -185,6 +185,18 @@ static inline void clear_highpage(struct
        kunmap_atomic(kaddr, KM_USER0);
  }
@@ -53018,9 +55832,9 @@ diff -urNp linux-3.0.3/include/linux/highmem.h linux-3.0.3/include/linux/highmem
  static inline void zero_user_segments(struct page *page,
        unsigned start1, unsigned end1,
        unsigned start2, unsigned end2)
-diff -urNp linux-3.0.3/include/linux/i2c.h linux-3.0.3/include/linux/i2c.h
---- linux-3.0.3/include/linux/i2c.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/i2c.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/i2c.h linux-3.0.4/include/linux/i2c.h
+--- linux-3.0.4/include/linux/i2c.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/i2c.h    2011-08-23 21:47:56.000000000 -0400
 @@ -346,6 +346,7 @@ struct i2c_algorithm {
        /* To determine what the adapter supports */
        u32 (*functionality) (struct i2c_adapter *);
@@ -53029,9 +55843,9 @@ diff -urNp linux-3.0.3/include/linux/i2c.h linux-3.0.3/include/linux/i2c.h
  
  /*
   * i2c_adapter is the structure used to identify a physical i2c bus along
-diff -urNp linux-3.0.3/include/linux/i2o.h linux-3.0.3/include/linux/i2o.h
---- linux-3.0.3/include/linux/i2o.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/i2o.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/i2o.h linux-3.0.4/include/linux/i2o.h
+--- linux-3.0.4/include/linux/i2o.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/i2o.h    2011-08-23 21:47:56.000000000 -0400
 @@ -564,7 +564,7 @@ struct i2o_controller {
        struct i2o_device *exec;        /* Executive */
  #if BITS_PER_LONG == 64
@@ -53041,9 +55855,9 @@ diff -urNp linux-3.0.3/include/linux/i2o.h linux-3.0.3/include/linux/i2o.h
        struct list_head context_list;  /* list of context id's
                                           and pointers */
  #endif
-diff -urNp linux-3.0.3/include/linux/init.h linux-3.0.3/include/linux/init.h
---- linux-3.0.3/include/linux/init.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/init.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/init.h linux-3.0.4/include/linux/init.h
+--- linux-3.0.4/include/linux/init.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/init.h   2011-08-23 21:47:56.000000000 -0400
 @@ -293,13 +293,13 @@ void __init parse_early_options(char *cm
  
  /* Each module must use one module_init(). */
@@ -53060,9 +55874,9 @@ diff -urNp linux-3.0.3/include/linux/init.h linux-3.0.3/include/linux/init.h
        { return exitfn; }                                      \
        void cleanup_module(void) __attribute__((alias(#exitfn)));
  
-diff -urNp linux-3.0.3/include/linux/init_task.h linux-3.0.3/include/linux/init_task.h
---- linux-3.0.3/include/linux/init_task.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/init_task.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/init_task.h linux-3.0.4/include/linux/init_task.h
+--- linux-3.0.4/include/linux/init_task.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/init_task.h      2011-08-23 21:47:56.000000000 -0400
 @@ -126,6 +126,12 @@ extern struct cred init_cred;
  # define INIT_PERF_EVENTS(tsk)
  #endif
@@ -53084,9 +55898,9 @@ diff -urNp linux-3.0.3/include/linux/init_task.h linux-3.0.3/include/linux/init_
        .fs             = &init_fs,                                     \
        .files          = &init_files,                                  \
        .signal         = &init_signals,                                \
-diff -urNp linux-3.0.3/include/linux/intel-iommu.h linux-3.0.3/include/linux/intel-iommu.h
---- linux-3.0.3/include/linux/intel-iommu.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/intel-iommu.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/intel-iommu.h linux-3.0.4/include/linux/intel-iommu.h
+--- linux-3.0.4/include/linux/intel-iommu.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/intel-iommu.h    2011-08-23 21:47:56.000000000 -0400
 @@ -296,7 +296,7 @@ struct iommu_flush {
                              u8 fm, u64 type);
        void (*flush_iotlb)(struct intel_iommu *iommu, u16 did, u64 addr,
@@ -53096,9 +55910,9 @@ diff -urNp linux-3.0.3/include/linux/intel-iommu.h linux-3.0.3/include/linux/int
  
  enum {
        SR_DMAR_FECTL_REG,
-diff -urNp linux-3.0.3/include/linux/interrupt.h linux-3.0.3/include/linux/interrupt.h
---- linux-3.0.3/include/linux/interrupt.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/interrupt.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/interrupt.h linux-3.0.4/include/linux/interrupt.h
+--- linux-3.0.4/include/linux/interrupt.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/interrupt.h      2011-08-23 21:47:56.000000000 -0400
 @@ -422,7 +422,7 @@ enum
  /* map softirq index to softirq name. update 'softirq_to_name' in
   * kernel/softirq.c when adding a new softirq.
@@ -53123,9 +55937,9 @@ diff -urNp linux-3.0.3/include/linux/interrupt.h linux-3.0.3/include/linux/inter
  extern void softirq_init(void);
  static inline void __raise_softirq_irqoff(unsigned int nr)
  {
-diff -urNp linux-3.0.3/include/linux/kallsyms.h linux-3.0.3/include/linux/kallsyms.h
---- linux-3.0.3/include/linux/kallsyms.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kallsyms.h       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/kallsyms.h linux-3.0.4/include/linux/kallsyms.h
+--- linux-3.0.4/include/linux/kallsyms.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kallsyms.h       2011-08-23 21:48:14.000000000 -0400
 @@ -15,7 +15,8 @@
  
  struct module;
@@ -53153,9 +55967,9 @@ diff -urNp linux-3.0.3/include/linux/kallsyms.h linux-3.0.3/include/linux/kallsy
  
  /* This macro allows us to keep printk typechecking */
  static void __check_printsym_format(const char *fmt, ...)
-diff -urNp linux-3.0.3/include/linux/kgdb.h linux-3.0.3/include/linux/kgdb.h
---- linux-3.0.3/include/linux/kgdb.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kgdb.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/kgdb.h linux-3.0.4/include/linux/kgdb.h
+--- linux-3.0.4/include/linux/kgdb.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kgdb.h   2011-08-26 19:49:56.000000000 -0400
 @@ -53,7 +53,7 @@ extern int kgdb_connected;
  extern int kgdb_io_module_registered;
  
@@ -53165,37 +55979,27 @@ diff -urNp linux-3.0.3/include/linux/kgdb.h linux-3.0.3/include/linux/kgdb.h
  
  extern struct task_struct     *kgdb_usethread;
  extern struct task_struct     *kgdb_contthread;
-@@ -241,8 +241,8 @@ extern void kgdb_arch_late(void);
-  * hardware debug registers.
-  */
- struct kgdb_arch {
--      unsigned char           gdb_bpt_instr[BREAK_INSTR_SIZE];
--      unsigned long           flags;
-+      const unsigned char     gdb_bpt_instr[BREAK_INSTR_SIZE];
-+      const unsigned long     flags;
- 
-       int     (*set_breakpoint)(unsigned long, char *);
-       int     (*remove_breakpoint)(unsigned long, char *);
-@@ -268,14 +268,14 @@ struct kgdb_arch {
-  * not a console
-  */
- struct kgdb_io {
--      const char              *name;
-+      const char * const      name;
-       int                     (*read_char) (void);
-       void                    (*write_char) (u8);
-       void                    (*flush) (void);
-       int                     (*init) (void);
+@@ -251,7 +251,7 @@ struct kgdb_arch {
+       void    (*disable_hw_break)(struct pt_regs *regs);
+       void    (*remove_all_hw_break)(void);
+       void    (*correct_hw_break)(void);
+-};
++} __do_const;
+ 
+ /**
+  * struct kgdb_io - Describe the interface for an I/O driver to talk with KGDB.
+@@ -276,7 +276,7 @@ struct kgdb_io {
        void                    (*pre_exception) (void);
        void                    (*post_exception) (void);
--      int                     is_console;
-+      const int               is_console;
- };
+       int                     is_console;
+-};
++} __do_const;
  
  extern struct kgdb_arch               arch_kgdb_ops;
-diff -urNp linux-3.0.3/include/linux/kmod.h linux-3.0.3/include/linux/kmod.h
---- linux-3.0.3/include/linux/kmod.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kmod.h   2011-08-23 21:48:14.000000000 -0400
+ 
+diff -urNp linux-3.0.4/include/linux/kmod.h linux-3.0.4/include/linux/kmod.h
+--- linux-3.0.4/include/linux/kmod.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kmod.h   2011-08-23 21:48:14.000000000 -0400
 @@ -34,6 +34,8 @@ extern char modprobe_path[]; /* for sysc
   * usually useless though. */
  extern int __request_module(bool wait, const char *name, ...) \
@@ -53205,9 +56009,9 @@ diff -urNp linux-3.0.3/include/linux/kmod.h linux-3.0.3/include/linux/kmod.h
  #define request_module(mod...) __request_module(true, mod)
  #define request_module_nowait(mod...) __request_module(false, mod)
  #define try_then_request_module(x, mod...) \
-diff -urNp linux-3.0.3/include/linux/kvm_host.h linux-3.0.3/include/linux/kvm_host.h
---- linux-3.0.3/include/linux/kvm_host.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/kvm_host.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/kvm_host.h linux-3.0.4/include/linux/kvm_host.h
+--- linux-3.0.4/include/linux/kvm_host.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/kvm_host.h       2011-08-23 21:47:56.000000000 -0400
 @@ -307,7 +307,7 @@ void kvm_vcpu_uninit(struct kvm_vcpu *vc
  void vcpu_load(struct kvm_vcpu *vcpu);
  void vcpu_put(struct kvm_vcpu *vcpu);
@@ -53226,21 +56030,21 @@ diff -urNp linux-3.0.3/include/linux/kvm_host.h linux-3.0.3/include/linux/kvm_ho
  void kvm_arch_exit(void);
  
  int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu);
-diff -urNp linux-3.0.3/include/linux/libata.h linux-3.0.3/include/linux/libata.h
---- linux-3.0.3/include/linux/libata.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/libata.h 2011-08-23 21:47:56.000000000 -0400
-@@ -898,7 +898,7 @@ struct ata_port_operations {
-        * ->inherits must be the last field and all the preceding
+diff -urNp linux-3.0.4/include/linux/libata.h linux-3.0.4/include/linux/libata.h
+--- linux-3.0.4/include/linux/libata.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/libata.h 2011-08-26 19:49:56.000000000 -0400
+@@ -899,7 +899,7 @@ struct ata_port_operations {
         * fields must be pointers.
         */
--      const struct ata_port_operations        *inherits;
-+      const struct ata_port_operations * const inherits;
- };
+       const struct ata_port_operations        *inherits;
+-};
++} __do_const;
  
  struct ata_port_info {
-diff -urNp linux-3.0.3/include/linux/mca.h linux-3.0.3/include/linux/mca.h
---- linux-3.0.3/include/linux/mca.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mca.h    2011-08-23 21:47:56.000000000 -0400
+       unsigned long           flags;
+diff -urNp linux-3.0.4/include/linux/mca.h linux-3.0.4/include/linux/mca.h
+--- linux-3.0.4/include/linux/mca.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mca.h    2011-08-23 21:47:56.000000000 -0400
 @@ -80,7 +80,7 @@ struct mca_bus_accessor_functions {
                                                  int region);
        void *          (*mca_transform_memory)(struct mca_device *,
@@ -53250,9 +56054,9 @@ diff -urNp linux-3.0.3/include/linux/mca.h linux-3.0.3/include/linux/mca.h
  
  struct mca_bus {
        u64                     default_dma_mask;
-diff -urNp linux-3.0.3/include/linux/memory.h linux-3.0.3/include/linux/memory.h
---- linux-3.0.3/include/linux/memory.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/memory.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/memory.h linux-3.0.4/include/linux/memory.h
+--- linux-3.0.4/include/linux/memory.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/memory.h 2011-08-23 21:47:56.000000000 -0400
 @@ -144,7 +144,7 @@ struct memory_accessor {
                        size_t count);
        ssize_t (*write)(struct memory_accessor *, const char *buf,
@@ -53262,9 +56066,9 @@ diff -urNp linux-3.0.3/include/linux/memory.h linux-3.0.3/include/linux/memory.h
  
  /*
   * Kernel text modification mutex, used for code patching. Users of this lock
-diff -urNp linux-3.0.3/include/linux/mfd/abx500.h linux-3.0.3/include/linux/mfd/abx500.h
---- linux-3.0.3/include/linux/mfd/abx500.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mfd/abx500.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mfd/abx500.h linux-3.0.4/include/linux/mfd/abx500.h
+--- linux-3.0.4/include/linux/mfd/abx500.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mfd/abx500.h     2011-08-23 21:47:56.000000000 -0400
 @@ -234,6 +234,7 @@ struct abx500_ops {
        int (*event_registers_startup_state_get) (struct device *, u8 *);
        int (*startup_irq_enabled) (struct device *, unsigned int);
@@ -53273,9 +56077,9 @@ diff -urNp linux-3.0.3/include/linux/mfd/abx500.h linux-3.0.3/include/linux/mfd/
  
  int abx500_register_ops(struct device *core_dev, struct abx500_ops *ops);
  void abx500_remove_ops(struct device *dev);
-diff -urNp linux-3.0.3/include/linux/mm.h linux-3.0.3/include/linux/mm.h
---- linux-3.0.3/include/linux/mm.h     2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/include/linux/mm.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mm.h linux-3.0.4/include/linux/mm.h
+--- linux-3.0.4/include/linux/mm.h     2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/include/linux/mm.h     2011-08-23 21:47:56.000000000 -0400
 @@ -113,7 +113,14 @@ extern unsigned int kobjsize(const void 
  
  #define VM_CAN_NONLINEAR 0x08000000   /* Has ->fault & does nonlinear pages */
@@ -53398,9 +56202,9 @@ diff -urNp linux-3.0.3/include/linux/mm.h linux-3.0.3/include/linux/mm.h
 +
  #endif /* __KERNEL__ */
  #endif /* _LINUX_MM_H */
-diff -urNp linux-3.0.3/include/linux/mm_types.h linux-3.0.3/include/linux/mm_types.h
---- linux-3.0.3/include/linux/mm_types.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mm_types.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mm_types.h linux-3.0.4/include/linux/mm_types.h
+--- linux-3.0.4/include/linux/mm_types.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mm_types.h       2011-08-23 21:47:56.000000000 -0400
 @@ -184,6 +184,8 @@ struct vm_area_struct {
  #ifdef CONFIG_NUMA
        struct mempolicy *vm_policy;    /* NUMA policy for the VMA */
@@ -53435,9 +56239,9 @@ diff -urNp linux-3.0.3/include/linux/mm_types.h linux-3.0.3/include/linux/mm_typ
  };
  
  static inline void mm_init_cpumask(struct mm_struct *mm)
-diff -urNp linux-3.0.3/include/linux/mmu_notifier.h linux-3.0.3/include/linux/mmu_notifier.h
---- linux-3.0.3/include/linux/mmu_notifier.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mmu_notifier.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mmu_notifier.h linux-3.0.4/include/linux/mmu_notifier.h
+--- linux-3.0.4/include/linux/mmu_notifier.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mmu_notifier.h   2011-08-23 21:47:56.000000000 -0400
 @@ -255,12 +255,12 @@ static inline void mmu_notifier_mm_destr
   */
  #define ptep_clear_flush_notify(__vma, __address, __ptep)             \
@@ -53454,9 +56258,9 @@ diff -urNp linux-3.0.3/include/linux/mmu_notifier.h linux-3.0.3/include/linux/mm
  })
  
  #define pmdp_clear_flush_notify(__vma, __address, __pmdp)             \
-diff -urNp linux-3.0.3/include/linux/mmzone.h linux-3.0.3/include/linux/mmzone.h
---- linux-3.0.3/include/linux/mmzone.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mmzone.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mmzone.h linux-3.0.4/include/linux/mmzone.h
+--- linux-3.0.4/include/linux/mmzone.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mmzone.h 2011-08-23 21:47:56.000000000 -0400
 @@ -350,7 +350,7 @@ struct zone {
        unsigned long           flags;             /* zone flags, see below */
  
@@ -53466,9 +56270,9 @@ diff -urNp linux-3.0.3/include/linux/mmzone.h linux-3.0.3/include/linux/mmzone.h
  
        /*
         * The target ratio of ACTIVE_ANON to INACTIVE_ANON pages on
-diff -urNp linux-3.0.3/include/linux/mod_devicetable.h linux-3.0.3/include/linux/mod_devicetable.h
---- linux-3.0.3/include/linux/mod_devicetable.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/mod_devicetable.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/mod_devicetable.h linux-3.0.4/include/linux/mod_devicetable.h
+--- linux-3.0.4/include/linux/mod_devicetable.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/mod_devicetable.h        2011-08-23 21:47:56.000000000 -0400
 @@ -12,7 +12,7 @@
  typedef unsigned long kernel_ulong_t;
  #endif
@@ -53487,9 +56291,9 @@ diff -urNp linux-3.0.3/include/linux/mod_devicetable.h linux-3.0.3/include/linux
  
  struct hid_device_id {
        __u16 bus;
-diff -urNp linux-3.0.3/include/linux/module.h linux-3.0.3/include/linux/module.h
---- linux-3.0.3/include/linux/module.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/module.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/module.h linux-3.0.4/include/linux/module.h
+--- linux-3.0.4/include/linux/module.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/module.h 2011-08-23 21:47:56.000000000 -0400
 @@ -16,6 +16,7 @@
  #include <linux/kobject.h>
  #include <linux/moduleparam.h>
@@ -53584,9 +56388,9 @@ diff -urNp linux-3.0.3/include/linux/module.h linux-3.0.3/include/linux/module.h
  }
  
  /* Search for module by name: must hold module_mutex. */
-diff -urNp linux-3.0.3/include/linux/moduleloader.h linux-3.0.3/include/linux/moduleloader.h
---- linux-3.0.3/include/linux/moduleloader.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/moduleloader.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/moduleloader.h linux-3.0.4/include/linux/moduleloader.h
+--- linux-3.0.4/include/linux/moduleloader.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/moduleloader.h   2011-08-23 21:47:56.000000000 -0400
 @@ -20,9 +20,21 @@ unsigned int arch_mod_section_prepend(st
     sections.  Returns NULL on failure. */
  void *module_alloc(unsigned long size);
@@ -53609,9 +56413,9 @@ diff -urNp linux-3.0.3/include/linux/moduleloader.h linux-3.0.3/include/linux/mo
  /* Apply the given relocation to the (simplified) ELF.  Return -error
     or 0. */
  int apply_relocate(Elf_Shdr *sechdrs,
-diff -urNp linux-3.0.3/include/linux/moduleparam.h linux-3.0.3/include/linux/moduleparam.h
---- linux-3.0.3/include/linux/moduleparam.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/moduleparam.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/moduleparam.h linux-3.0.4/include/linux/moduleparam.h
+--- linux-3.0.4/include/linux/moduleparam.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/moduleparam.h    2011-08-23 21:47:56.000000000 -0400
 @@ -255,7 +255,7 @@ static inline void __kernel_param_unlock
   * @len is usually just sizeof(string).
   */
@@ -53630,9 +56434,9 @@ diff -urNp linux-3.0.3/include/linux/moduleparam.h linux-3.0.3/include/linux/mod
        = { .max = ARRAY_SIZE(array), .num = nump,                      \
            .ops = &param_ops_##type,                                   \
            .elemsize = sizeof(array[0]), .elem = array };              \
-diff -urNp linux-3.0.3/include/linux/namei.h linux-3.0.3/include/linux/namei.h
---- linux-3.0.3/include/linux/namei.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/namei.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/namei.h linux-3.0.4/include/linux/namei.h
+--- linux-3.0.4/include/linux/namei.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/namei.h  2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@ struct nameidata {
        unsigned        seq;
        int             last_type;
@@ -53657,9 +56461,9 @@ diff -urNp linux-3.0.3/include/linux/namei.h linux-3.0.3/include/linux/namei.h
  {
        return nd->saved_names[nd->depth];
  }
-diff -urNp linux-3.0.3/include/linux/netdevice.h linux-3.0.3/include/linux/netdevice.h
---- linux-3.0.3/include/linux/netdevice.h      2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/include/linux/netdevice.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/netdevice.h linux-3.0.4/include/linux/netdevice.h
+--- linux-3.0.4/include/linux/netdevice.h      2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/include/linux/netdevice.h      2011-08-23 21:47:56.000000000 -0400
 @@ -979,6 +979,7 @@ struct net_device_ops {
        int                     (*ndo_set_features)(struct net_device *dev,
                                                    u32 features);
@@ -53668,9 +56472,9 @@ diff -urNp linux-3.0.3/include/linux/netdevice.h linux-3.0.3/include/linux/netde
  
  /*
   *    The DEVICE structure.
-diff -urNp linux-3.0.3/include/linux/netfilter/xt_gradm.h linux-3.0.3/include/linux/netfilter/xt_gradm.h
---- linux-3.0.3/include/linux/netfilter/xt_gradm.h     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/include/linux/netfilter/xt_gradm.h     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/netfilter/xt_gradm.h linux-3.0.4/include/linux/netfilter/xt_gradm.h
+--- linux-3.0.4/include/linux/netfilter/xt_gradm.h     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/include/linux/netfilter/xt_gradm.h     2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,9 @@
 +#ifndef _LINUX_NETFILTER_XT_GRADM_H
 +#define _LINUX_NETFILTER_XT_GRADM_H 1
@@ -53681,9 +56485,9 @@ diff -urNp linux-3.0.3/include/linux/netfilter/xt_gradm.h linux-3.0.3/include/li
 +};
 +
 +#endif
-diff -urNp linux-3.0.3/include/linux/oprofile.h linux-3.0.3/include/linux/oprofile.h
---- linux-3.0.3/include/linux/oprofile.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/oprofile.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/oprofile.h linux-3.0.4/include/linux/oprofile.h
+--- linux-3.0.4/include/linux/oprofile.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/oprofile.h       2011-08-23 21:47:56.000000000 -0400
 @@ -139,9 +139,9 @@ int oprofilefs_create_ulong(struct super
  int oprofilefs_create_ro_ulong(struct super_block * sb, struct dentry * root,
        char const * name, ulong * val);
@@ -53696,9 +56500,9 @@ diff -urNp linux-3.0.3/include/linux/oprofile.h linux-3.0.3/include/linux/oprofi
   
  /** create a directory */
  struct dentry * oprofilefs_mkdir(struct super_block * sb, struct dentry * root,
-diff -urNp linux-3.0.3/include/linux/padata.h linux-3.0.3/include/linux/padata.h
---- linux-3.0.3/include/linux/padata.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/padata.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/padata.h linux-3.0.4/include/linux/padata.h
+--- linux-3.0.4/include/linux/padata.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/padata.h 2011-08-23 21:47:56.000000000 -0400
 @@ -129,7 +129,7 @@ struct parallel_data {
        struct padata_instance          *pinst;
        struct padata_parallel_queue    __percpu *pqueue;
@@ -53708,9 +56512,9 @@ diff -urNp linux-3.0.3/include/linux/padata.h linux-3.0.3/include/linux/padata.h
        atomic_t                        reorder_objects;
        atomic_t                        refcnt;
        unsigned int                    max_seq_nr;
-diff -urNp linux-3.0.3/include/linux/perf_event.h linux-3.0.3/include/linux/perf_event.h
---- linux-3.0.3/include/linux/perf_event.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/perf_event.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/perf_event.h linux-3.0.4/include/linux/perf_event.h
+--- linux-3.0.4/include/linux/perf_event.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/perf_event.h     2011-08-23 21:47:56.000000000 -0400
 @@ -761,8 +761,8 @@ struct perf_event {
  
        enum perf_event_active_state    state;
@@ -53733,9 +56537,9 @@ diff -urNp linux-3.0.3/include/linux/perf_event.h linux-3.0.3/include/linux/perf
  
        /*
         * Protect attach/detach and child_list:
-diff -urNp linux-3.0.3/include/linux/pipe_fs_i.h linux-3.0.3/include/linux/pipe_fs_i.h
---- linux-3.0.3/include/linux/pipe_fs_i.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/pipe_fs_i.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/pipe_fs_i.h linux-3.0.4/include/linux/pipe_fs_i.h
+--- linux-3.0.4/include/linux/pipe_fs_i.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/pipe_fs_i.h      2011-08-23 21:47:56.000000000 -0400
 @@ -46,9 +46,9 @@ struct pipe_buffer {
  struct pipe_inode_info {
        wait_queue_head_t wait;
@@ -53749,9 +56553,9 @@ diff -urNp linux-3.0.3/include/linux/pipe_fs_i.h linux-3.0.3/include/linux/pipe_
        unsigned int r_counter;
        unsigned int w_counter;
        struct page *tmp_page;
-diff -urNp linux-3.0.3/include/linux/pm_runtime.h linux-3.0.3/include/linux/pm_runtime.h
---- linux-3.0.3/include/linux/pm_runtime.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/pm_runtime.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/pm_runtime.h linux-3.0.4/include/linux/pm_runtime.h
+--- linux-3.0.4/include/linux/pm_runtime.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/pm_runtime.h     2011-08-23 21:47:56.000000000 -0400
 @@ -94,7 +94,7 @@ static inline bool pm_runtime_callbacks_
  
  static inline void pm_runtime_mark_last_busy(struct device *dev)
@@ -53761,9 +56565,9 @@ diff -urNp linux-3.0.3/include/linux/pm_runtime.h linux-3.0.3/include/linux/pm_r
  }
  
  #else /* !CONFIG_PM_RUNTIME */
-diff -urNp linux-3.0.3/include/linux/poison.h linux-3.0.3/include/linux/poison.h
---- linux-3.0.3/include/linux/poison.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/poison.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/poison.h linux-3.0.4/include/linux/poison.h
+--- linux-3.0.4/include/linux/poison.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/poison.h 2011-08-23 21:47:56.000000000 -0400
 @@ -19,8 +19,8 @@
   * under normal circumstances, used to verify that nobody uses
   * non-initialized list entries.
@@ -53775,9 +56579,9 @@ diff -urNp linux-3.0.3/include/linux/poison.h linux-3.0.3/include/linux/poison.h
  
  /********** include/linux/timer.h **********/
  /*
-diff -urNp linux-3.0.3/include/linux/preempt.h linux-3.0.3/include/linux/preempt.h
---- linux-3.0.3/include/linux/preempt.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/preempt.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/preempt.h linux-3.0.4/include/linux/preempt.h
+--- linux-3.0.4/include/linux/preempt.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/preempt.h        2011-08-23 21:47:56.000000000 -0400
 @@ -115,7 +115,7 @@ struct preempt_ops {
        void (*sched_in)(struct preempt_notifier *notifier, int cpu);
        void (*sched_out)(struct preempt_notifier *notifier,
@@ -53787,9 +56591,9 @@ diff -urNp linux-3.0.3/include/linux/preempt.h linux-3.0.3/include/linux/preempt
  
  /**
   * preempt_notifier - key for installing preemption notifiers
-diff -urNp linux-3.0.3/include/linux/proc_fs.h linux-3.0.3/include/linux/proc_fs.h
---- linux-3.0.3/include/linux/proc_fs.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/proc_fs.h        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/proc_fs.h linux-3.0.4/include/linux/proc_fs.h
+--- linux-3.0.4/include/linux/proc_fs.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/proc_fs.h        2011-08-23 21:48:14.000000000 -0400
 @@ -155,6 +155,19 @@ static inline struct proc_dir_entry *pro
        return proc_create_data(name, mode, parent, proc_fops, NULL);
  }
@@ -53819,9 +56623,9 @@ diff -urNp linux-3.0.3/include/linux/proc_fs.h linux-3.0.3/include/linux/proc_fs
  
  struct ctl_table_header;
  struct ctl_table;
-diff -urNp linux-3.0.3/include/linux/ptrace.h linux-3.0.3/include/linux/ptrace.h
---- linux-3.0.3/include/linux/ptrace.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/ptrace.h 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/ptrace.h linux-3.0.4/include/linux/ptrace.h
+--- linux-3.0.4/include/linux/ptrace.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/ptrace.h 2011-08-23 21:48:14.000000000 -0400
 @@ -115,10 +115,10 @@ extern void __ptrace_unlink(struct task_
  extern void exit_ptrace(struct task_struct *tracer);
  #define PTRACE_MODE_READ   1
@@ -53835,9 +56639,9 @@ diff -urNp linux-3.0.3/include/linux/ptrace.h linux-3.0.3/include/linux/ptrace.h
  
  static inline int ptrace_reparented(struct task_struct *child)
  {
-diff -urNp linux-3.0.3/include/linux/random.h linux-3.0.3/include/linux/random.h
---- linux-3.0.3/include/linux/random.h 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/include/linux/random.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/random.h linux-3.0.4/include/linux/random.h
+--- linux-3.0.4/include/linux/random.h 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/include/linux/random.h 2011-08-23 21:47:56.000000000 -0400
 @@ -69,12 +69,17 @@ void srandom32(u32 seed);
  
  u32 prandom32(struct rnd_state *);
@@ -53857,9 +56661,9 @@ diff -urNp linux-3.0.3/include/linux/random.h linux-3.0.3/include/linux/random.h
  }
  
  /**
-diff -urNp linux-3.0.3/include/linux/reboot.h linux-3.0.3/include/linux/reboot.h
---- linux-3.0.3/include/linux/reboot.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/reboot.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/reboot.h linux-3.0.4/include/linux/reboot.h
+--- linux-3.0.4/include/linux/reboot.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/reboot.h 2011-08-23 21:47:56.000000000 -0400
 @@ -47,9 +47,9 @@ extern int unregister_reboot_notifier(st
   * Architecture-specific implementations of sys_reboot commands.
   */
@@ -53895,9 +56699,9 @@ diff -urNp linux-3.0.3/include/linux/reboot.h linux-3.0.3/include/linux/reboot.h
  #include <asm/emergency-restart.h>
  
  #endif
-diff -urNp linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3/include/linux/reiserfs_fs.h
---- linux-3.0.3/include/linux/reiserfs_fs.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/reiserfs_fs.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/reiserfs_fs.h linux-3.0.4/include/linux/reiserfs_fs.h
+--- linux-3.0.4/include/linux/reiserfs_fs.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/reiserfs_fs.h    2011-08-23 21:47:56.000000000 -0400
 @@ -1406,7 +1406,7 @@ static inline loff_t max_reiserfs_offset
  #define REISERFS_USER_MEM             1       /* reiserfs user memory mode            */
  
@@ -53907,9 +56711,9 @@ diff -urNp linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3/include/linux/rei
  #define FILESYSTEM_CHANGED_TB(tb)  (get_generation((tb)->tb_sb) != (tb)->fs_gen)
  #define __fs_changed(gen,s) (gen != get_generation (s))
  #define fs_changed(gen,s)             \
-diff -urNp linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3/include/linux/reiserfs_fs_sb.h
---- linux-3.0.3/include/linux/reiserfs_fs_sb.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/reiserfs_fs_sb.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/reiserfs_fs_sb.h linux-3.0.4/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.4/include/linux/reiserfs_fs_sb.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/reiserfs_fs_sb.h 2011-08-23 21:47:56.000000000 -0400
 @@ -386,7 +386,7 @@ struct reiserfs_sb_info {
        /* Comment? -Hans */
        wait_queue_head_t s_wait;
@@ -53919,9 +56723,9 @@ diff -urNp linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3/include/linux/
        // tree gets re-balanced
        unsigned long s_properties;     /* File system properties. Currently holds
                                           on-disk FS format */
-diff -urNp linux-3.0.3/include/linux/relay.h linux-3.0.3/include/linux/relay.h
---- linux-3.0.3/include/linux/relay.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/relay.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/relay.h linux-3.0.4/include/linux/relay.h
+--- linux-3.0.4/include/linux/relay.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/relay.h  2011-08-23 21:47:56.000000000 -0400
 @@ -159,7 +159,7 @@ struct rchan_callbacks
         * The callback should return 0 if successful, negative if not.
         */
@@ -53931,9 +56735,9 @@ diff -urNp linux-3.0.3/include/linux/relay.h linux-3.0.3/include/linux/relay.h
  
  /*
   * CONFIG_RELAY kernel API, kernel/relay.c
-diff -urNp linux-3.0.3/include/linux/rfkill.h linux-3.0.3/include/linux/rfkill.h
---- linux-3.0.3/include/linux/rfkill.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/rfkill.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/rfkill.h linux-3.0.4/include/linux/rfkill.h
+--- linux-3.0.4/include/linux/rfkill.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/rfkill.h 2011-08-23 21:47:56.000000000 -0400
 @@ -147,6 +147,7 @@ struct rfkill_ops {
        void    (*query)(struct rfkill *rfkill, void *data);
        int     (*set_block)(void *data, bool blocked);
@@ -53942,9 +56746,9 @@ diff -urNp linux-3.0.3/include/linux/rfkill.h linux-3.0.3/include/linux/rfkill.h
  
  #if defined(CONFIG_RFKILL) || defined(CONFIG_RFKILL_MODULE)
  /**
-diff -urNp linux-3.0.3/include/linux/rmap.h linux-3.0.3/include/linux/rmap.h
---- linux-3.0.3/include/linux/rmap.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/rmap.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/rmap.h linux-3.0.4/include/linux/rmap.h
+--- linux-3.0.4/include/linux/rmap.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/rmap.h   2011-08-23 21:47:56.000000000 -0400
 @@ -119,8 +119,8 @@ static inline void anon_vma_unlock(struc
  void anon_vma_init(void);     /* create anon_vma_cachep */
  int  anon_vma_prepare(struct vm_area_struct *);
@@ -53956,9 +56760,9 @@ diff -urNp linux-3.0.3/include/linux/rmap.h linux-3.0.3/include/linux/rmap.h
  void __anon_vma_link(struct vm_area_struct *);
  
  static inline void anon_vma_merge(struct vm_area_struct *vma,
-diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
---- linux-3.0.3/include/linux/sched.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sched.h  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sched.h linux-3.0.4/include/linux/sched.h
+--- linux-3.0.4/include/linux/sched.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sched.h  2011-08-25 17:22:27.000000000 -0400
 @@ -100,6 +100,7 @@ struct bio_list;
  struct fs_struct;
  struct perf_event_context;
@@ -54145,7 +56949,15 @@ diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
  /* Future-safe accessor for struct task_struct's cpus_allowed. */
  #define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)
  
-@@ -2056,7 +2148,9 @@ void yield(void);
+@@ -1768,6 +1860,7 @@ extern void thread_group_times(struct ta
+ #define PF_DUMPCORE   0x00000200      /* dumped core */
+ #define PF_SIGNALED   0x00000400      /* killed by a signal */
+ #define PF_MEMALLOC   0x00000800      /* Allocating memory */
++#define PF_NPROC_EXCEEDED 0x00001000  /* set_user noticed that RLIMIT_NPROC was exceeded */
+ #define PF_USED_MATH  0x00002000      /* if unset the fpu must be initialized before use */
+ #define PF_FREEZING   0x00004000      /* freeze in progress. do not account to load */
+ #define PF_NOFREEZE   0x00008000      /* this thread should not be frozen */
+@@ -2056,7 +2149,9 @@ void yield(void);
  extern struct exec_domain     default_exec_domain;
  
  union thread_union {
@@ -54155,7 +56967,7 @@ diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
        unsigned long stack[THREAD_SIZE/sizeof(long)];
  };
  
-@@ -2089,6 +2183,7 @@ extern struct pid_namespace init_pid_ns;
+@@ -2089,6 +2184,7 @@ extern struct pid_namespace init_pid_ns;
   */
  
  extern struct task_struct *find_task_by_vpid(pid_t nr);
@@ -54163,7 +56975,7 @@ diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
  extern struct task_struct *find_task_by_pid_ns(pid_t nr,
                struct pid_namespace *ns);
  
-@@ -2225,7 +2320,7 @@ extern void __cleanup_sighand(struct sig
+@@ -2225,7 +2321,7 @@ extern void __cleanup_sighand(struct sig
  extern void exit_itimers(struct signal_struct *);
  extern void flush_itimer_signals(void);
  
@@ -54172,7 +56984,7 @@ diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
  
  extern void daemonize(const char *, ...);
  extern int allow_signal(int);
-@@ -2393,13 +2488,17 @@ static inline unsigned long *end_of_stac
+@@ -2393,13 +2489,17 @@ static inline unsigned long *end_of_stac
  
  #endif
  
@@ -54192,9 +57004,9 @@ diff -urNp linux-3.0.3/include/linux/sched.h linux-3.0.3/include/linux/sched.h
  extern void thread_info_cache_init(void);
  
  #ifdef CONFIG_DEBUG_STACK_USAGE
-diff -urNp linux-3.0.3/include/linux/screen_info.h linux-3.0.3/include/linux/screen_info.h
---- linux-3.0.3/include/linux/screen_info.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/screen_info.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/screen_info.h linux-3.0.4/include/linux/screen_info.h
+--- linux-3.0.4/include/linux/screen_info.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/screen_info.h    2011-08-23 21:47:56.000000000 -0400
 @@ -43,7 +43,8 @@ struct screen_info {
        __u16 pages;            /* 0x32 */
        __u16 vesa_attributes;  /* 0x34 */
@@ -54205,9 +57017,9 @@ diff -urNp linux-3.0.3/include/linux/screen_info.h linux-3.0.3/include/linux/scr
  } __attribute__((packed));
  
  #define VIDEO_TYPE_MDA                0x10    /* Monochrome Text Display      */
-diff -urNp linux-3.0.3/include/linux/security.h linux-3.0.3/include/linux/security.h
---- linux-3.0.3/include/linux/security.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/security.h       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/security.h linux-3.0.4/include/linux/security.h
+--- linux-3.0.4/include/linux/security.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/security.h       2011-08-23 21:48:14.000000000 -0400
 @@ -36,6 +36,7 @@
  #include <linux/key.h>
  #include <linux/xfrm.h>
@@ -54216,9 +57028,9 @@ diff -urNp linux-3.0.3/include/linux/security.h linux-3.0.3/include/linux/securi
  #include <net/flow.h>
  
  /* Maximum number of letters for an LSM name string */
-diff -urNp linux-3.0.3/include/linux/seq_file.h linux-3.0.3/include/linux/seq_file.h
---- linux-3.0.3/include/linux/seq_file.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/seq_file.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/seq_file.h linux-3.0.4/include/linux/seq_file.h
+--- linux-3.0.4/include/linux/seq_file.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/seq_file.h       2011-08-23 21:47:56.000000000 -0400
 @@ -32,6 +32,7 @@ struct seq_operations {
        void * (*next) (struct seq_file *m, void *v, loff_t *pos);
        int (*show) (struct seq_file *m, void *v);
@@ -54227,9 +57039,9 @@ diff -urNp linux-3.0.3/include/linux/seq_file.h linux-3.0.3/include/linux/seq_fi
  
  #define SEQ_SKIP 1
  
-diff -urNp linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3/include/linux/shmem_fs.h
---- linux-3.0.3/include/linux/shmem_fs.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/shmem_fs.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/shmem_fs.h linux-3.0.4/include/linux/shmem_fs.h
+--- linux-3.0.4/include/linux/shmem_fs.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/shmem_fs.h       2011-08-23 21:47:56.000000000 -0400
 @@ -10,7 +10,7 @@
  
  #define SHMEM_NR_DIRECT 16
@@ -54239,9 +57051,9 @@ diff -urNp linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3/include/linux/shmem_
  
  struct shmem_inode_info {
        spinlock_t              lock;
-diff -urNp linux-3.0.3/include/linux/shm.h linux-3.0.3/include/linux/shm.h
---- linux-3.0.3/include/linux/shm.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/shm.h    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/shm.h linux-3.0.4/include/linux/shm.h
+--- linux-3.0.4/include/linux/shm.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/shm.h    2011-08-23 21:48:14.000000000 -0400
 @@ -95,6 +95,10 @@ struct shmid_kernel /* private to the ke
        pid_t                   shm_cprid;
        pid_t                   shm_lprid;
@@ -54253,9 +57065,9 @@ diff -urNp linux-3.0.3/include/linux/shm.h linux-3.0.3/include/linux/shm.h
  };
  
  /* shm_mode upper byte flags */
-diff -urNp linux-3.0.3/include/linux/skbuff.h linux-3.0.3/include/linux/skbuff.h
---- linux-3.0.3/include/linux/skbuff.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/skbuff.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/skbuff.h linux-3.0.4/include/linux/skbuff.h
+--- linux-3.0.4/include/linux/skbuff.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/skbuff.h 2011-08-23 21:47:56.000000000 -0400
 @@ -592,7 +592,7 @@ static inline struct skb_shared_hwtstamp
   */
  static inline int skb_queue_empty(const struct sk_buff_head *list)
@@ -54292,9 +57104,9 @@ diff -urNp linux-3.0.3/include/linux/skbuff.h linux-3.0.3/include/linux/skbuff.h
  #endif
  
  extern int ___pskb_trim(struct sk_buff *skb, unsigned int len);
-diff -urNp linux-3.0.3/include/linux/slab_def.h linux-3.0.3/include/linux/slab_def.h
---- linux-3.0.3/include/linux/slab_def.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/slab_def.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/slab_def.h linux-3.0.4/include/linux/slab_def.h
+--- linux-3.0.4/include/linux/slab_def.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/slab_def.h       2011-08-23 21:47:56.000000000 -0400
 @@ -96,10 +96,10 @@ struct kmem_cache {
        unsigned long node_allocs;
        unsigned long node_frees;
@@ -54310,9 +57122,9 @@ diff -urNp linux-3.0.3/include/linux/slab_def.h linux-3.0.3/include/linux/slab_d
  
        /*
         * If debugging is enabled, then the allocator can add additional
-diff -urNp linux-3.0.3/include/linux/slab.h linux-3.0.3/include/linux/slab.h
---- linux-3.0.3/include/linux/slab.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/slab.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/slab.h linux-3.0.4/include/linux/slab.h
+--- linux-3.0.4/include/linux/slab.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/slab.h   2011-08-23 21:47:56.000000000 -0400
 @@ -11,12 +11,20 @@
  
  #include <linux/gfp.h>
@@ -54419,9 +57231,9 @@ diff -urNp linux-3.0.3/include/linux/slab.h linux-3.0.3/include/linux/slab.h
 +})
 +
  #endif        /* _LINUX_SLAB_H */
-diff -urNp linux-3.0.3/include/linux/slub_def.h linux-3.0.3/include/linux/slub_def.h
---- linux-3.0.3/include/linux/slub_def.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/slub_def.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/slub_def.h linux-3.0.4/include/linux/slub_def.h
+--- linux-3.0.4/include/linux/slub_def.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/slub_def.h       2011-08-23 21:47:56.000000000 -0400
 @@ -82,7 +82,7 @@ struct kmem_cache {
        struct kmem_cache_order_objects max;
        struct kmem_cache_order_objects min;
@@ -54440,9 +57252,9 @@ diff -urNp linux-3.0.3/include/linux/slub_def.h linux-3.0.3/include/linux/slub_d
  
  static __always_inline void *
  kmalloc_order(size_t size, gfp_t flags, unsigned int order)
-diff -urNp linux-3.0.3/include/linux/sonet.h linux-3.0.3/include/linux/sonet.h
---- linux-3.0.3/include/linux/sonet.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sonet.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sonet.h linux-3.0.4/include/linux/sonet.h
+--- linux-3.0.4/include/linux/sonet.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sonet.h  2011-08-23 21:47:56.000000000 -0400
 @@ -61,7 +61,7 @@ struct sonet_stats {
  #include <asm/atomic.h>
  
@@ -54452,9 +57264,9 @@ diff -urNp linux-3.0.3/include/linux/sonet.h linux-3.0.3/include/linux/sonet.h
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  };
-diff -urNp linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3/include/linux/sunrpc/clnt.h
---- linux-3.0.3/include/linux/sunrpc/clnt.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sunrpc/clnt.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sunrpc/clnt.h linux-3.0.4/include/linux/sunrpc/clnt.h
+--- linux-3.0.4/include/linux/sunrpc/clnt.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sunrpc/clnt.h    2011-08-23 21:47:56.000000000 -0400
 @@ -169,9 +169,9 @@ static inline unsigned short rpc_get_por
  {
        switch (sap->sa_family) {
@@ -54485,9 +57297,9 @@ diff -urNp linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3/include/linux/sun
  }
  
  #endif /* __KERNEL__ */
-diff -urNp linux-3.0.3/include/linux/sunrpc/svc_rdma.h linux-3.0.3/include/linux/sunrpc/svc_rdma.h
---- linux-3.0.3/include/linux/sunrpc/svc_rdma.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sunrpc/svc_rdma.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sunrpc/svc_rdma.h linux-3.0.4/include/linux/sunrpc/svc_rdma.h
+--- linux-3.0.4/include/linux/sunrpc/svc_rdma.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sunrpc/svc_rdma.h        2011-08-23 21:47:56.000000000 -0400
 @@ -53,15 +53,15 @@ extern unsigned int svcrdma_ord;
  extern unsigned int svcrdma_max_requests;
  extern unsigned int svcrdma_max_req_size;
@@ -54513,9 +57325,9 @@ diff -urNp linux-3.0.3/include/linux/sunrpc/svc_rdma.h linux-3.0.3/include/linux
  
  #define RPCRDMA_VERSION 1
  
-diff -urNp linux-3.0.3/include/linux/sysctl.h linux-3.0.3/include/linux/sysctl.h
---- linux-3.0.3/include/linux/sysctl.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/sysctl.h 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/sysctl.h linux-3.0.4/include/linux/sysctl.h
+--- linux-3.0.4/include/linux/sysctl.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/sysctl.h 2011-08-23 21:48:14.000000000 -0400
 @@ -155,7 +155,11 @@ enum
        KERN_PANIC_ON_NMI=76, /* int: whether we will panic on an unrecovered */
  };
@@ -54538,9 +57350,9 @@ diff -urNp linux-3.0.3/include/linux/sysctl.h linux-3.0.3/include/linux/sysctl.h
  extern int proc_dointvec(struct ctl_table *, int,
                         void __user *, size_t *, loff_t *);
  extern int proc_dointvec_minmax(struct ctl_table *, int,
-diff -urNp linux-3.0.3/include/linux/tty_ldisc.h linux-3.0.3/include/linux/tty_ldisc.h
---- linux-3.0.3/include/linux/tty_ldisc.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/tty_ldisc.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/tty_ldisc.h linux-3.0.4/include/linux/tty_ldisc.h
+--- linux-3.0.4/include/linux/tty_ldisc.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/tty_ldisc.h      2011-08-23 21:47:56.000000000 -0400
 @@ -148,7 +148,7 @@ struct tty_ldisc_ops {
  
        struct  module *owner;
@@ -54550,9 +57362,9 @@ diff -urNp linux-3.0.3/include/linux/tty_ldisc.h linux-3.0.3/include/linux/tty_l
  };
  
  struct tty_ldisc {
-diff -urNp linux-3.0.3/include/linux/types.h linux-3.0.3/include/linux/types.h
---- linux-3.0.3/include/linux/types.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/types.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/types.h linux-3.0.4/include/linux/types.h
+--- linux-3.0.4/include/linux/types.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/types.h  2011-08-23 21:47:56.000000000 -0400
 @@ -213,10 +213,26 @@ typedef struct {
        int counter;
  } atomic_t;
@@ -54580,9 +57392,9 @@ diff -urNp linux-3.0.3/include/linux/types.h linux-3.0.3/include/linux/types.h
  #endif
  
  struct list_head {
-diff -urNp linux-3.0.3/include/linux/uaccess.h linux-3.0.3/include/linux/uaccess.h
---- linux-3.0.3/include/linux/uaccess.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/uaccess.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/uaccess.h linux-3.0.4/include/linux/uaccess.h
+--- linux-3.0.4/include/linux/uaccess.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/uaccess.h        2011-08-23 21:47:56.000000000 -0400
 @@ -76,11 +76,11 @@ static inline unsigned long __copy_from_
                long ret;                               \
                mm_segment_t old_fs = get_fs();         \
@@ -54597,9 +57409,9 @@ diff -urNp linux-3.0.3/include/linux/uaccess.h linux-3.0.3/include/linux/uaccess
                ret;                                    \
        })
  
-diff -urNp linux-3.0.3/include/linux/unaligned/access_ok.h linux-3.0.3/include/linux/unaligned/access_ok.h
---- linux-3.0.3/include/linux/unaligned/access_ok.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/unaligned/access_ok.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/unaligned/access_ok.h linux-3.0.4/include/linux/unaligned/access_ok.h
+--- linux-3.0.4/include/linux/unaligned/access_ok.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/unaligned/access_ok.h    2011-08-23 21:47:56.000000000 -0400
 @@ -6,32 +6,32 @@
  
  static inline u16 get_unaligned_le16(const void *p)
@@ -54639,9 +57451,9 @@ diff -urNp linux-3.0.3/include/linux/unaligned/access_ok.h linux-3.0.3/include/l
  }
  
  static inline void put_unaligned_le16(u16 val, void *p)
-diff -urNp linux-3.0.3/include/linux/vmalloc.h linux-3.0.3/include/linux/vmalloc.h
---- linux-3.0.3/include/linux/vmalloc.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/vmalloc.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/vmalloc.h linux-3.0.4/include/linux/vmalloc.h
+--- linux-3.0.4/include/linux/vmalloc.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/vmalloc.h        2011-08-23 21:47:56.000000000 -0400
 @@ -13,6 +13,11 @@ struct vm_area_struct;              /* vma defining 
  #define VM_MAP                0x00000004      /* vmap()ed pages */
  #define VM_USERMAP    0x00000008      /* suitable for remap_vmalloc_range */
@@ -54758,9 +57570,9 @@ diff -urNp linux-3.0.3/include/linux/vmalloc.h linux-3.0.3/include/linux/vmalloc
 +})
 +
  #endif /* _LINUX_VMALLOC_H */
-diff -urNp linux-3.0.3/include/linux/vmstat.h linux-3.0.3/include/linux/vmstat.h
---- linux-3.0.3/include/linux/vmstat.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/linux/vmstat.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/linux/vmstat.h linux-3.0.4/include/linux/vmstat.h
+--- linux-3.0.4/include/linux/vmstat.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/linux/vmstat.h 2011-08-23 21:47:56.000000000 -0400
 @@ -87,18 +87,18 @@ static inline void vm_events_fold_cpu(in
  /*
   * Zone based page accounting with per cpu differentials.
@@ -54824,9 +57636,9 @@ diff -urNp linux-3.0.3/include/linux/vmstat.h linux-3.0.3/include/linux/vmstat.h
  }
  
  static inline void __dec_zone_page_state(struct page *page,
-diff -urNp linux-3.0.3/include/media/saa7146_vv.h linux-3.0.3/include/media/saa7146_vv.h
---- linux-3.0.3/include/media/saa7146_vv.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/media/saa7146_vv.h     2011-08-24 18:26:09.000000000 -0400
+diff -urNp linux-3.0.4/include/media/saa7146_vv.h linux-3.0.4/include/media/saa7146_vv.h
+--- linux-3.0.4/include/media/saa7146_vv.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/media/saa7146_vv.h     2011-08-24 18:26:09.000000000 -0400
 @@ -163,7 +163,7 @@ struct saa7146_ext_vv
        int (*std_callback)(struct saa7146_dev*, struct saa7146_standard *);
  
@@ -54836,9 +57648,9 @@ diff -urNp linux-3.0.3/include/media/saa7146_vv.h linux-3.0.3/include/media/saa7
        /* pointer to the saa7146 core ops */
        const struct v4l2_ioctl_ops *core_ops;
  
-diff -urNp linux-3.0.3/include/media/v4l2-ioctl.h linux-3.0.3/include/media/v4l2-ioctl.h
---- linux-3.0.3/include/media/v4l2-ioctl.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/media/v4l2-ioctl.h     2011-08-24 18:25:45.000000000 -0400
+diff -urNp linux-3.0.4/include/media/v4l2-ioctl.h linux-3.0.4/include/media/v4l2-ioctl.h
+--- linux-3.0.4/include/media/v4l2-ioctl.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/media/v4l2-ioctl.h     2011-08-24 18:25:45.000000000 -0400
 @@ -272,6 +272,7 @@ struct v4l2_ioctl_ops {
        long (*vidioc_default)         (struct file *file, void *fh,
                                        bool valid_prio, int cmd, void *arg);
@@ -54847,9 +57659,9 @@ diff -urNp linux-3.0.3/include/media/v4l2-ioctl.h linux-3.0.3/include/media/v4l2
  
  
  /* v4l debugging and diagnostics */
-diff -urNp linux-3.0.3/include/net/caif/cfctrl.h linux-3.0.3/include/net/caif/cfctrl.h
---- linux-3.0.3/include/net/caif/cfctrl.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/caif/cfctrl.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/caif/cfctrl.h linux-3.0.4/include/net/caif/cfctrl.h
+--- linux-3.0.4/include/net/caif/cfctrl.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/caif/cfctrl.h      2011-08-23 21:47:56.000000000 -0400
 @@ -52,7 +52,7 @@ struct cfctrl_rsp {
        void (*radioset_rsp)(void);
        void (*reject_rsp)(struct cflayer *layer, u8 linkid,
@@ -54870,9 +57682,9 @@ diff -urNp linux-3.0.3/include/net/caif/cfctrl.h linux-3.0.3/include/net/caif/cf
        struct list_head list;
        /* Protects from simultaneous access to first_req list */
        spinlock_t info_list_lock;
-diff -urNp linux-3.0.3/include/net/flow.h linux-3.0.3/include/net/flow.h
---- linux-3.0.3/include/net/flow.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/flow.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/flow.h linux-3.0.4/include/net/flow.h
+--- linux-3.0.4/include/net/flow.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/flow.h     2011-08-23 21:47:56.000000000 -0400
 @@ -188,6 +188,6 @@ extern struct flow_cache_object *flow_ca
                u8 dir, flow_resolve_t resolver, void *ctx);
  
@@ -54881,9 +57693,9 @@ diff -urNp linux-3.0.3/include/net/flow.h linux-3.0.3/include/net/flow.h
 +extern atomic_unchecked_t flow_cache_genid;
  
  #endif
-diff -urNp linux-3.0.3/include/net/inetpeer.h linux-3.0.3/include/net/inetpeer.h
---- linux-3.0.3/include/net/inetpeer.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/inetpeer.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/inetpeer.h linux-3.0.4/include/net/inetpeer.h
+--- linux-3.0.4/include/net/inetpeer.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/inetpeer.h 2011-08-23 21:47:56.000000000 -0400
 @@ -43,8 +43,8 @@ struct inet_peer {
         */
        union {
@@ -54904,9 +57716,9 @@ diff -urNp linux-3.0.3/include/net/inetpeer.h linux-3.0.3/include/net/inetpeer.h
  }
  
  #endif /* _NET_INETPEER_H */
-diff -urNp linux-3.0.3/include/net/ip_fib.h linux-3.0.3/include/net/ip_fib.h
---- linux-3.0.3/include/net/ip_fib.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/ip_fib.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/ip_fib.h linux-3.0.4/include/net/ip_fib.h
+--- linux-3.0.4/include/net/ip_fib.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/ip_fib.h   2011-08-23 21:47:56.000000000 -0400
 @@ -146,7 +146,7 @@ extern __be32 fib_info_update_nh_saddr(s
  
  #define FIB_RES_SADDR(net, res)                               \
@@ -54916,9 +57728,9 @@ diff -urNp linux-3.0.3/include/net/ip_fib.h linux-3.0.3/include/net/ip_fib.h
         FIB_RES_NH(res).nh_saddr :                     \
         fib_info_update_nh_saddr((net), &FIB_RES_NH(res)))
  #define FIB_RES_GW(res)                       (FIB_RES_NH(res).nh_gw)
-diff -urNp linux-3.0.3/include/net/ip_vs.h linux-3.0.3/include/net/ip_vs.h
---- linux-3.0.3/include/net/ip_vs.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/ip_vs.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/ip_vs.h linux-3.0.4/include/net/ip_vs.h
+--- linux-3.0.4/include/net/ip_vs.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/ip_vs.h    2011-08-23 21:47:56.000000000 -0400
 @@ -509,7 +509,7 @@ struct ip_vs_conn {
        struct ip_vs_conn       *control;       /* Master control connection */
        atomic_t                n_control;      /* Number of controlled ones */
@@ -54937,9 +57749,9 @@ diff -urNp linux-3.0.3/include/net/ip_vs.h linux-3.0.3/include/net/ip_vs.h
        atomic_t                weight;         /* server weight */
  
        atomic_t                refcnt;         /* reference counter */
-diff -urNp linux-3.0.3/include/net/irda/ircomm_core.h linux-3.0.3/include/net/irda/ircomm_core.h
---- linux-3.0.3/include/net/irda/ircomm_core.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/irda/ircomm_core.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/irda/ircomm_core.h linux-3.0.4/include/net/irda/ircomm_core.h
+--- linux-3.0.4/include/net/irda/ircomm_core.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/irda/ircomm_core.h 2011-08-23 21:47:56.000000000 -0400
 @@ -51,7 +51,7 @@ typedef struct {
        int (*connect_response)(struct ircomm_cb *, struct sk_buff *);
        int (*disconnect_request)(struct ircomm_cb *, struct sk_buff *, 
@@ -54949,9 +57761,9 @@ diff -urNp linux-3.0.3/include/net/irda/ircomm_core.h linux-3.0.3/include/net/ir
  
  struct ircomm_cb {
        irda_queue_t queue;
-diff -urNp linux-3.0.3/include/net/irda/ircomm_tty.h linux-3.0.3/include/net/irda/ircomm_tty.h
---- linux-3.0.3/include/net/irda/ircomm_tty.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/irda/ircomm_tty.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/irda/ircomm_tty.h linux-3.0.4/include/net/irda/ircomm_tty.h
+--- linux-3.0.4/include/net/irda/ircomm_tty.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/irda/ircomm_tty.h  2011-08-23 21:47:56.000000000 -0400
 @@ -35,6 +35,7 @@
  #include <linux/termios.h>
  #include <linux/timer.h>
@@ -54971,9 +57783,9 @@ diff -urNp linux-3.0.3/include/net/irda/ircomm_tty.h linux-3.0.3/include/net/ird
  
        /* Protect concurent access to :
         *      o self->open_count
-diff -urNp linux-3.0.3/include/net/iucv/af_iucv.h linux-3.0.3/include/net/iucv/af_iucv.h
---- linux-3.0.3/include/net/iucv/af_iucv.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/iucv/af_iucv.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/iucv/af_iucv.h linux-3.0.4/include/net/iucv/af_iucv.h
+--- linux-3.0.4/include/net/iucv/af_iucv.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/iucv/af_iucv.h     2011-08-23 21:47:56.000000000 -0400
 @@ -87,7 +87,7 @@ struct iucv_sock {
  struct iucv_sock_list {
        struct hlist_head head;
@@ -54983,9 +57795,9 @@ diff -urNp linux-3.0.3/include/net/iucv/af_iucv.h linux-3.0.3/include/net/iucv/a
  };
  
  unsigned int iucv_sock_poll(struct file *file, struct socket *sock,
-diff -urNp linux-3.0.3/include/net/lapb.h linux-3.0.3/include/net/lapb.h
---- linux-3.0.3/include/net/lapb.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/lapb.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/lapb.h linux-3.0.4/include/net/lapb.h
+--- linux-3.0.4/include/net/lapb.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/lapb.h     2011-08-23 21:47:56.000000000 -0400
 @@ -95,7 +95,7 @@ struct lapb_cb {
        struct sk_buff_head     write_queue;
        struct sk_buff_head     ack_queue;
@@ -54995,10 +57807,10 @@ diff -urNp linux-3.0.3/include/net/lapb.h linux-3.0.3/include/net/lapb.h
  
        /* FRMR control information */
        struct lapb_frame       frmr_data;
-diff -urNp linux-3.0.3/include/net/neighbour.h linux-3.0.3/include/net/neighbour.h
---- linux-3.0.3/include/net/neighbour.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/neighbour.h        2011-08-23 21:47:56.000000000 -0400
-@@ -117,7 +117,7 @@ struct neighbour {
+diff -urNp linux-3.0.4/include/net/neighbour.h linux-3.0.4/include/net/neighbour.h
+--- linux-3.0.4/include/net/neighbour.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/neighbour.h        2011-08-26 19:49:56.000000000 -0400
+@@ -117,14 +117,14 @@ struct neighbour {
  };
  
  struct neigh_ops {
@@ -55007,9 +57819,17 @@ diff -urNp linux-3.0.3/include/net/neighbour.h linux-3.0.3/include/net/neighbour
        void                    (*solicit)(struct neighbour *, struct sk_buff*);
        void                    (*error_report)(struct neighbour *, struct sk_buff*);
        int                     (*output)(struct sk_buff*);
-diff -urNp linux-3.0.3/include/net/netlink.h linux-3.0.3/include/net/netlink.h
---- linux-3.0.3/include/net/netlink.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/netlink.h  2011-08-23 21:47:56.000000000 -0400
+       int                     (*connected_output)(struct sk_buff*);
+       int                     (*hh_output)(struct sk_buff*);
+       int                     (*queue_xmit)(struct sk_buff*);
+-};
++} __do_const;
+ 
+ struct pneigh_entry {
+       struct pneigh_entry     *next;
+diff -urNp linux-3.0.4/include/net/netlink.h linux-3.0.4/include/net/netlink.h
+--- linux-3.0.4/include/net/netlink.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/netlink.h  2011-08-23 21:47:56.000000000 -0400
 @@ -562,7 +562,7 @@ static inline void *nlmsg_get_pos(struct
  static inline void nlmsg_trim(struct sk_buff *skb, const void *mark)
  {
@@ -55019,9 +57839,9 @@ diff -urNp linux-3.0.3/include/net/netlink.h linux-3.0.3/include/net/netlink.h
  }
  
  /**
-diff -urNp linux-3.0.3/include/net/netns/ipv4.h linux-3.0.3/include/net/netns/ipv4.h
---- linux-3.0.3/include/net/netns/ipv4.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/netns/ipv4.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/netns/ipv4.h linux-3.0.4/include/net/netns/ipv4.h
+--- linux-3.0.4/include/net/netns/ipv4.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/netns/ipv4.h       2011-08-23 21:47:56.000000000 -0400
 @@ -56,8 +56,8 @@ struct netns_ipv4 {
  
        unsigned int sysctl_ping_group_range[2];
@@ -55033,9 +57853,9 @@ diff -urNp linux-3.0.3/include/net/netns/ipv4.h linux-3.0.3/include/net/netns/ip
  
  #ifdef CONFIG_IP_MROUTE
  #ifndef CONFIG_IP_MROUTE_MULTIPLE_TABLES
-diff -urNp linux-3.0.3/include/net/sctp/sctp.h linux-3.0.3/include/net/sctp/sctp.h
---- linux-3.0.3/include/net/sctp/sctp.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/sctp/sctp.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/sctp/sctp.h linux-3.0.4/include/net/sctp/sctp.h
+--- linux-3.0.4/include/net/sctp/sctp.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/sctp/sctp.h        2011-08-23 21:47:56.000000000 -0400
 @@ -315,9 +315,9 @@ do {                                                                       \
  
  #else /* SCTP_DEBUG */
@@ -55049,9 +57869,9 @@ diff -urNp linux-3.0.3/include/net/sctp/sctp.h linux-3.0.3/include/net/sctp/sctp
  #define SCTP_ENABLE_DEBUG
  #define SCTP_DISABLE_DEBUG
  #define SCTP_ASSERT(expr, str, func)
-diff -urNp linux-3.0.3/include/net/sock.h linux-3.0.3/include/net/sock.h
---- linux-3.0.3/include/net/sock.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/sock.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/sock.h linux-3.0.4/include/net/sock.h
+--- linux-3.0.4/include/net/sock.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/sock.h     2011-08-23 21:47:56.000000000 -0400
 @@ -277,7 +277,7 @@ struct sock {
  #ifdef CONFIG_RPS
        __u32                   sk_rxhash;
@@ -55070,9 +57890,9 @@ diff -urNp linux-3.0.3/include/net/sock.h linux-3.0.3/include/net/sock.h
                                           int copy, int offset)
  {
        if (skb->ip_summed == CHECKSUM_NONE) {
-diff -urNp linux-3.0.3/include/net/tcp.h linux-3.0.3/include/net/tcp.h
---- linux-3.0.3/include/net/tcp.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/tcp.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/tcp.h linux-3.0.4/include/net/tcp.h
+--- linux-3.0.4/include/net/tcp.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/tcp.h      2011-08-23 21:47:56.000000000 -0400
 @@ -1374,8 +1374,8 @@ enum tcp_seq_states {
  struct tcp_seq_afinfo {
        char                    *name;
@@ -55084,9 +57904,9 @@ diff -urNp linux-3.0.3/include/net/tcp.h linux-3.0.3/include/net/tcp.h
  };
  
  struct tcp_iter_state {
-diff -urNp linux-3.0.3/include/net/udp.h linux-3.0.3/include/net/udp.h
---- linux-3.0.3/include/net/udp.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/udp.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/udp.h linux-3.0.4/include/net/udp.h
+--- linux-3.0.4/include/net/udp.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/udp.h      2011-08-23 21:47:56.000000000 -0400
 @@ -234,8 +234,8 @@ struct udp_seq_afinfo {
        char                    *name;
        sa_family_t             family;
@@ -55098,9 +57918,9 @@ diff -urNp linux-3.0.3/include/net/udp.h linux-3.0.3/include/net/udp.h
  };
  
  struct udp_iter_state {
-diff -urNp linux-3.0.3/include/net/xfrm.h linux-3.0.3/include/net/xfrm.h
---- linux-3.0.3/include/net/xfrm.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/net/xfrm.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/net/xfrm.h linux-3.0.4/include/net/xfrm.h
+--- linux-3.0.4/include/net/xfrm.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/net/xfrm.h     2011-08-23 21:47:56.000000000 -0400
 @@ -505,7 +505,7 @@ struct xfrm_policy {
        struct timer_list       timer;
  
@@ -55110,9 +57930,9 @@ diff -urNp linux-3.0.3/include/net/xfrm.h linux-3.0.3/include/net/xfrm.h
        u32                     priority;
        u32                     index;
        struct xfrm_mark        mark;
-diff -urNp linux-3.0.3/include/rdma/iw_cm.h linux-3.0.3/include/rdma/iw_cm.h
---- linux-3.0.3/include/rdma/iw_cm.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/rdma/iw_cm.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/rdma/iw_cm.h linux-3.0.4/include/rdma/iw_cm.h
+--- linux-3.0.4/include/rdma/iw_cm.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/rdma/iw_cm.h   2011-08-23 21:47:56.000000000 -0400
 @@ -120,7 +120,7 @@ struct iw_cm_verbs {
                                         int backlog);
  
@@ -55122,9 +57942,9 @@ diff -urNp linux-3.0.3/include/rdma/iw_cm.h linux-3.0.3/include/rdma/iw_cm.h
  
  /**
   * iw_create_cm_id - Create an IW CM identifier.
-diff -urNp linux-3.0.3/include/scsi/libfc.h linux-3.0.3/include/scsi/libfc.h
---- linux-3.0.3/include/scsi/libfc.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/scsi/libfc.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/scsi/libfc.h linux-3.0.4/include/scsi/libfc.h
+--- linux-3.0.4/include/scsi/libfc.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/scsi/libfc.h   2011-08-23 21:47:56.000000000 -0400
 @@ -750,6 +750,7 @@ struct libfc_function_template {
         */
        void (*disc_stop_final) (struct fc_lport *);
@@ -55142,9 +57962,9 @@ diff -urNp linux-3.0.3/include/scsi/libfc.h linux-3.0.3/include/scsi/libfc.h
        u8                             link_up;
        u8                             qfull;
        enum fc_lport_state            state;
-diff -urNp linux-3.0.3/include/scsi/scsi_device.h linux-3.0.3/include/scsi/scsi_device.h
---- linux-3.0.3/include/scsi/scsi_device.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/scsi/scsi_device.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/scsi/scsi_device.h linux-3.0.4/include/scsi/scsi_device.h
+--- linux-3.0.4/include/scsi/scsi_device.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/scsi/scsi_device.h     2011-08-23 21:47:56.000000000 -0400
 @@ -161,9 +161,9 @@ struct scsi_device {
        unsigned int max_device_blocked; /* what device_blocked counts down from  */
  #define SCSI_DEFAULT_DEVICE_BLOCKED   3
@@ -55158,88 +57978,21 @@ diff -urNp linux-3.0.3/include/scsi/scsi_device.h linux-3.0.3/include/scsi/scsi_
  
        struct device           sdev_gendev,
                                sdev_dev;
-diff -urNp linux-3.0.3/include/scsi/scsi_transport_fc.h linux-3.0.3/include/scsi/scsi_transport_fc.h
---- linux-3.0.3/include/scsi/scsi_transport_fc.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/scsi/scsi_transport_fc.h       2011-08-23 21:47:56.000000000 -0400
-@@ -666,9 +666,9 @@ struct fc_function_template {
-       int     (*bsg_timeout)(struct fc_bsg_job *);
- 
-       /* allocation lengths for host-specific data */
--      u32                             dd_fcrport_size;
--      u32                             dd_fcvport_size;
--      u32                             dd_bsg_size;
-+      const u32                       dd_fcrport_size;
-+      const u32                       dd_fcvport_size;
-+      const u32                       dd_bsg_size;
- 
-       /*
-        * The driver sets these to tell the transport class it
-@@ -678,39 +678,39 @@ struct fc_function_template {
-        */
+diff -urNp linux-3.0.4/include/scsi/scsi_transport_fc.h linux-3.0.4/include/scsi/scsi_transport_fc.h
+--- linux-3.0.4/include/scsi/scsi_transport_fc.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/scsi/scsi_transport_fc.h       2011-08-26 19:49:56.000000000 -0400
+@@ -711,7 +711,7 @@ struct fc_function_template {
+       unsigned long   show_host_system_hostname:1;
  
-       /* remote port fixed attributes */
--      unsigned long   show_rport_maxframe_size:1;
--      unsigned long   show_rport_supported_classes:1;
--      unsigned long   show_rport_dev_loss_tmo:1;
-+      const unsigned long     show_rport_maxframe_size:1;
-+      const unsigned long     show_rport_supported_classes:1;
-+      const unsigned long   show_rport_dev_loss_tmo:1;
- 
-       /*
-        * target dynamic attributes
-        * These should all be "1" if the driver uses the remote port
-        * add/delete functions (so attributes reflect rport values).
-        */
--      unsigned long   show_starget_node_name:1;
--      unsigned long   show_starget_port_name:1;
--      unsigned long   show_starget_port_id:1;
-+      const unsigned long     show_starget_node_name:1;
-+      const unsigned long     show_starget_port_name:1;
-+      const unsigned long     show_starget_port_id:1;
- 
-       /* host fixed attributes */
--      unsigned long   show_host_node_name:1;
--      unsigned long   show_host_port_name:1;
--      unsigned long   show_host_permanent_port_name:1;
--      unsigned long   show_host_supported_classes:1;
--      unsigned long   show_host_supported_fc4s:1;
--      unsigned long   show_host_supported_speeds:1;
--      unsigned long   show_host_maxframe_size:1;
--      unsigned long   show_host_serial_number:1;
-+      const unsigned long     show_host_node_name:1;
-+      const unsigned long     show_host_port_name:1;
-+      const unsigned long     show_host_permanent_port_name:1;
-+      const unsigned long     show_host_supported_classes:1;
-+      const unsigned long     show_host_supported_fc4s:1;
-+      const unsigned long     show_host_supported_speeds:1;
-+      const unsigned long     show_host_maxframe_size:1;
-+      const unsigned long     show_host_serial_number:1;
-       /* host dynamic attributes */
--      unsigned long   show_host_port_id:1;
--      unsigned long   show_host_port_type:1;
--      unsigned long   show_host_port_state:1;
--      unsigned long   show_host_active_fc4s:1;
--      unsigned long   show_host_speed:1;
--      unsigned long   show_host_fabric_name:1;
--      unsigned long   show_host_symbolic_name:1;
--      unsigned long   show_host_system_hostname:1;
-+      const unsigned long     show_host_port_id:1;
-+      const unsigned long     show_host_port_type:1;
-+      const unsigned long     show_host_port_state:1;
-+      const unsigned long     show_host_active_fc4s:1;
-+      const unsigned long     show_host_speed:1;
-+      const unsigned long     show_host_fabric_name:1;
-+      const unsigned long     show_host_symbolic_name:1;
-+      const unsigned long     show_host_system_hostname:1;
- 
--      unsigned long   disable_target_scan:1;
-+      const unsigned long     disable_target_scan:1;
- };
+       unsigned long   disable_target_scan:1;
+-};
++} __do_const;
  
  
-diff -urNp linux-3.0.3/include/sound/ak4xxx-adda.h linux-3.0.3/include/sound/ak4xxx-adda.h
---- linux-3.0.3/include/sound/ak4xxx-adda.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/ak4xxx-adda.h    2011-08-23 21:47:56.000000000 -0400
+ /**
+diff -urNp linux-3.0.4/include/sound/ak4xxx-adda.h linux-3.0.4/include/sound/ak4xxx-adda.h
+--- linux-3.0.4/include/sound/ak4xxx-adda.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/ak4xxx-adda.h    2011-08-23 21:47:56.000000000 -0400
 @@ -35,7 +35,7 @@ struct snd_ak4xxx_ops {
        void (*write)(struct snd_akm4xxx *ak, int chip, unsigned char reg,
                      unsigned char val);
@@ -55249,9 +58002,9 @@ diff -urNp linux-3.0.3/include/sound/ak4xxx-adda.h linux-3.0.3/include/sound/ak4
  
  #define AK4XXX_IMAGE_SIZE     (AK4XXX_MAX_CHIPS * 16) /* 64 bytes */
  
-diff -urNp linux-3.0.3/include/sound/hwdep.h linux-3.0.3/include/sound/hwdep.h
---- linux-3.0.3/include/sound/hwdep.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/hwdep.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/hwdep.h linux-3.0.4/include/sound/hwdep.h
+--- linux-3.0.4/include/sound/hwdep.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/hwdep.h  2011-08-23 21:47:56.000000000 -0400
 @@ -49,7 +49,7 @@ struct snd_hwdep_ops {
                          struct snd_hwdep_dsp_status *status);
        int (*dsp_load)(struct snd_hwdep *hw,
@@ -55261,9 +58014,9 @@ diff -urNp linux-3.0.3/include/sound/hwdep.h linux-3.0.3/include/sound/hwdep.h
  
  struct snd_hwdep {
        struct snd_card *card;
-diff -urNp linux-3.0.3/include/sound/info.h linux-3.0.3/include/sound/info.h
---- linux-3.0.3/include/sound/info.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/info.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/info.h linux-3.0.4/include/sound/info.h
+--- linux-3.0.4/include/sound/info.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/info.h   2011-08-23 21:47:56.000000000 -0400
 @@ -44,7 +44,7 @@ struct snd_info_entry_text {
                     struct snd_info_buffer *buffer);
        void (*write)(struct snd_info_entry *entry,
@@ -55273,9 +58026,9 @@ diff -urNp linux-3.0.3/include/sound/info.h linux-3.0.3/include/sound/info.h
  
  struct snd_info_entry_ops {
        int (*open)(struct snd_info_entry *entry,
-diff -urNp linux-3.0.3/include/sound/pcm.h linux-3.0.3/include/sound/pcm.h
---- linux-3.0.3/include/sound/pcm.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/pcm.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/pcm.h linux-3.0.4/include/sound/pcm.h
+--- linux-3.0.4/include/sound/pcm.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/pcm.h    2011-08-23 21:47:56.000000000 -0400
 @@ -81,6 +81,7 @@ struct snd_pcm_ops {
        int (*mmap)(struct snd_pcm_substream *substream, struct vm_area_struct *vma);
        int (*ack)(struct snd_pcm_substream *substream);
@@ -55284,9 +58037,9 @@ diff -urNp linux-3.0.3/include/sound/pcm.h linux-3.0.3/include/sound/pcm.h
  
  /*
   *
-diff -urNp linux-3.0.3/include/sound/sb16_csp.h linux-3.0.3/include/sound/sb16_csp.h
---- linux-3.0.3/include/sound/sb16_csp.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/sb16_csp.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/sound/sb16_csp.h linux-3.0.4/include/sound/sb16_csp.h
+--- linux-3.0.4/include/sound/sb16_csp.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/sb16_csp.h       2011-08-23 21:47:56.000000000 -0400
 @@ -146,7 +146,7 @@ struct snd_sb_csp_ops {
        int (*csp_start) (struct snd_sb_csp * p, int sample_width, int channels);
        int (*csp_stop) (struct snd_sb_csp * p);
@@ -55296,21 +58049,21 @@ diff -urNp linux-3.0.3/include/sound/sb16_csp.h linux-3.0.3/include/sound/sb16_c
  
  /*
   * CSP private data
-diff -urNp linux-3.0.3/include/sound/soc.h linux-3.0.3/include/sound/soc.h
---- linux-3.0.3/include/sound/soc.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/soc.h    2011-08-23 21:47:56.000000000 -0400
-@@ -635,7 +635,7 @@ struct snd_soc_platform_driver {
-               struct snd_soc_dai *);
+diff -urNp linux-3.0.4/include/sound/soc.h linux-3.0.4/include/sound/soc.h
+--- linux-3.0.4/include/sound/soc.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/soc.h    2011-08-26 19:49:56.000000000 -0400
+@@ -636,7 +636,7 @@ struct snd_soc_platform_driver {
  
        /* platform stream ops */
--      struct snd_pcm_ops *ops;
-+      struct snd_pcm_ops * const ops;
- };
+       struct snd_pcm_ops *ops;
+-};
++} __do_const;
  
  struct snd_soc_platform {
-diff -urNp linux-3.0.3/include/sound/ymfpci.h linux-3.0.3/include/sound/ymfpci.h
---- linux-3.0.3/include/sound/ymfpci.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/sound/ymfpci.h 2011-08-23 21:47:56.000000000 -0400
+       const char *name;
+diff -urNp linux-3.0.4/include/sound/ymfpci.h linux-3.0.4/include/sound/ymfpci.h
+--- linux-3.0.4/include/sound/ymfpci.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/sound/ymfpci.h 2011-08-23 21:47:56.000000000 -0400
 @@ -358,7 +358,7 @@ struct snd_ymfpci {
        spinlock_t reg_lock;
        spinlock_t voice_lock;
@@ -55320,9 +58073,9 @@ diff -urNp linux-3.0.3/include/sound/ymfpci.h linux-3.0.3/include/sound/ymfpci.h
        struct snd_info_entry *proc_entry;
        const struct firmware *dsp_microcode;
        const struct firmware *controller_microcode;
-diff -urNp linux-3.0.3/include/target/target_core_base.h linux-3.0.3/include/target/target_core_base.h
---- linux-3.0.3/include/target/target_core_base.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/target/target_core_base.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/target/target_core_base.h linux-3.0.4/include/target/target_core_base.h
+--- linux-3.0.4/include/target/target_core_base.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/target/target_core_base.h      2011-08-23 21:47:56.000000000 -0400
 @@ -364,7 +364,7 @@ struct t10_reservation_ops {
        int (*t10_seq_non_holder)(struct se_cmd *, unsigned char *, u32);
        int (*t10_pr_register)(struct se_cmd *);
@@ -55352,9 +58105,9 @@ diff -urNp linux-3.0.3/include/target/target_core_base.h linux-3.0.3/include/tar
        atomic_t                dev_tur_active;
        atomic_t                execute_tasks;
        atomic_t                dev_status_thr_count;
-diff -urNp linux-3.0.3/include/trace/events/irq.h linux-3.0.3/include/trace/events/irq.h
---- linux-3.0.3/include/trace/events/irq.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/trace/events/irq.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/trace/events/irq.h linux-3.0.4/include/trace/events/irq.h
+--- linux-3.0.4/include/trace/events/irq.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/trace/events/irq.h     2011-08-23 21:47:56.000000000 -0400
 @@ -36,7 +36,7 @@ struct softirq_action;
   */
  TRACE_EVENT(irq_handler_entry,
@@ -55373,9 +58126,9 @@ diff -urNp linux-3.0.3/include/trace/events/irq.h linux-3.0.3/include/trace/even
  
        TP_ARGS(irq, action, ret),
  
-diff -urNp linux-3.0.3/include/video/udlfb.h linux-3.0.3/include/video/udlfb.h
---- linux-3.0.3/include/video/udlfb.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/video/udlfb.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/video/udlfb.h linux-3.0.4/include/video/udlfb.h
+--- linux-3.0.4/include/video/udlfb.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/video/udlfb.h  2011-08-23 21:47:56.000000000 -0400
 @@ -51,10 +51,10 @@ struct dlfb_data {
        int base8;
        u32 pseudo_palette[256];
@@ -55391,9 +58144,9 @@ diff -urNp linux-3.0.3/include/video/udlfb.h linux-3.0.3/include/video/udlfb.h
  };
  
  #define NR_USB_REQUEST_I2C_SUB_IO 0x02
-diff -urNp linux-3.0.3/include/video/uvesafb.h linux-3.0.3/include/video/uvesafb.h
---- linux-3.0.3/include/video/uvesafb.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/include/video/uvesafb.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/include/video/uvesafb.h linux-3.0.4/include/video/uvesafb.h
+--- linux-3.0.4/include/video/uvesafb.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/include/video/uvesafb.h        2011-08-23 21:47:56.000000000 -0400
 @@ -177,6 +177,7 @@ struct uvesafb_par {
        u8 ypan;                        /* 0 - nothing, 1 - ypan, 2 - ywrap */
        u8 pmi_setpal;                  /* PMI for palette changes */
@@ -55402,9 +58155,9 @@ diff -urNp linux-3.0.3/include/video/uvesafb.h linux-3.0.3/include/video/uvesafb
        void *pmi_start;
        void *pmi_pal;
        u8 *vbe_state_orig;             /*
-diff -urNp linux-3.0.3/init/do_mounts.c linux-3.0.3/init/do_mounts.c
---- linux-3.0.3/init/do_mounts.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts.c linux-3.0.4/init/do_mounts.c
+--- linux-3.0.4/init/do_mounts.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts.c       2011-08-23 21:47:56.000000000 -0400
 @@ -287,7 +287,7 @@ static void __init get_fs_names(char *pa
  
  static int __init do_mount_root(char *name, char *fs, int flags, void *data)
@@ -55444,9 +58197,9 @@ diff -urNp linux-3.0.3/init/do_mounts.c linux-3.0.3/init/do_mounts.c
 +      sys_mount((__force char __user *)".", (__force char __user *)"/", NULL, MS_MOVE, NULL);
        sys_chroot((const char __user __force *)".");
  }
-diff -urNp linux-3.0.3/init/do_mounts.h linux-3.0.3/init/do_mounts.h
---- linux-3.0.3/init/do_mounts.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts.h linux-3.0.4/init/do_mounts.h
+--- linux-3.0.4/init/do_mounts.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts.h       2011-08-23 21:47:56.000000000 -0400
 @@ -15,15 +15,15 @@ extern int root_mountflags;
  
  static inline int create_dev(char *name, dev_t dev)
@@ -55466,9 +58219,9 @@ diff -urNp linux-3.0.3/init/do_mounts.h linux-3.0.3/init/do_mounts.h
                return 0;
        if (!S_ISBLK(stat.st_mode))
                return 0;
-diff -urNp linux-3.0.3/init/do_mounts_initrd.c linux-3.0.3/init/do_mounts_initrd.c
---- linux-3.0.3/init/do_mounts_initrd.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts_initrd.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts_initrd.c linux-3.0.4/init/do_mounts_initrd.c
+--- linux-3.0.4/init/do_mounts_initrd.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts_initrd.c        2011-08-23 21:47:56.000000000 -0400
 @@ -44,13 +44,13 @@ static void __init handle_initrd(void)
        create_dev("/dev/root.old", Root_RAM0);
        /* mount initrd on rootfs' /root */
@@ -55543,9 +58296,9 @@ diff -urNp linux-3.0.3/init/do_mounts_initrd.c linux-3.0.3/init/do_mounts_initrd
 +      sys_unlink((__force const char __user *)"/initrd.image");
        return 0;
  }
-diff -urNp linux-3.0.3/init/do_mounts_md.c linux-3.0.3/init/do_mounts_md.c
---- linux-3.0.3/init/do_mounts_md.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/do_mounts_md.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/do_mounts_md.c linux-3.0.4/init/do_mounts_md.c
+--- linux-3.0.4/init/do_mounts_md.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/do_mounts_md.c    2011-08-23 21:47:56.000000000 -0400
 @@ -170,7 +170,7 @@ static void __init md_setup_drive(void)
                        partitioned ? "_d" : "", minor,
                        md_setup_args[ent].device_names);
@@ -55564,9 +58317,9 @@ diff -urNp linux-3.0.3/init/do_mounts_md.c linux-3.0.3/init/do_mounts_md.c
                        sys_ioctl(fd, BLKRRPART, 0);
                }
                sys_close(fd);
-diff -urNp linux-3.0.3/init/initramfs.c linux-3.0.3/init/initramfs.c
---- linux-3.0.3/init/initramfs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/initramfs.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/initramfs.c linux-3.0.4/init/initramfs.c
+--- linux-3.0.4/init/initramfs.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/initramfs.c       2011-08-23 21:47:56.000000000 -0400
 @@ -74,7 +74,7 @@ static void __init free_hash(void)
        }
  }
@@ -55675,9 +58428,9 @@ diff -urNp linux-3.0.3/init/initramfs.c linux-3.0.3/init/initramfs.c
        state = SkipIt;
        next_state = Reset;
        return 0;
-diff -urNp linux-3.0.3/init/Kconfig linux-3.0.3/init/Kconfig
---- linux-3.0.3/init/Kconfig   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/Kconfig   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/init/Kconfig linux-3.0.4/init/Kconfig
+--- linux-3.0.4/init/Kconfig   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/Kconfig   2011-08-23 21:47:56.000000000 -0400
 @@ -1195,7 +1195,7 @@ config SLUB_DEBUG
  
  config COMPAT_BRK
@@ -55687,9 +58440,9 @@ diff -urNp linux-3.0.3/init/Kconfig linux-3.0.3/init/Kconfig
        help
          Randomizing heap placement makes heap exploits harder, but it
          also breaks ancient binaries (including anything libc5 based).
-diff -urNp linux-3.0.3/init/main.c linux-3.0.3/init/main.c
---- linux-3.0.3/init/main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/init/main.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/init/main.c linux-3.0.4/init/main.c
+--- linux-3.0.4/init/main.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/init/main.c    2011-08-23 21:48:14.000000000 -0400
 @@ -96,6 +96,8 @@ static inline void mark_rodata_ro(void) 
  extern void tc_init(void);
  #endif
@@ -55801,9 +58554,9 @@ diff -urNp linux-3.0.3/init/main.c linux-3.0.3/init/main.c
        /*
         * Ok, we have completed the initial bootup, and
         * we're essentially up and running. Get rid of the
-diff -urNp linux-3.0.3/ipc/mqueue.c linux-3.0.3/ipc/mqueue.c
---- linux-3.0.3/ipc/mqueue.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/ipc/mqueue.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/ipc/mqueue.c linux-3.0.4/ipc/mqueue.c
+--- linux-3.0.4/ipc/mqueue.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/ipc/mqueue.c   2011-08-23 21:48:14.000000000 -0400
 @@ -154,6 +154,7 @@ static struct inode *mqueue_get_inode(st
                        mq_bytes = (mq_msg_tblsz +
                                (info->attr.mq_maxmsg * info->attr.mq_msgsize));
@@ -55812,9 +58565,9 @@ diff -urNp linux-3.0.3/ipc/mqueue.c linux-3.0.3/ipc/mqueue.c
                        spin_lock(&mq_lock);
                        if (u->mq_bytes + mq_bytes < u->mq_bytes ||
                            u->mq_bytes + mq_bytes >
-diff -urNp linux-3.0.3/ipc/msg.c linux-3.0.3/ipc/msg.c
---- linux-3.0.3/ipc/msg.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/ipc/msg.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/ipc/msg.c linux-3.0.4/ipc/msg.c
+--- linux-3.0.4/ipc/msg.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/ipc/msg.c      2011-08-23 21:47:56.000000000 -0400
 @@ -309,18 +309,19 @@ static inline int msg_security(struct ke
        return security_msg_queue_associate(msq, msgflg);
  }
@@ -55840,9 +58593,9 @@ diff -urNp linux-3.0.3/ipc/msg.c linux-3.0.3/ipc/msg.c
        msg_params.key = key;
        msg_params.flg = msgflg;
  
-diff -urNp linux-3.0.3/ipc/sem.c linux-3.0.3/ipc/sem.c
---- linux-3.0.3/ipc/sem.c      2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/ipc/sem.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/ipc/sem.c linux-3.0.4/ipc/sem.c
+--- linux-3.0.4/ipc/sem.c      2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/ipc/sem.c      2011-08-23 21:48:14.000000000 -0400
 @@ -318,10 +318,15 @@ static inline int sem_more_checks(struct
        return 0;
  }
@@ -55889,9 +58642,9 @@ diff -urNp linux-3.0.3/ipc/sem.c linux-3.0.3/ipc/sem.c
        ns = current->nsproxy->ipc_ns;
  
        if (nsops < 1 || semid < 0)
-diff -urNp linux-3.0.3/ipc/shm.c linux-3.0.3/ipc/shm.c
---- linux-3.0.3/ipc/shm.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/ipc/shm.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/ipc/shm.c linux-3.0.4/ipc/shm.c
+--- linux-3.0.4/ipc/shm.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/ipc/shm.c      2011-08-23 21:48:14.000000000 -0400
 @@ -69,6 +69,14 @@ static void shm_destroy (struct ipc_name
  static int sysvipc_shm_proc_show(struct seq_file *s, void *it);
  #endif
@@ -55978,9 +58731,9 @@ diff -urNp linux-3.0.3/ipc/shm.c linux-3.0.3/ipc/shm.c
        size = i_size_read(path.dentry->d_inode);
        shm_unlock(shp);
  
-diff -urNp linux-3.0.3/kernel/acct.c linux-3.0.3/kernel/acct.c
---- linux-3.0.3/kernel/acct.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/acct.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/acct.c linux-3.0.4/kernel/acct.c
+--- linux-3.0.4/kernel/acct.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/acct.c  2011-08-23 21:47:56.000000000 -0400
 @@ -570,7 +570,7 @@ static void do_acct_process(struct bsd_a
         */
        flim = current->signal->rlim[RLIMIT_FSIZE].rlim_cur;
@@ -55990,9 +58743,9 @@ diff -urNp linux-3.0.3/kernel/acct.c linux-3.0.3/kernel/acct.c
                               sizeof(acct_t), &file->f_pos);
        current->signal->rlim[RLIMIT_FSIZE].rlim_cur = flim;
        set_fs(fs);
-diff -urNp linux-3.0.3/kernel/audit.c linux-3.0.3/kernel/audit.c
---- linux-3.0.3/kernel/audit.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/audit.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/audit.c linux-3.0.4/kernel/audit.c
+--- linux-3.0.4/kernel/audit.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/audit.c 2011-08-23 21:47:56.000000000 -0400
 @@ -112,7 +112,7 @@ u32                audit_sig_sid = 0;
     3) suppressed due to audit_rate_limit
     4) suppressed due to audit_backlog_limit
@@ -56029,9 +58782,9 @@ diff -urNp linux-3.0.3/kernel/audit.c linux-3.0.3/kernel/audit.c
                status_set.backlog       = skb_queue_len(&audit_skb_queue);
                audit_send_reply(NETLINK_CB(skb).pid, seq, AUDIT_GET, 0, 0,
                                 &status_set, sizeof(status_set));
-diff -urNp linux-3.0.3/kernel/auditsc.c linux-3.0.3/kernel/auditsc.c
---- linux-3.0.3/kernel/auditsc.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/auditsc.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/auditsc.c linux-3.0.4/kernel/auditsc.c
+--- linux-3.0.4/kernel/auditsc.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/auditsc.c       2011-08-23 21:47:56.000000000 -0400
 @@ -2118,7 +2118,7 @@ int auditsc_get_stamp(struct audit_conte
  }
  
@@ -56050,9 +58803,9 @@ diff -urNp linux-3.0.3/kernel/auditsc.c linux-3.0.3/kernel/auditsc.c
        struct audit_context *context = task->audit_context;
  
        if (context && context->in_syscall) {
-diff -urNp linux-3.0.3/kernel/capability.c linux-3.0.3/kernel/capability.c
---- linux-3.0.3/kernel/capability.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/capability.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/capability.c linux-3.0.4/kernel/capability.c
+--- linux-3.0.4/kernel/capability.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/capability.c    2011-08-23 21:48:14.000000000 -0400
 @@ -202,6 +202,9 @@ SYSCALL_DEFINE2(capget, cap_user_header_
                 * before modification is attempted and the application
                 * fails.
@@ -56113,9 +58866,9 @@ diff -urNp linux-3.0.3/kernel/capability.c linux-3.0.3/kernel/capability.c
  /**
   * nsown_capable - Check superior capability to one's own user_ns
   * @cap: The capability in question
-diff -urNp linux-3.0.3/kernel/cgroup.c linux-3.0.3/kernel/cgroup.c
---- linux-3.0.3/kernel/cgroup.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/cgroup.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/cgroup.c linux-3.0.4/kernel/cgroup.c
+--- linux-3.0.4/kernel/cgroup.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/cgroup.c        2011-08-23 21:48:14.000000000 -0400
 @@ -593,6 +593,8 @@ static struct css_set *find_css_set(
        struct hlist_head *hhead;
        struct cg_cgroup_link *link;
@@ -56125,9 +58878,9 @@ diff -urNp linux-3.0.3/kernel/cgroup.c linux-3.0.3/kernel/cgroup.c
        /* First see if we already have a cgroup group that matches
         * the desired set */
        read_lock(&css_set_lock);
-diff -urNp linux-3.0.3/kernel/compat.c linux-3.0.3/kernel/compat.c
---- linux-3.0.3/kernel/compat.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/compat.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/compat.c linux-3.0.4/kernel/compat.c
+--- linux-3.0.4/kernel/compat.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/compat.c        2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  
  #include <linux/linkage.h>
@@ -56136,9 +58889,9 @@ diff -urNp linux-3.0.3/kernel/compat.c linux-3.0.3/kernel/compat.c
  #include <linux/errno.h>
  #include <linux/time.h>
  #include <linux/signal.h>
-diff -urNp linux-3.0.3/kernel/configs.c linux-3.0.3/kernel/configs.c
---- linux-3.0.3/kernel/configs.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/configs.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/configs.c linux-3.0.4/kernel/configs.c
+--- linux-3.0.4/kernel/configs.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/configs.c       2011-08-23 21:48:14.000000000 -0400
 @@ -74,8 +74,19 @@ static int __init ikconfig_init(void)
        struct proc_dir_entry *entry;
  
@@ -56159,9 +58912,9 @@ diff -urNp linux-3.0.3/kernel/configs.c linux-3.0.3/kernel/configs.c
        if (!entry)
                return -ENOMEM;
  
-diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
---- linux-3.0.3/kernel/cred.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/cred.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/cred.c linux-3.0.4/kernel/cred.c
+--- linux-3.0.4/kernel/cred.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/cred.c  2011-08-25 17:23:03.000000000 -0400
 @@ -158,6 +158,8 @@ static void put_cred_rcu(struct rcu_head
   */
  void __put_cred(struct cred *cred)
@@ -56243,7 +58996,20 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
        /* dumpability changes */
        if (old->euid != new->euid ||
            old->egid != new->egid ||
-@@ -551,6 +569,8 @@ EXPORT_SYMBOL(commit_creds);
+@@ -508,10 +526,8 @@ int commit_creds(struct cred *new)
+               key_fsgid_changed(task);
+ 
+       /* do it
+-       * - What if a process setreuid()'s and this brings the
+-       *   new uid over his NPROC rlimit?  We can check this now
+-       *   cheaply with the new uid cache, so if it matters
+-       *   we should be checking for it.  -DaveM
++       * RLIMIT_NPROC limits on user->processes have already been checked
++       * in set_user().
+        */
+       alter_cred_subscribers(new, 2);
+       if (new->user != old->user)
+@@ -551,6 +567,8 @@ EXPORT_SYMBOL(commit_creds);
   */
  void abort_creds(struct cred *new)
  {
@@ -56252,7 +59018,7 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
        kdebug("abort_creds(%p{%d,%d})", new,
               atomic_read(&new->usage),
               read_cred_subscribers(new));
-@@ -574,6 +594,8 @@ const struct cred *override_creds(const 
+@@ -574,6 +592,8 @@ const struct cred *override_creds(const 
  {
        const struct cred *old = current->cred;
  
@@ -56261,7 +59027,7 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
        kdebug("override_creds(%p{%d,%d})", new,
               atomic_read(&new->usage),
               read_cred_subscribers(new));
-@@ -603,6 +625,8 @@ void revert_creds(const struct cred *old
+@@ -603,6 +623,8 @@ void revert_creds(const struct cred *old
  {
        const struct cred *override = current->cred;
  
@@ -56270,7 +59036,7 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
        kdebug("revert_creds(%p{%d,%d})", old,
               atomic_read(&old->usage),
               read_cred_subscribers(old));
-@@ -649,6 +673,8 @@ struct cred *prepare_kernel_cred(struct 
+@@ -649,6 +671,8 @@ struct cred *prepare_kernel_cred(struct 
        const struct cred *old;
        struct cred *new;
  
@@ -56279,7 +59045,7 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
        new = kmem_cache_alloc(cred_jar, GFP_KERNEL);
        if (!new)
                return NULL;
-@@ -703,6 +729,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
+@@ -703,6 +727,8 @@ EXPORT_SYMBOL(prepare_kernel_cred);
   */
  int set_security_override(struct cred *new, u32 secid)
  {
@@ -56288,7 +59054,7 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
        return security_kernel_act_as(new, secid);
  }
  EXPORT_SYMBOL(set_security_override);
-@@ -722,6 +750,8 @@ int set_security_override_from_ctx(struc
+@@ -722,6 +748,8 @@ int set_security_override_from_ctx(struc
        u32 secid;
        int ret;
  
@@ -56297,9 +59063,9 @@ diff -urNp linux-3.0.3/kernel/cred.c linux-3.0.3/kernel/cred.c
        ret = security_secctx_to_secid(secctx, strlen(secctx), &secid);
        if (ret < 0)
                return ret;
-diff -urNp linux-3.0.3/kernel/debug/debug_core.c linux-3.0.3/kernel/debug/debug_core.c
---- linux-3.0.3/kernel/debug/debug_core.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/debug/debug_core.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/debug/debug_core.c linux-3.0.4/kernel/debug/debug_core.c
+--- linux-3.0.4/kernel/debug/debug_core.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/debug/debug_core.c      2011-08-23 21:47:56.000000000 -0400
 @@ -119,7 +119,7 @@ static DEFINE_RAW_SPINLOCK(dbg_slave_loc
   */
  static atomic_t                       masters_in_kgdb;
@@ -56360,9 +59126,9 @@ diff -urNp linux-3.0.3/kernel/debug/debug_core.c linux-3.0.3/kernel/debug/debug_
        tasklet_schedule(&kgdb_tasklet_breakpoint);
  }
  EXPORT_SYMBOL_GPL(kgdb_schedule_breakpoint);
-diff -urNp linux-3.0.3/kernel/debug/kdb/kdb_main.c linux-3.0.3/kernel/debug/kdb/kdb_main.c
---- linux-3.0.3/kernel/debug/kdb/kdb_main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/debug/kdb/kdb_main.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/debug/kdb/kdb_main.c linux-3.0.4/kernel/debug/kdb/kdb_main.c
+--- linux-3.0.4/kernel/debug/kdb/kdb_main.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/debug/kdb/kdb_main.c    2011-08-23 21:47:56.000000000 -0400
 @@ -1980,7 +1980,7 @@ static int kdb_lsmod(int argc, const cha
        list_for_each_entry(mod, kdb_modules, list) {
  
@@ -56381,9 +59147,9 @@ diff -urNp linux-3.0.3/kernel/debug/kdb/kdb_main.c linux-3.0.3/kernel/debug/kdb/
  
  #ifdef CONFIG_MODULE_UNLOAD
                {
-diff -urNp linux-3.0.3/kernel/events/core.c linux-3.0.3/kernel/events/core.c
---- linux-3.0.3/kernel/events/core.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/kernel/events/core.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/events/core.c linux-3.0.4/kernel/events/core.c
+--- linux-3.0.4/kernel/events/core.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/kernel/events/core.c   2011-08-23 21:47:56.000000000 -0400
 @@ -170,7 +170,7 @@ int perf_proc_update_handler(struct ctl_
        return 0;
  }
@@ -56464,9 +59230,9 @@ diff -urNp linux-3.0.3/kernel/events/core.c linux-3.0.3/kernel/events/core.c
                     &parent_event->child_total_time_running);
  
        /*
-diff -urNp linux-3.0.3/kernel/exit.c linux-3.0.3/kernel/exit.c
---- linux-3.0.3/kernel/exit.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/exit.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/exit.c linux-3.0.4/kernel/exit.c
+--- linux-3.0.4/kernel/exit.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/exit.c  2011-08-23 21:48:14.000000000 -0400
 @@ -57,6 +57,10 @@
  #include <asm/pgtable.h>
  #include <asm/mmu_context.h>
@@ -56580,9 +59346,9 @@ diff -urNp linux-3.0.3/kernel/exit.c linux-3.0.3/kernel/exit.c
        exit_mm(tsk);
  
        if (group_dead)
-diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
---- linux-3.0.3/kernel/fork.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/fork.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/fork.c linux-3.0.4/kernel/fork.c
+--- linux-3.0.4/kernel/fork.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/fork.c  2011-08-25 17:23:36.000000000 -0400
 @@ -286,7 +286,7 @@ static struct task_struct *dup_task_stru
        *stackend = STACK_END_MAGIC;    /* for overflow detection */
  
@@ -56815,7 +59581,7 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
        return 0;
  }
  
-@@ -1156,13 +1156,15 @@ static struct task_struct *copy_process(
+@@ -1156,15 +1156,18 @@ static struct task_struct *copy_process(
        init_vx_info(&p->vx_info, current_vx_info());
        init_nx_info(&p->nx_info, current_nx_info());
  
@@ -56832,8 +59598,11 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
 +                  !capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE))
                        goto bad_fork_free;
        }
++      current->flags &= ~PF_NPROC_EXCEEDED;
  
-@@ -1250,6 +1291,8 @@ static struct task_struct *copy_process(
+       retval = copy_creds(p, clone_flags);
+       if (retval < 0)
+@@ -1250,6 +1292,8 @@ static struct task_struct *copy_process(
        if (clone_flags & CLONE_THREAD)
                p->tgid = current->tgid;
  
@@ -56842,7 +59611,7 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
        p->set_child_tid = (clone_flags & CLONE_CHILD_SETTID) ? child_tidptr : NULL;
        /*
         * Clear TID on mm_release()?
-@@ -1414,6 +1457,8 @@ bad_fork_cleanup_count:
+@@ -1414,6 +1458,8 @@ bad_fork_cleanup_count:
  bad_fork_free:
        free_task(p);
  fork_out:
@@ -56851,7 +59620,7 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
        return ERR_PTR(retval);
  }
  
-@@ -1502,6 +1547,8 @@ long do_fork(unsigned long clone_flags,
+@@ -1502,6 +1548,8 @@ long do_fork(unsigned long clone_flags,
                if (clone_flags & CLONE_PARENT_SETTID)
                        put_user(nr, parent_tidptr);
  
@@ -56860,7 +59629,7 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
                if (clone_flags & CLONE_VFORK) {
                        p->vfork_done = &vfork;
                        init_completion(&vfork);
-@@ -1610,7 +1657,7 @@ static int unshare_fs(unsigned long unsh
+@@ -1610,7 +1658,7 @@ static int unshare_fs(unsigned long unsh
                return 0;
  
        /* don't need lock here; in the worst case we'll do useless copy */
@@ -56869,7 +59638,7 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
                return 0;
  
        *new_fsp = copy_fs_struct(fs);
-@@ -1697,7 +1744,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
+@@ -1697,7 +1745,8 @@ SYSCALL_DEFINE1(unshare, unsigned long, 
                        fs = current->fs;
                        spin_lock(&fs->lock);
                        current->fs = new_fs;
@@ -56879,9 +59648,9 @@ diff -urNp linux-3.0.3/kernel/fork.c linux-3.0.3/kernel/fork.c
                                new_fs = NULL;
                        else
                                new_fs = fs;
-diff -urNp linux-3.0.3/kernel/futex.c linux-3.0.3/kernel/futex.c
---- linux-3.0.3/kernel/futex.c 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/kernel/futex.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/futex.c linux-3.0.4/kernel/futex.c
+--- linux-3.0.4/kernel/futex.c 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/kernel/futex.c 2011-08-23 21:48:14.000000000 -0400
 @@ -54,6 +54,7 @@
  #include <linux/mount.h>
  #include <linux/pagemap.h>
@@ -56969,9 +59738,9 @@ diff -urNp linux-3.0.3/kernel/futex.c linux-3.0.3/kernel/futex.c
  
        for (i = 0; i < ARRAY_SIZE(futex_queues); i++) {
                plist_head_init(&futex_queues[i].chain, &futex_queues[i].lock);
-diff -urNp linux-3.0.3/kernel/futex_compat.c linux-3.0.3/kernel/futex_compat.c
---- linux-3.0.3/kernel/futex_compat.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/futex_compat.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/futex_compat.c linux-3.0.4/kernel/futex_compat.c
+--- linux-3.0.4/kernel/futex_compat.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/futex_compat.c  2011-08-23 21:48:14.000000000 -0400
 @@ -10,6 +10,7 @@
  #include <linux/compat.h>
  #include <linux/nsproxy.h>
@@ -57011,9 +59780,9 @@ diff -urNp linux-3.0.3/kernel/futex_compat.c linux-3.0.3/kernel/futex_compat.c
                head = p->compat_robust_list;
                rcu_read_unlock();
        }
-diff -urNp linux-3.0.3/kernel/gcov/base.c linux-3.0.3/kernel/gcov/base.c
---- linux-3.0.3/kernel/gcov/base.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/gcov/base.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/gcov/base.c linux-3.0.4/kernel/gcov/base.c
+--- linux-3.0.4/kernel/gcov/base.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/gcov/base.c     2011-08-23 21:47:56.000000000 -0400
 @@ -102,11 +102,6 @@ void gcov_enable_events(void)
  }
  
@@ -57035,9 +59804,9 @@ diff -urNp linux-3.0.3/kernel/gcov/base.c linux-3.0.3/kernel/gcov/base.c
                        if (prev)
                                prev->next = info->next;
                        else
-diff -urNp linux-3.0.3/kernel/hrtimer.c linux-3.0.3/kernel/hrtimer.c
---- linux-3.0.3/kernel/hrtimer.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/hrtimer.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/hrtimer.c linux-3.0.4/kernel/hrtimer.c
+--- linux-3.0.4/kernel/hrtimer.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/hrtimer.c       2011-08-23 21:47:56.000000000 -0400
 @@ -1391,7 +1391,7 @@ void hrtimer_peek_ahead_timers(void)
        local_irq_restore(flags);
  }
@@ -57047,9 +59816,9 @@ diff -urNp linux-3.0.3/kernel/hrtimer.c linux-3.0.3/kernel/hrtimer.c
  {
        hrtimer_peek_ahead_timers();
  }
-diff -urNp linux-3.0.3/kernel/jump_label.c linux-3.0.3/kernel/jump_label.c
---- linux-3.0.3/kernel/jump_label.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/jump_label.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/jump_label.c linux-3.0.4/kernel/jump_label.c
+--- linux-3.0.4/kernel/jump_label.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/jump_label.c    2011-08-23 21:47:56.000000000 -0400
 @@ -55,7 +55,9 @@ jump_label_sort_entries(struct jump_entr
  
        size = (((unsigned long)stop - (unsigned long)start)
@@ -57073,9 +59842,9 @@ diff -urNp linux-3.0.3/kernel/jump_label.c linux-3.0.3/kernel/jump_label.c
  }
  
  static int
-diff -urNp linux-3.0.3/kernel/kallsyms.c linux-3.0.3/kernel/kallsyms.c
---- linux-3.0.3/kernel/kallsyms.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/kallsyms.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/kallsyms.c linux-3.0.4/kernel/kallsyms.c
+--- linux-3.0.4/kernel/kallsyms.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/kallsyms.c      2011-08-23 21:48:14.000000000 -0400
 @@ -11,6 +11,9 @@
   *      Changed the compression method from stem compression to "table lookup"
   *      compression (see scripts/kallsyms.c for a more complete description)
@@ -57178,9 +59947,9 @@ diff -urNp linux-3.0.3/kernel/kallsyms.c linux-3.0.3/kernel/kallsyms.c
        if (!iter)
                return -ENOMEM;
        reset_iter(iter, 0);
-diff -urNp linux-3.0.3/kernel/kmod.c linux-3.0.3/kernel/kmod.c
---- linux-3.0.3/kernel/kmod.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/kmod.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/kmod.c linux-3.0.4/kernel/kmod.c
+--- linux-3.0.4/kernel/kmod.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/kmod.c  2011-08-23 21:48:14.000000000 -0400
 @@ -73,13 +73,12 @@ char modprobe_path[KMOD_PATH_LEN] = "/sb
   * If module auto-loading support is disabled then this function
   * becomes a no-operation.
@@ -57277,9 +60046,9 @@ diff -urNp linux-3.0.3/kernel/kmod.c linux-3.0.3/kernel/kmod.c
  EXPORT_SYMBOL(__request_module);
  #endif /* CONFIG_MODULES */
  
-diff -urNp linux-3.0.3/kernel/kprobes.c linux-3.0.3/kernel/kprobes.c
---- linux-3.0.3/kernel/kprobes.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/kprobes.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/kprobes.c linux-3.0.4/kernel/kprobes.c
+--- linux-3.0.4/kernel/kprobes.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/kprobes.c       2011-08-23 21:47:56.000000000 -0400
 @@ -185,7 +185,7 @@ static kprobe_opcode_t __kprobes *__get_
         * kernel image and loaded module images reside. This is required
         * so x86_64 can correctly handle the %rip-relative fixups.
@@ -57316,9 +60085,9 @@ diff -urNp linux-3.0.3/kernel/kprobes.c linux-3.0.3/kernel/kprobes.c
  
        head = &kprobe_table[i];
        preempt_disable();
-diff -urNp linux-3.0.3/kernel/lockdep.c linux-3.0.3/kernel/lockdep.c
---- linux-3.0.3/kernel/lockdep.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/lockdep.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/lockdep.c linux-3.0.4/kernel/lockdep.c
+--- linux-3.0.4/kernel/lockdep.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/lockdep.c       2011-08-23 21:47:56.000000000 -0400
 @@ -583,6 +583,10 @@ static int static_obj(void *obj)
                      end   = (unsigned long) &_end,
                      addr  = (unsigned long) obj;
@@ -57347,9 +60116,9 @@ diff -urNp linux-3.0.3/kernel/lockdep.c linux-3.0.3/kernel/lockdep.c
        if (very_verbose(class)) {
                printk("\nacquire class [%p] %s", class->key, class->name);
                if (class->name_version > 1)
-diff -urNp linux-3.0.3/kernel/lockdep_proc.c linux-3.0.3/kernel/lockdep_proc.c
---- linux-3.0.3/kernel/lockdep_proc.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/lockdep_proc.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/lockdep_proc.c linux-3.0.4/kernel/lockdep_proc.c
+--- linux-3.0.4/kernel/lockdep_proc.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/lockdep_proc.c  2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@ static void l_stop(struct seq_file *m, v
  
  static void print_name(struct seq_file *m, struct lock_class *class)
@@ -57359,9 +60128,9 @@ diff -urNp linux-3.0.3/kernel/lockdep_proc.c linux-3.0.3/kernel/lockdep_proc.c
        const char *name = class->name;
  
        if (!name) {
-diff -urNp linux-3.0.3/kernel/module.c linux-3.0.3/kernel/module.c
---- linux-3.0.3/kernel/module.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/module.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/module.c linux-3.0.4/kernel/module.c
+--- linux-3.0.4/kernel/module.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/module.c        2011-08-23 21:48:14.000000000 -0400
 @@ -58,6 +58,7 @@
  #include <linux/jump_label.h>
  #include <linux/pfn.h>
@@ -58090,9 +60859,9 @@ diff -urNp linux-3.0.3/kernel/module.c linux-3.0.3/kernel/module.c
                        mod = NULL;
        }
        return mod;
-diff -urNp linux-3.0.3/kernel/mutex.c linux-3.0.3/kernel/mutex.c
---- linux-3.0.3/kernel/mutex.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/mutex.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/mutex.c linux-3.0.4/kernel/mutex.c
+--- linux-3.0.4/kernel/mutex.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/mutex.c 2011-08-23 21:47:56.000000000 -0400
 @@ -198,7 +198,7 @@ __mutex_lock_common(struct mutex *lock, 
        spin_lock_mutex(&lock->wait_lock, flags);
  
@@ -58121,9 +60890,9 @@ diff -urNp linux-3.0.3/kernel/mutex.c linux-3.0.3/kernel/mutex.c
        mutex_set_owner(lock);
  
        /* set it to 0 if there are no waiters left: */
-diff -urNp linux-3.0.3/kernel/mutex-debug.c linux-3.0.3/kernel/mutex-debug.c
---- linux-3.0.3/kernel/mutex-debug.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/mutex-debug.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/mutex-debug.c linux-3.0.4/kernel/mutex-debug.c
+--- linux-3.0.4/kernel/mutex-debug.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/mutex-debug.c   2011-08-23 21:47:56.000000000 -0400
 @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mute
  }
  
@@ -58152,9 +60921,9 @@ diff -urNp linux-3.0.3/kernel/mutex-debug.c linux-3.0.3/kernel/mutex-debug.c
  
        list_del_init(&waiter->list);
        waiter->task = NULL;
-diff -urNp linux-3.0.3/kernel/mutex-debug.h linux-3.0.3/kernel/mutex-debug.h
---- linux-3.0.3/kernel/mutex-debug.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/mutex-debug.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/mutex-debug.h linux-3.0.4/kernel/mutex-debug.h
+--- linux-3.0.4/kernel/mutex-debug.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/mutex-debug.h   2011-08-23 21:47:56.000000000 -0400
 @@ -20,9 +20,9 @@ extern void debug_mutex_wake_waiter(stru
  extern void debug_mutex_free_waiter(struct mutex_waiter *waiter);
  extern void debug_mutex_add_waiter(struct mutex *lock,
@@ -58167,9 +60936,9 @@ diff -urNp linux-3.0.3/kernel/mutex-debug.h linux-3.0.3/kernel/mutex-debug.h
  extern void debug_mutex_unlock(struct mutex *lock);
  extern void debug_mutex_init(struct mutex *lock, const char *name,
                             struct lock_class_key *key);
-diff -urNp linux-3.0.3/kernel/padata.c linux-3.0.3/kernel/padata.c
---- linux-3.0.3/kernel/padata.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/padata.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/padata.c linux-3.0.4/kernel/padata.c
+--- linux-3.0.4/kernel/padata.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/padata.c        2011-08-23 21:47:56.000000000 -0400
 @@ -132,10 +132,10 @@ int padata_do_parallel(struct padata_ins
        padata->pd = pd;
        padata->cb_cpu = cb_cpu;
@@ -58193,9 +60962,9 @@ diff -urNp linux-3.0.3/kernel/padata.c linux-3.0.3/kernel/padata.c
        atomic_set(&pd->reorder_objects, 0);
        atomic_set(&pd->refcnt, 0);
        pd->pinst = pinst;
-diff -urNp linux-3.0.3/kernel/panic.c linux-3.0.3/kernel/panic.c
---- linux-3.0.3/kernel/panic.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/panic.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/panic.c linux-3.0.4/kernel/panic.c
+--- linux-3.0.4/kernel/panic.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/panic.c 2011-08-23 21:48:14.000000000 -0400
 @@ -369,7 +369,7 @@ static void warn_slowpath_common(const c
        const char *board;
  
@@ -58215,9 +60984,9 @@ diff -urNp linux-3.0.3/kernel/panic.c linux-3.0.3/kernel/panic.c
                __builtin_return_address(0));
  }
  EXPORT_SYMBOL(__stack_chk_fail);
-diff -urNp linux-3.0.3/kernel/pid.c linux-3.0.3/kernel/pid.c
---- linux-3.0.3/kernel/pid.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/pid.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/pid.c linux-3.0.4/kernel/pid.c
+--- linux-3.0.4/kernel/pid.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/pid.c   2011-08-23 21:48:14.000000000 -0400
 @@ -33,6 +33,7 @@
  #include <linux/rculist.h>
  #include <linux/bootmem.h>
@@ -58265,9 +61034,9 @@ diff -urNp linux-3.0.3/kernel/pid.c linux-3.0.3/kernel/pid.c
  struct pid *get_task_pid(struct task_struct *task, enum pid_type type)
  {
        struct pid *pid;
-diff -urNp linux-3.0.3/kernel/posix-cpu-timers.c linux-3.0.3/kernel/posix-cpu-timers.c
---- linux-3.0.3/kernel/posix-cpu-timers.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/posix-cpu-timers.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/posix-cpu-timers.c linux-3.0.4/kernel/posix-cpu-timers.c
+--- linux-3.0.4/kernel/posix-cpu-timers.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/posix-cpu-timers.c      2011-08-23 21:48:14.000000000 -0400
 @@ -6,6 +6,7 @@
  #include <linux/posix-timers.h>
  #include <linux/errno.h>
@@ -58293,9 +61062,9 @@ diff -urNp linux-3.0.3/kernel/posix-cpu-timers.c linux-3.0.3/kernel/posix-cpu-ti
                .clock_getres   = thread_cpu_clock_getres,
                .clock_get      = thread_cpu_clock_get,
                .timer_create   = thread_cpu_timer_create,
-diff -urNp linux-3.0.3/kernel/posix-timers.c linux-3.0.3/kernel/posix-timers.c
---- linux-3.0.3/kernel/posix-timers.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/posix-timers.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/posix-timers.c linux-3.0.4/kernel/posix-timers.c
+--- linux-3.0.4/kernel/posix-timers.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/posix-timers.c  2011-08-23 21:48:14.000000000 -0400
 @@ -43,6 +43,7 @@
  #include <linux/idr.h>
  #include <linux/posix-clock.h>
@@ -58399,9 +61168,9 @@ diff -urNp linux-3.0.3/kernel/posix-timers.c linux-3.0.3/kernel/posix-timers.c
        return kc->clock_set(which_clock, &new_tp);
  }
  
-diff -urNp linux-3.0.3/kernel/power/poweroff.c linux-3.0.3/kernel/power/poweroff.c
---- linux-3.0.3/kernel/power/poweroff.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/power/poweroff.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/power/poweroff.c linux-3.0.4/kernel/power/poweroff.c
+--- linux-3.0.4/kernel/power/poweroff.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/power/poweroff.c        2011-08-23 21:47:56.000000000 -0400
 @@ -37,7 +37,7 @@ static struct sysrq_key_op   sysrq_powerof
        .enable_mask    = SYSRQ_ENABLE_BOOT,
  };
@@ -58411,9 +61180,9 @@ diff -urNp linux-3.0.3/kernel/power/poweroff.c linux-3.0.3/kernel/power/poweroff
  {
        register_sysrq_key('o', &sysrq_poweroff_op);
        return 0;
-diff -urNp linux-3.0.3/kernel/power/process.c linux-3.0.3/kernel/power/process.c
---- linux-3.0.3/kernel/power/process.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/power/process.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/power/process.c linux-3.0.4/kernel/power/process.c
+--- linux-3.0.4/kernel/power/process.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/power/process.c 2011-08-23 21:47:56.000000000 -0400
 @@ -41,6 +41,7 @@ static int try_to_freeze_tasks(bool sig_
        u64 elapsed_csecs64;
        unsigned int elapsed_csecs;
@@ -58456,10 +61225,10 @@ diff -urNp linux-3.0.3/kernel/power/process.c linux-3.0.3/kernel/power/process.c
                        break;
  
                if (pm_wakeup_pending()) {
-diff -urNp linux-3.0.3/kernel/printk.c linux-3.0.3/kernel/printk.c
---- linux-3.0.3/kernel/printk.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/printk.c        2011-08-23 21:48:14.000000000 -0400
-@@ -314,12 +314,17 @@ static int check_syslog_permissions(int
+diff -urNp linux-3.0.4/kernel/printk.c linux-3.0.4/kernel/printk.c
+--- linux-3.0.4/kernel/printk.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/printk.c        2011-08-23 21:48:14.000000000 -0400
+@@ -313,12 +313,17 @@ static int check_syslog_permissions(int 
        if (from_file && type != SYSLOG_ACTION_OPEN)
                return 0;
  
@@ -58478,9 +61247,9 @@ diff -urNp linux-3.0.3/kernel/printk.c linux-3.0.3/kernel/printk.c
                                 "but no CAP_SYSLOG (deprecated).\n");
                        return 0;
                }
-diff -urNp linux-3.0.3/kernel/profile.c linux-3.0.3/kernel/profile.c
---- linux-3.0.3/kernel/profile.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/profile.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/profile.c linux-3.0.4/kernel/profile.c
+--- linux-3.0.4/kernel/profile.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/profile.c       2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@ struct profile_hit {
  /* Oprofile timer tick hook */
  static int (*timer_hook)(struct pt_regs *) __read_mostly;
@@ -58538,9 +61307,9 @@ diff -urNp linux-3.0.3/kernel/profile.c linux-3.0.3/kernel/profile.c
        return count;
  }
  
-diff -urNp linux-3.0.3/kernel/ptrace.c linux-3.0.3/kernel/ptrace.c
---- linux-3.0.3/kernel/ptrace.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/ptrace.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/ptrace.c linux-3.0.4/kernel/ptrace.c
+--- linux-3.0.4/kernel/ptrace.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/ptrace.c        2011-08-23 21:48:14.000000000 -0400
 @@ -132,7 +132,8 @@ int ptrace_check_attach(struct task_stru
        return ret;
  }
@@ -58712,9 +61481,9 @@ diff -urNp linux-3.0.3/kernel/ptrace.c linux-3.0.3/kernel/ptrace.c
                goto out_put_task_struct;
        }
  
-diff -urNp linux-3.0.3/kernel/rcutorture.c linux-3.0.3/kernel/rcutorture.c
---- linux-3.0.3/kernel/rcutorture.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rcutorture.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rcutorture.c linux-3.0.4/kernel/rcutorture.c
+--- linux-3.0.4/kernel/rcutorture.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rcutorture.c    2011-08-23 21:47:56.000000000 -0400
 @@ -138,12 +138,12 @@ static DEFINE_PER_CPU(long [RCU_TORTURE_
        { 0 };
  static DEFINE_PER_CPU(long [RCU_TORTURE_PIPE_LEN + 1], rcu_torture_batch) =
@@ -58875,9 +61644,9 @@ diff -urNp linux-3.0.3/kernel/rcutorture.c linux-3.0.3/kernel/rcutorture.c
        for_each_possible_cpu(cpu) {
                for (i = 0; i < RCU_TORTURE_PIPE_LEN + 1; i++) {
                        per_cpu(rcu_torture_count, cpu)[i] = 0;
-diff -urNp linux-3.0.3/kernel/rcutree.c linux-3.0.3/kernel/rcutree.c
---- linux-3.0.3/kernel/rcutree.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rcutree.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rcutree.c linux-3.0.4/kernel/rcutree.c
+--- linux-3.0.4/kernel/rcutree.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rcutree.c       2011-08-23 21:47:56.000000000 -0400
 @@ -1470,7 +1470,7 @@ __rcu_process_callbacks(struct rcu_state
  /*
   * Do softirq processing for the current CPU.
@@ -58887,9 +61656,9 @@ diff -urNp linux-3.0.3/kernel/rcutree.c linux-3.0.3/kernel/rcutree.c
  {
        __rcu_process_callbacks(&rcu_sched_state,
                                &__get_cpu_var(rcu_sched_data));
-diff -urNp linux-3.0.3/kernel/rcutree_plugin.h linux-3.0.3/kernel/rcutree_plugin.h
---- linux-3.0.3/kernel/rcutree_plugin.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rcutree_plugin.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rcutree_plugin.h linux-3.0.4/kernel/rcutree_plugin.h
+--- linux-3.0.4/kernel/rcutree_plugin.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rcutree_plugin.h        2011-08-23 21:47:56.000000000 -0400
 @@ -822,7 +822,7 @@ void synchronize_rcu_expedited(void)
  
        /* Clean up and exit. */
@@ -58952,9 +61721,9 @@ diff -urNp linux-3.0.3/kernel/rcutree_plugin.h linux-3.0.3/kernel/rcutree_plugin
  
        put_online_cpus();
  }
-diff -urNp linux-3.0.3/kernel/relay.c linux-3.0.3/kernel/relay.c
---- linux-3.0.3/kernel/relay.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/relay.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/relay.c linux-3.0.4/kernel/relay.c
+--- linux-3.0.4/kernel/relay.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/relay.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1236,6 +1236,8 @@ static ssize_t subbuf_splice_actor(struc
        };
        ssize_t ret;
@@ -58964,9 +61733,9 @@ diff -urNp linux-3.0.3/kernel/relay.c linux-3.0.3/kernel/relay.c
        if (rbuf->subbufs_produced == rbuf->subbufs_consumed)
                return 0;
        if (splice_grow_spd(pipe, &spd))
-diff -urNp linux-3.0.3/kernel/resource.c linux-3.0.3/kernel/resource.c
---- linux-3.0.3/kernel/resource.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/resource.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/resource.c linux-3.0.4/kernel/resource.c
+--- linux-3.0.4/kernel/resource.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/resource.c      2011-08-23 21:48:14.000000000 -0400
 @@ -141,8 +141,18 @@ static const struct file_operations proc
  
  static int __init ioresources_init(void)
@@ -58986,9 +61755,9 @@ diff -urNp linux-3.0.3/kernel/resource.c linux-3.0.3/kernel/resource.c
        return 0;
  }
  __initcall(ioresources_init);
-diff -urNp linux-3.0.3/kernel/rtmutex-tester.c linux-3.0.3/kernel/rtmutex-tester.c
---- linux-3.0.3/kernel/rtmutex-tester.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/rtmutex-tester.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/rtmutex-tester.c linux-3.0.4/kernel/rtmutex-tester.c
+--- linux-3.0.4/kernel/rtmutex-tester.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/rtmutex-tester.c        2011-08-23 21:47:56.000000000 -0400
 @@ -20,7 +20,7 @@
  #define MAX_RT_TEST_MUTEXES   8
  
@@ -59079,9 +61848,9 @@ diff -urNp linux-3.0.3/kernel/rtmutex-tester.c linux-3.0.3/kernel/rtmutex-tester
                return;
  
        default:
-diff -urNp linux-3.0.3/kernel/sched_autogroup.c linux-3.0.3/kernel/sched_autogroup.c
---- linux-3.0.3/kernel/sched_autogroup.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sched_autogroup.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sched_autogroup.c linux-3.0.4/kernel/sched_autogroup.c
+--- linux-3.0.4/kernel/sched_autogroup.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sched_autogroup.c       2011-08-23 21:47:56.000000000 -0400
 @@ -7,7 +7,7 @@
  
  unsigned int __read_mostly sysctl_sched_autogroup_enabled = 1;
@@ -59100,9 +61869,9 @@ diff -urNp linux-3.0.3/kernel/sched_autogroup.c linux-3.0.3/kernel/sched_autogro
        ag->tg = tg;
  #ifdef CONFIG_RT_GROUP_SCHED
        /*
-diff -urNp linux-3.0.3/kernel/sched.c linux-3.0.3/kernel/sched.c
---- linux-3.0.3/kernel/sched.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sched.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sched.c linux-3.0.4/kernel/sched.c
+--- linux-3.0.4/kernel/sched.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sched.c 2011-08-23 21:48:14.000000000 -0400
 @@ -4251,6 +4251,8 @@ asmlinkage void __sched schedule(void)
        struct rq *rq;
        int cpu;
@@ -59139,9 +61908,9 @@ diff -urNp linux-3.0.3/kernel/sched.c linux-3.0.3/kernel/sched.c
                        /* can't set/change the rt policy */
                        if (policy != p->policy && !rlim_rtprio)
                                return -EPERM;
-diff -urNp linux-3.0.3/kernel/sched_fair.c linux-3.0.3/kernel/sched_fair.c
---- linux-3.0.3/kernel/sched_fair.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sched_fair.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sched_fair.c linux-3.0.4/kernel/sched_fair.c
+--- linux-3.0.4/kernel/sched_fair.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sched_fair.c    2011-08-23 21:47:56.000000000 -0400
 @@ -4050,7 +4050,7 @@ static void nohz_idle_balance(int this_c
   * run_rebalance_domains is triggered when needed from the scheduler tick.
   * Also triggered for nohz idle balancing (with nohz_balancing_kick set).
@@ -59151,9 +61920,9 @@ diff -urNp linux-3.0.3/kernel/sched_fair.c linux-3.0.3/kernel/sched_fair.c
  {
        int this_cpu = smp_processor_id();
        struct rq *this_rq = cpu_rq(this_cpu);
-diff -urNp linux-3.0.3/kernel/signal.c linux-3.0.3/kernel/signal.c
---- linux-3.0.3/kernel/signal.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/signal.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/signal.c linux-3.0.4/kernel/signal.c
+--- linux-3.0.4/kernel/signal.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/signal.c        2011-08-23 21:48:14.000000000 -0400
 @@ -45,12 +45,12 @@ static struct kmem_cache *sigqueue_cache
  
  int print_fatal_signals __read_mostly;
@@ -59287,9 +62056,9 @@ diff -urNp linux-3.0.3/kernel/signal.c linux-3.0.3/kernel/signal.c
        if (p && (tgid <= 0 || task_tgid_vnr(p) == tgid)) {
                error = check_kill_permission(sig, info, p);
                /*
-diff -urNp linux-3.0.3/kernel/smp.c linux-3.0.3/kernel/smp.c
---- linux-3.0.3/kernel/smp.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/smp.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/smp.c linux-3.0.4/kernel/smp.c
+--- linux-3.0.4/kernel/smp.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/smp.c   2011-08-23 21:47:56.000000000 -0400
 @@ -580,22 +580,22 @@ int smp_call_function(smp_call_func_t fu
  }
  EXPORT_SYMBOL(smp_call_function);
@@ -59317,9 +62086,9 @@ diff -urNp linux-3.0.3/kernel/smp.c linux-3.0.3/kernel/smp.c
  {
        raw_spin_unlock_irq(&call_function.lock);
  }
-diff -urNp linux-3.0.3/kernel/softirq.c linux-3.0.3/kernel/softirq.c
---- linux-3.0.3/kernel/softirq.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/softirq.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/softirq.c linux-3.0.4/kernel/softirq.c
+--- linux-3.0.4/kernel/softirq.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/softirq.c       2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@ static struct softirq_action softirq_vec
  
  DEFINE_PER_CPU(struct task_struct *, ksoftirqd);
@@ -59370,10 +62139,10 @@ diff -urNp linux-3.0.3/kernel/softirq.c linux-3.0.3/kernel/softirq.c
  {
        struct tasklet_struct *list;
  
-diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
---- linux-3.0.3/kernel/sys.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sys.c   2011-08-23 21:48:14.000000000 -0400
-@@ -154,6 +154,12 @@ static int set_one_prio(struct task_stru
+diff -urNp linux-3.0.4/kernel/sys.c linux-3.0.4/kernel/sys.c
+--- linux-3.0.4/kernel/sys.c   2011-08-29 23:26:14.000000000 -0400
++++ linux-3.0.4/kernel/sys.c   2011-08-29 23:26:27.000000000 -0400
+@@ -158,6 +158,12 @@ static int set_one_prio(struct task_stru
                error = -EACCES;
                goto out;
        }
@@ -59386,7 +62155,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        no_nice = security_task_setnice(p, niceval);
        if (no_nice) {
                error = no_nice;
-@@ -537,6 +543,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
+@@ -541,6 +547,9 @@ SYSCALL_DEFINE2(setregid, gid_t, rgid, g
                        goto error;
        }
  
@@ -59396,7 +62165,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        if (rgid != (gid_t) -1 ||
            (egid != (gid_t) -1 && egid != old->gid))
                new->sgid = new->egid;
-@@ -566,6 +575,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
+@@ -570,6 +579,10 @@ SYSCALL_DEFINE1(setgid, gid_t, gid)
        old = current_cred();
  
        retval = -EPERM;
@@ -59407,7 +62176,30 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        if (nsown_capable(CAP_SETGID))
                new->gid = new->egid = new->sgid = new->fsgid = gid;
        else if (gid == old->gid || gid == old->sgid)
-@@ -646,6 +659,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
+@@ -595,11 +608,18 @@ static int set_user(struct cred *new)
+       if (!new_user)
+               return -EAGAIN;
+ 
++      /*
++       * We don't fail in case of NPROC limit excess here because too many
++       * poorly written programs don't check set*uid() return code, assuming
++       * it never fails if called by root.  We may still enforce NPROC limit
++       * for programs doing set*uid()+execve() by harmlessly deferring the
++       * failure to the execve() stage.
++       */
+       if (atomic_read(&new_user->processes) >= rlimit(RLIMIT_NPROC) &&
+-                      new_user != INIT_USER) {
+-              free_uid(new_user);
+-              return -EAGAIN;
+-      }
++                      new_user != INIT_USER)
++              current->flags |= PF_NPROC_EXCEEDED;
++      else
++              current->flags &= ~PF_NPROC_EXCEEDED;
+ 
+       free_uid(new->user);
+       new->user = new_user;
+@@ -650,6 +670,9 @@ SYSCALL_DEFINE2(setreuid, uid_t, ruid, u
                        goto error;
        }
  
@@ -59417,7 +62209,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        if (new->uid != old->uid) {
                retval = set_user(new);
                if (retval < 0)
-@@ -690,6 +706,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
+@@ -694,6 +717,12 @@ SYSCALL_DEFINE1(setuid, uid_t, uid)
        old = current_cred();
  
        retval = -EPERM;
@@ -59430,7 +62222,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        if (nsown_capable(CAP_SETUID)) {
                new->suid = new->uid = uid;
                if (uid != old->uid) {
-@@ -744,6 +766,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
+@@ -748,6 +777,9 @@ SYSCALL_DEFINE3(setresuid, uid_t, ruid, 
                        goto error;
        }
  
@@ -59440,7 +62232,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        if (ruid != (uid_t) -1) {
                new->uid = ruid;
                if (ruid != old->uid) {
-@@ -808,6 +833,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
+@@ -812,6 +844,9 @@ SYSCALL_DEFINE3(setresgid, gid_t, rgid, 
                        goto error;
        }
  
@@ -59450,7 +62242,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        if (rgid != (gid_t) -1)
                new->gid = rgid;
        if (egid != (gid_t) -1)
-@@ -854,6 +882,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -858,6 +893,9 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
        old = current_cred();
        old_fsuid = old->fsuid;
  
@@ -59460,7 +62252,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        if (uid == old->uid  || uid == old->euid  ||
            uid == old->suid || uid == old->fsuid ||
            nsown_capable(CAP_SETUID)) {
-@@ -864,6 +895,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
+@@ -868,6 +906,7 @@ SYSCALL_DEFINE1(setfsuid, uid_t, uid)
                }
        }
  
@@ -59468,7 +62260,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        abort_creds(new);
        return old_fsuid;
  
-@@ -890,12 +922,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
+@@ -894,12 +933,16 @@ SYSCALL_DEFINE1(setfsgid, gid_t, gid)
        if (gid == old->gid  || gid == old->egid  ||
            gid == old->sgid || gid == old->fsgid ||
            nsown_capable(CAP_SETGID)) {
@@ -59485,7 +62277,7 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
        abort_creds(new);
        return old_fsgid;
  
-@@ -1642,7 +1678,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
+@@ -1680,7 +1723,7 @@ SYSCALL_DEFINE5(prctl, int, option, unsi
                        error = get_dumpable(me->mm);
                        break;
                case PR_SET_DUMPABLE:
@@ -59494,9 +62286,9 @@ diff -urNp linux-3.0.3/kernel/sys.c linux-3.0.3/kernel/sys.c
                                error = -EINVAL;
                                break;
                        }
-diff -urNp linux-3.0.3/kernel/sysctl.c linux-3.0.3/kernel/sysctl.c
---- linux-3.0.3/kernel/sysctl.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sysctl.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sysctl.c linux-3.0.4/kernel/sysctl.c
+--- linux-3.0.4/kernel/sysctl.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sysctl.c        2011-08-23 21:48:14.000000000 -0400
 @@ -85,6 +85,13 @@
  
  
@@ -59686,9 +62478,9 @@ diff -urNp linux-3.0.3/kernel/sysctl.c linux-3.0.3/kernel/sysctl.c
  EXPORT_SYMBOL(proc_doulongvec_minmax);
  EXPORT_SYMBOL(proc_doulongvec_ms_jiffies_minmax);
  EXPORT_SYMBOL(register_sysctl_table);
-diff -urNp linux-3.0.3/kernel/sysctl_check.c linux-3.0.3/kernel/sysctl_check.c
---- linux-3.0.3/kernel/sysctl_check.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/sysctl_check.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/sysctl_check.c linux-3.0.4/kernel/sysctl_check.c
+--- linux-3.0.4/kernel/sysctl_check.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/sysctl_check.c  2011-08-23 21:48:14.000000000 -0400
 @@ -129,6 +129,7 @@ int sysctl_check_table(struct nsproxy *n
                                set_fail(&fail, table, "Directory with extra2");
                } else {
@@ -59697,9 +62489,9 @@ diff -urNp linux-3.0.3/kernel/sysctl_check.c linux-3.0.3/kernel/sysctl_check.c
                            (table->proc_handler == proc_dointvec) ||
                            (table->proc_handler == proc_dointvec_minmax) ||
                            (table->proc_handler == proc_dointvec_jiffies) ||
-diff -urNp linux-3.0.3/kernel/taskstats.c linux-3.0.3/kernel/taskstats.c
---- linux-3.0.3/kernel/taskstats.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/taskstats.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/taskstats.c linux-3.0.4/kernel/taskstats.c
+--- linux-3.0.4/kernel/taskstats.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/taskstats.c     2011-08-23 21:48:14.000000000 -0400
 @@ -27,9 +27,12 @@
  #include <linux/cgroup.h>
  #include <linux/fs.h>
@@ -59723,9 +62515,9 @@ diff -urNp linux-3.0.3/kernel/taskstats.c linux-3.0.3/kernel/taskstats.c
        if (info->attrs[TASKSTATS_CMD_ATTR_REGISTER_CPUMASK])
                return cmd_attr_register_cpumask(info);
        else if (info->attrs[TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK])
-diff -urNp linux-3.0.3/kernel/time/alarmtimer.c linux-3.0.3/kernel/time/alarmtimer.c
---- linux-3.0.3/kernel/time/alarmtimer.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/alarmtimer.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/alarmtimer.c linux-3.0.4/kernel/time/alarmtimer.c
+--- linux-3.0.4/kernel/time/alarmtimer.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/alarmtimer.c       2011-08-23 21:47:56.000000000 -0400
 @@ -685,7 +685,7 @@ static int __init alarmtimer_init(void)
  {
        int error = 0;
@@ -59735,9 +62527,9 @@ diff -urNp linux-3.0.3/kernel/time/alarmtimer.c linux-3.0.3/kernel/time/alarmtim
                .clock_getres   = alarm_clock_getres,
                .clock_get      = alarm_clock_get,
                .timer_create   = alarm_timer_create,
-diff -urNp linux-3.0.3/kernel/time/tick-broadcast.c linux-3.0.3/kernel/time/tick-broadcast.c
---- linux-3.0.3/kernel/time/tick-broadcast.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/tick-broadcast.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/tick-broadcast.c linux-3.0.4/kernel/time/tick-broadcast.c
+--- linux-3.0.4/kernel/time/tick-broadcast.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/tick-broadcast.c   2011-08-23 21:47:56.000000000 -0400
 @@ -115,7 +115,7 @@ int tick_device_uses_broadcast(struct cl
                 * then clear the broadcast bit.
                 */
@@ -59747,9 +62539,9 @@ diff -urNp linux-3.0.3/kernel/time/tick-broadcast.c linux-3.0.3/kernel/time/tick
  
                        cpumask_clear_cpu(cpu, tick_get_broadcast_mask());
                        tick_broadcast_clear_oneshot(cpu);
-diff -urNp linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3/kernel/time/timekeeping.c
---- linux-3.0.3/kernel/time/timekeeping.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/timekeeping.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/timekeeping.c linux-3.0.4/kernel/time/timekeeping.c
+--- linux-3.0.4/kernel/time/timekeeping.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/timekeeping.c      2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@
  #include <linux/init.h>
  #include <linux/mm.h>
@@ -59767,9 +62559,9 @@ diff -urNp linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3/kernel/time/timekee
        write_seqlock_irqsave(&xtime_lock, flags);
  
        timekeeping_forward_now();
-diff -urNp linux-3.0.3/kernel/time/timer_list.c linux-3.0.3/kernel/time/timer_list.c
---- linux-3.0.3/kernel/time/timer_list.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/timer_list.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/timer_list.c linux-3.0.4/kernel/time/timer_list.c
+--- linux-3.0.4/kernel/time/timer_list.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/timer_list.c       2011-08-23 21:48:14.000000000 -0400
 @@ -38,12 +38,16 @@ DECLARE_PER_CPU(struct hrtimer_cpu_base,
  
  static void print_name_offset(struct seq_file *m, void *sym)
@@ -59811,9 +62603,9 @@ diff -urNp linux-3.0.3/kernel/time/timer_list.c linux-3.0.3/kernel/time/timer_li
        if (!pe)
                return -ENOMEM;
        return 0;
-diff -urNp linux-3.0.3/kernel/time/timer_stats.c linux-3.0.3/kernel/time/timer_stats.c
---- linux-3.0.3/kernel/time/timer_stats.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time/timer_stats.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time/timer_stats.c linux-3.0.4/kernel/time/timer_stats.c
+--- linux-3.0.4/kernel/time/timer_stats.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time/timer_stats.c      2011-08-23 21:48:14.000000000 -0400
 @@ -116,7 +116,7 @@ static ktime_t time_start, time_stop;
  static unsigned long nr_entries;
  static struct entry entries[MAX_ENTRIES];
@@ -59882,9 +62674,9 @@ diff -urNp linux-3.0.3/kernel/time/timer_stats.c linux-3.0.3/kernel/time/timer_s
        if (!pe)
                return -ENOMEM;
        return 0;
-diff -urNp linux-3.0.3/kernel/time.c linux-3.0.3/kernel/time.c
---- linux-3.0.3/kernel/time.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/time.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/time.c linux-3.0.4/kernel/time.c
+--- linux-3.0.4/kernel/time.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/time.c  2011-08-23 21:48:14.000000000 -0400
 @@ -163,6 +163,11 @@ int do_sys_settimeofday(const struct tim
                return error;
  
@@ -59897,9 +62689,9 @@ diff -urNp linux-3.0.3/kernel/time.c linux-3.0.3/kernel/time.c
                /* SMP safe, global irq locking makes it work. */
                sys_tz = *tz;
                update_vsyscall_tz();
-diff -urNp linux-3.0.3/kernel/timer.c linux-3.0.3/kernel/timer.c
---- linux-3.0.3/kernel/timer.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/timer.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/timer.c linux-3.0.4/kernel/timer.c
+--- linux-3.0.4/kernel/timer.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/timer.c 2011-08-23 21:47:56.000000000 -0400
 @@ -1304,7 +1304,7 @@ void update_process_times(int user_tick)
  /*
   * This function runs timers and the timer-tq in bottom half context.
@@ -59909,9 +62701,9 @@ diff -urNp linux-3.0.3/kernel/timer.c linux-3.0.3/kernel/timer.c
  {
        struct tvec_base *base = __this_cpu_read(tvec_bases);
  
-diff -urNp linux-3.0.3/kernel/trace/blktrace.c linux-3.0.3/kernel/trace/blktrace.c
---- linux-3.0.3/kernel/trace/blktrace.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/blktrace.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/blktrace.c linux-3.0.4/kernel/trace/blktrace.c
+--- linux-3.0.4/kernel/trace/blktrace.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/blktrace.c        2011-08-23 21:47:56.000000000 -0400
 @@ -321,7 +321,7 @@ static ssize_t blk_dropped_read(struct f
        struct blk_trace *bt = filp->private_data;
        char buf[16];
@@ -59939,9 +62731,9 @@ diff -urNp linux-3.0.3/kernel/trace/blktrace.c linux-3.0.3/kernel/trace/blktrace
  
        ret = -EIO;
        bt->dropped_file = debugfs_create_file("dropped", 0444, dir, bt,
-diff -urNp linux-3.0.3/kernel/trace/ftrace.c linux-3.0.3/kernel/trace/ftrace.c
---- linux-3.0.3/kernel/trace/ftrace.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/ftrace.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/ftrace.c linux-3.0.4/kernel/trace/ftrace.c
+--- linux-3.0.4/kernel/trace/ftrace.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/ftrace.c  2011-08-23 21:47:56.000000000 -0400
 @@ -1566,12 +1566,17 @@ ftrace_code_disable(struct module *mod, 
        if (unlikely(ftrace_disabled))
                return 0;
@@ -59971,9 +62763,9 @@ diff -urNp linux-3.0.3/kernel/trace/ftrace.c linux-3.0.3/kernel/trace/ftrace.c
  {
        struct ftrace_func_probe *entry;
        struct ftrace_page *pg;
-diff -urNp linux-3.0.3/kernel/trace/trace.c linux-3.0.3/kernel/trace/trace.c
---- linux-3.0.3/kernel/trace/trace.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace.c linux-3.0.4/kernel/trace/trace.c
+--- linux-3.0.4/kernel/trace/trace.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace.c   2011-08-23 21:48:14.000000000 -0400
 @@ -3339,6 +3339,8 @@ static ssize_t tracing_splice_read_pipe(
        size_t rem;
        unsigned int i;
@@ -60016,9 +62808,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace.c linux-3.0.3/kernel/trace/trace.c
        static int once;
        struct dentry *d_tracer;
  
-diff -urNp linux-3.0.3/kernel/trace/trace_events.c linux-3.0.3/kernel/trace/trace_events.c
---- linux-3.0.3/kernel/trace/trace_events.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_events.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_events.c linux-3.0.4/kernel/trace/trace_events.c
+--- linux-3.0.4/kernel/trace/trace_events.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_events.c    2011-08-23 21:47:56.000000000 -0400
 @@ -1318,10 +1318,6 @@ static LIST_HEAD(ftrace_module_file_list
  struct ftrace_module_file_ops {
        struct list_head                list;
@@ -60065,9 +62857,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_events.c linux-3.0.3/kernel/trace/trac
        }
  }
  
-diff -urNp linux-3.0.3/kernel/trace/trace_mmiotrace.c linux-3.0.3/kernel/trace/trace_mmiotrace.c
---- linux-3.0.3/kernel/trace/trace_mmiotrace.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_mmiotrace.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_mmiotrace.c linux-3.0.4/kernel/trace/trace_mmiotrace.c
+--- linux-3.0.4/kernel/trace/trace_mmiotrace.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_mmiotrace.c 2011-08-23 21:47:56.000000000 -0400
 @@ -24,7 +24,7 @@ struct header_iter {
  static struct trace_array *mmio_trace_array;
  static bool overrun_detected;
@@ -60104,9 +62896,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_mmiotrace.c linux-3.0.3/kernel/trace/t
                return;
        }
        entry   = ring_buffer_event_data(event);
-diff -urNp linux-3.0.3/kernel/trace/trace_output.c linux-3.0.3/kernel/trace/trace_output.c
---- linux-3.0.3/kernel/trace/trace_output.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_output.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_output.c linux-3.0.4/kernel/trace/trace_output.c
+--- linux-3.0.4/kernel/trace/trace_output.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_output.c    2011-08-23 21:47:56.000000000 -0400
 @@ -278,7 +278,7 @@ int trace_seq_path(struct trace_seq *s, 
  
        p = d_path(path, s->buffer + s->len, PAGE_SIZE - s->len);
@@ -60116,9 +62908,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_output.c linux-3.0.3/kernel/trace/trac
                if (p) {
                        s->len = p - s->buffer;
                        return 1;
-diff -urNp linux-3.0.3/kernel/trace/trace_stack.c linux-3.0.3/kernel/trace/trace_stack.c
---- linux-3.0.3/kernel/trace/trace_stack.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_stack.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_stack.c linux-3.0.4/kernel/trace/trace_stack.c
+--- linux-3.0.4/kernel/trace/trace_stack.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_stack.c     2011-08-23 21:47:56.000000000 -0400
 @@ -50,7 +50,7 @@ static inline void check_stack(void)
                return;
  
@@ -60128,9 +62920,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_stack.c linux-3.0.3/kernel/trace/trace
                return;
  
        local_irq_save(flags);
-diff -urNp linux-3.0.3/kernel/trace/trace_workqueue.c linux-3.0.3/kernel/trace/trace_workqueue.c
---- linux-3.0.3/kernel/trace/trace_workqueue.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/kernel/trace/trace_workqueue.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/kernel/trace/trace_workqueue.c linux-3.0.4/kernel/trace/trace_workqueue.c
+--- linux-3.0.4/kernel/trace/trace_workqueue.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/kernel/trace/trace_workqueue.c 2011-08-23 21:47:56.000000000 -0400
 @@ -22,7 +22,7 @@ struct cpu_workqueue_stats {
        int                         cpu;
        pid_t                       pid;
@@ -60158,9 +62950,9 @@ diff -urNp linux-3.0.3/kernel/trace/trace_workqueue.c linux-3.0.3/kernel/trace/t
                                   tsk->comm);
                        put_task_struct(tsk);
                }
-diff -urNp linux-3.0.3/lib/bug.c linux-3.0.3/lib/bug.c
---- linux-3.0.3/lib/bug.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/bug.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/bug.c linux-3.0.4/lib/bug.c
+--- linux-3.0.4/lib/bug.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/bug.c      2011-08-23 21:47:56.000000000 -0400
 @@ -133,6 +133,8 @@ enum bug_trap_type report_bug(unsigned l
                return BUG_TRAP_TYPE_NONE;
  
@@ -60170,9 +62962,9 @@ diff -urNp linux-3.0.3/lib/bug.c linux-3.0.3/lib/bug.c
  
        file = NULL;
        line = 0;
-diff -urNp linux-3.0.3/lib/debugobjects.c linux-3.0.3/lib/debugobjects.c
---- linux-3.0.3/lib/debugobjects.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/debugobjects.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/debugobjects.c linux-3.0.4/lib/debugobjects.c
+--- linux-3.0.4/lib/debugobjects.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/debugobjects.c     2011-08-23 21:47:56.000000000 -0400
 @@ -284,7 +284,7 @@ static void debug_object_is_on_stack(voi
        if (limit > 4)
                return;
@@ -60182,9 +62974,9 @@ diff -urNp linux-3.0.3/lib/debugobjects.c linux-3.0.3/lib/debugobjects.c
        if (is_on_stack == onstack)
                return;
  
-diff -urNp linux-3.0.3/lib/dma-debug.c linux-3.0.3/lib/dma-debug.c
---- linux-3.0.3/lib/dma-debug.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/dma-debug.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/dma-debug.c linux-3.0.4/lib/dma-debug.c
+--- linux-3.0.4/lib/dma-debug.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/dma-debug.c        2011-08-23 21:47:56.000000000 -0400
 @@ -870,7 +870,7 @@ out:
  
  static void check_for_stack(struct device *dev, void *addr)
@@ -60194,9 +62986,9 @@ diff -urNp linux-3.0.3/lib/dma-debug.c linux-3.0.3/lib/dma-debug.c
                err_printk(dev, NULL, "DMA-API: device driver maps memory from"
                                "stack [addr=%p]\n", addr);
  }
-diff -urNp linux-3.0.3/lib/extable.c linux-3.0.3/lib/extable.c
---- linux-3.0.3/lib/extable.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/extable.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/extable.c linux-3.0.4/lib/extable.c
+--- linux-3.0.4/lib/extable.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/extable.c  2011-08-23 21:47:56.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/init.h>
  #include <linux/sort.h>
@@ -60216,9 +63008,9 @@ diff -urNp linux-3.0.3/lib/extable.c linux-3.0.3/lib/extable.c
  }
  
  #ifdef CONFIG_MODULES
-diff -urNp linux-3.0.3/lib/inflate.c linux-3.0.3/lib/inflate.c
---- linux-3.0.3/lib/inflate.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/inflate.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/inflate.c linux-3.0.4/lib/inflate.c
+--- linux-3.0.4/lib/inflate.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/inflate.c  2011-08-23 21:47:56.000000000 -0400
 @@ -269,7 +269,7 @@ static void free(void *where)
                malloc_ptr = free_mem_ptr;
  }
@@ -60228,9 +63020,9 @@ diff -urNp linux-3.0.3/lib/inflate.c linux-3.0.3/lib/inflate.c
  #define free(a) kfree(a)
  #endif
  
-diff -urNp linux-3.0.3/lib/Kconfig.debug linux-3.0.3/lib/Kconfig.debug
---- linux-3.0.3/lib/Kconfig.debug      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/Kconfig.debug      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/lib/Kconfig.debug linux-3.0.4/lib/Kconfig.debug
+--- linux-3.0.4/lib/Kconfig.debug      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/Kconfig.debug      2011-08-23 21:48:14.000000000 -0400
 @@ -1088,6 +1088,7 @@ config LATENCYTOP
        depends on DEBUG_KERNEL
        depends on STACKTRACE_SUPPORT
@@ -60239,9 +63031,9 @@ diff -urNp linux-3.0.3/lib/Kconfig.debug linux-3.0.3/lib/Kconfig.debug
        select FRAME_POINTER if !MIPS && !PPC && !S390 && !MICROBLAZE
        select KALLSYMS
        select KALLSYMS_ALL
-diff -urNp linux-3.0.3/lib/kref.c linux-3.0.3/lib/kref.c
---- linux-3.0.3/lib/kref.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/kref.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/kref.c linux-3.0.4/lib/kref.c
+--- linux-3.0.4/lib/kref.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/kref.c     2011-08-23 21:47:56.000000000 -0400
 @@ -52,7 +52,7 @@ void kref_get(struct kref *kref)
   */
  int kref_put(struct kref *kref, void (*release)(struct kref *kref))
@@ -60251,9 +63043,9 @@ diff -urNp linux-3.0.3/lib/kref.c linux-3.0.3/lib/kref.c
        WARN_ON(release == (void (*)(struct kref *))kfree);
  
        if (atomic_dec_and_test(&kref->refcount)) {
-diff -urNp linux-3.0.3/lib/radix-tree.c linux-3.0.3/lib/radix-tree.c
---- linux-3.0.3/lib/radix-tree.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/radix-tree.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/lib/radix-tree.c linux-3.0.4/lib/radix-tree.c
+--- linux-3.0.4/lib/radix-tree.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/radix-tree.c       2011-08-23 21:47:56.000000000 -0400
 @@ -80,7 +80,7 @@ struct radix_tree_preload {
        int nr;
        struct radix_tree_node *nodes[RADIX_TREE_MAX_PATH];
@@ -60263,9 +63055,9 @@ diff -urNp linux-3.0.3/lib/radix-tree.c linux-3.0.3/lib/radix-tree.c
  
  static inline void *ptr_to_indirect(void *ptr)
  {
-diff -urNp linux-3.0.3/lib/vsprintf.c linux-3.0.3/lib/vsprintf.c
---- linux-3.0.3/lib/vsprintf.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/lib/vsprintf.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/lib/vsprintf.c linux-3.0.4/lib/vsprintf.c
+--- linux-3.0.4/lib/vsprintf.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/lib/vsprintf.c 2011-08-23 21:48:14.000000000 -0400
 @@ -16,6 +16,9 @@
   * - scnprintf and vscnprintf
   */
@@ -60359,14 +63151,14 @@ diff -urNp linux-3.0.3/lib/vsprintf.c linux-3.0.3/lib/vsprintf.c
                        break;
                }
  
-diff -urNp linux-3.0.3/localversion-grsec linux-3.0.3/localversion-grsec
---- linux-3.0.3/localversion-grsec     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/localversion-grsec     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/localversion-grsec linux-3.0.4/localversion-grsec
+--- linux-3.0.4/localversion-grsec     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/localversion-grsec     2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1 @@
 +-grsec
-diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
---- linux-3.0.3/Makefile       2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/Makefile       2011-08-24 18:10:12.000000000 -0400
+diff -urNp linux-3.0.4/Makefile linux-3.0.4/Makefile
+--- linux-3.0.4/Makefile       2011-08-29 23:26:13.000000000 -0400
++++ linux-3.0.4/Makefile       2011-08-29 23:26:21.000000000 -0400
 @@ -245,8 +245,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH"
  
  HOSTCC       = gcc
@@ -60392,32 +63184,19 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
  KBUILD_AFLAGS_KERNEL :=
  KBUILD_CFLAGS_KERNEL :=
  KBUILD_AFLAGS   := -D__ASSEMBLY__
-@@ -407,10 +410,11 @@ export RCS_TAR_IGNORE := --exclude SCCS 
- # Rules shared between *config targets and build targets
- 
- # Basic helpers built in scripts/
--PHONY += scripts_basic
--scripts_basic:
-+PHONY += scripts_basic0 scripts_basic gcc-plugins
-+scripts_basic0:
-       $(Q)$(MAKE) $(build)=scripts/basic
-       $(Q)rm -f .tmp_quiet_recordmcount
-+scripts_basic: scripts_basic0 gcc-plugins
- 
- # To avoid any implicit rule to kick in, define an empty command.
- scripts/basic/%: scripts_basic ;
-@@ -564,6 +568,24 @@ else
+@@ -564,6 +567,25 @@ else
  KBUILD_CFLAGS += -O2
  endif
  
 +ifeq ($(shell $(CONFIG_SHELL) $(srctree)/scripts/gcc-plugin.sh $(HOSTCC)), y)
-+CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so
++CONSTIFY_PLUGIN := -fplugin=$(objtree)/tools/gcc/constify_plugin.so -DCONSTIFY_PLUGIN
 +ifdef CONFIG_PAX_MEMORY_STACKLEAK
 +STACKLEAK_PLUGIN := -fplugin=$(objtree)/tools/gcc/stackleak_plugin.so -fplugin-arg-stackleak_plugin-track-lowest-sp=100
 +endif
 +export CONSTIFY_PLUGIN STACKLEAK_PLUGIN
-+gcc-plugins:
++gcc-plugins0:
 +      $(Q)$(MAKE) $(build)=tools/gcc
++gcc-plugins: scripts_basic gcc-plugins0
 +else
 +gcc-plugins:
 +ifeq ($(call cc-ifversion, -ge, 0405, y), y)
@@ -60465,16 +63244,15 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
  modules: $(vmlinux-dirs) $(if $(KBUILD_BUILTIN),vmlinux) modules.builtin
        $(Q)$(AWK) '!x[$$0]++' $(vmlinux-dirs:%=$(objtree)/%/modules.order) > $(objtree)/modules.order
        @$(kecho) '  Building modules, stage 2.';
-@@ -1198,7 +1222,7 @@ distclean: mrproper
-       @find $(srctree) $(RCS_FIND_IGNORE) \
-               \( -name '*.orig' -o -name '*.rej' -o -name '*~' \
-               -o -name '*.bak' -o -name '#*#' -o -name '.*.orig' \
--              -o -name '.*.rej' -o -size 0 \
-+              -o -name '.*.rej' -o -size 0 -o -name '*.so' \
-               -o -name '*%' -o -name '.*.cmd' -o -name 'core' \) \
-               -type f -print | xargs rm -f
- 
-@@ -1404,7 +1428,7 @@ clean: $(clean-dirs)
+@@ -1359,6 +1383,7 @@ PHONY += $(module-dirs) modules
+ $(module-dirs): crmodverdir $(objtree)/Module.symvers
+       $(Q)$(MAKE) $(build)=$(patsubst _module_%,%,$@)
+ 
++modules: KBUILD_CFLAGS += $(CONSTIFY_PLUGIN) $(STACKLEAK_PLUGIN)
+ modules: $(module-dirs)
+       @$(kecho) '  Building modules, stage 2.';
+       $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.modpost
+@@ -1404,7 +1429,7 @@ clean: $(clean-dirs)
        $(call cmd,rmdirs)
        $(call cmd,rmfiles)
        @find $(if $(KBUILD_EXTMOD), $(KBUILD_EXTMOD), .) $(RCS_FIND_IGNORE) \
@@ -60483,9 +63261,9 @@ diff -urNp linux-3.0.3/Makefile linux-3.0.3/Makefile
                -o -name '.*.d' -o -name '.*.tmp' -o -name '*.mod.c' \
                -o -name '*.symtypes' -o -name 'modules.order' \
                -o -name modules.builtin -o -name '.tmp_*.o.*' \
-diff -urNp linux-3.0.3/mm/filemap.c linux-3.0.3/mm/filemap.c
---- linux-3.0.3/mm/filemap.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/filemap.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/filemap.c linux-3.0.4/mm/filemap.c
+--- linux-3.0.4/mm/filemap.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/filemap.c   2011-08-23 21:48:14.000000000 -0400
 @@ -1763,7 +1763,7 @@ int generic_file_mmap(struct file * file
        struct address_space *mapping = file->f_mapping;
  
@@ -60503,9 +63281,9 @@ diff -urNp linux-3.0.3/mm/filemap.c linux-3.0.3/mm/filemap.c
                        if (*pos >= limit) {
                                send_sig(SIGXFSZ, current, 0);
                                return -EFBIG;
-diff -urNp linux-3.0.3/mm/fremap.c linux-3.0.3/mm/fremap.c
---- linux-3.0.3/mm/fremap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/fremap.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/fremap.c linux-3.0.4/mm/fremap.c
+--- linux-3.0.4/mm/fremap.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/fremap.c    2011-08-23 21:47:56.000000000 -0400
 @@ -156,6 +156,11 @@ SYSCALL_DEFINE5(remap_file_pages, unsign
   retry:
        vma = find_vma(mm, start);
@@ -60518,9 +63296,9 @@ diff -urNp linux-3.0.3/mm/fremap.c linux-3.0.3/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-3.0.3/mm/highmem.c linux-3.0.3/mm/highmem.c
---- linux-3.0.3/mm/highmem.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/highmem.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/highmem.c linux-3.0.4/mm/highmem.c
+--- linux-3.0.4/mm/highmem.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/highmem.c   2011-08-23 21:47:56.000000000 -0400
 @@ -125,9 +125,10 @@ static void flush_all_zero_pkmaps(void)
                 * So no dangers, even with speculative execution.
                 */
@@ -60546,9 +63324,9 @@ diff -urNp linux-3.0.3/mm/highmem.c linux-3.0.3/mm/highmem.c
        pkmap_count[last_pkmap_nr] = 1;
        set_page_address(page, (void *)vaddr);
  
-diff -urNp linux-3.0.3/mm/huge_memory.c linux-3.0.3/mm/huge_memory.c
---- linux-3.0.3/mm/huge_memory.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/huge_memory.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/huge_memory.c linux-3.0.4/mm/huge_memory.c
+--- linux-3.0.4/mm/huge_memory.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/huge_memory.c       2011-08-23 21:47:56.000000000 -0400
 @@ -702,7 +702,7 @@ out:
         * run pte_offset_map on the pmd, if an huge pmd could
         * materialize from under us from a different thread.
@@ -60558,9 +63336,9 @@ diff -urNp linux-3.0.3/mm/huge_memory.c linux-3.0.3/mm/huge_memory.c
                return VM_FAULT_OOM;
        /* if an huge pmd materialized from under us just retry later */
        if (unlikely(pmd_trans_huge(*pmd)))
-diff -urNp linux-3.0.3/mm/hugetlb.c linux-3.0.3/mm/hugetlb.c
---- linux-3.0.3/mm/hugetlb.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/hugetlb.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/hugetlb.c linux-3.0.4/mm/hugetlb.c
+--- linux-3.0.4/mm/hugetlb.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/hugetlb.c   2011-08-23 21:47:56.000000000 -0400
 @@ -2339,6 +2339,27 @@ static int unmap_ref_private(struct mm_s
        return 1;
  }
@@ -60650,9 +63428,9 @@ diff -urNp linux-3.0.3/mm/hugetlb.c linux-3.0.3/mm/hugetlb.c
        ptep = huge_pte_alloc(mm, address, huge_page_size(h));
        if (!ptep)
                return VM_FAULT_OOM;
-diff -urNp linux-3.0.3/mm/internal.h linux-3.0.3/mm/internal.h
---- linux-3.0.3/mm/internal.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/internal.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/internal.h linux-3.0.4/mm/internal.h
+--- linux-3.0.4/mm/internal.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/internal.h  2011-08-23 21:47:56.000000000 -0400
 @@ -49,6 +49,7 @@ extern void putback_lru_page(struct page
   * in mm/page_alloc.c
   */
@@ -60661,9 +63439,9 @@ diff -urNp linux-3.0.3/mm/internal.h linux-3.0.3/mm/internal.h
  extern void prep_compound_page(struct page *page, unsigned long order);
  #ifdef CONFIG_MEMORY_FAILURE
  extern bool is_free_buddy_page(struct page *page);
-diff -urNp linux-3.0.3/mm/Kconfig linux-3.0.3/mm/Kconfig
---- linux-3.0.3/mm/Kconfig     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/Kconfig     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/Kconfig linux-3.0.4/mm/Kconfig
+--- linux-3.0.4/mm/Kconfig     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/Kconfig     2011-08-23 21:48:14.000000000 -0400
 @@ -240,7 +240,7 @@ config KSM
  config DEFAULT_MMAP_MIN_ADDR
          int "Low address space to protect from user allocation"
@@ -60673,9 +63451,9 @@ diff -urNp linux-3.0.3/mm/Kconfig linux-3.0.3/mm/Kconfig
          help
          This is the portion of low virtual memory which should be protected
          from userspace allocation.  Keeping a user from writing to low pages
-diff -urNp linux-3.0.3/mm/kmemleak.c linux-3.0.3/mm/kmemleak.c
---- linux-3.0.3/mm/kmemleak.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/kmemleak.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/kmemleak.c linux-3.0.4/mm/kmemleak.c
+--- linux-3.0.4/mm/kmemleak.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/kmemleak.c  2011-08-23 21:48:14.000000000 -0400
 @@ -357,7 +357,7 @@ static void print_unreferenced(struct se
  
        for (i = 0; i < object->trace_len; i++) {
@@ -60685,9 +63463,9 @@ diff -urNp linux-3.0.3/mm/kmemleak.c linux-3.0.3/mm/kmemleak.c
        }
  }
  
-diff -urNp linux-3.0.3/mm/madvise.c linux-3.0.3/mm/madvise.c
---- linux-3.0.3/mm/madvise.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/madvise.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/madvise.c linux-3.0.4/mm/madvise.c
+--- linux-3.0.4/mm/madvise.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/madvise.c   2011-08-23 21:47:56.000000000 -0400
 @@ -45,6 +45,10 @@ static long madvise_behavior(struct vm_a
        pgoff_t pgoff;
        unsigned long new_flags = vma->vm_flags;
@@ -60764,9 +63542,9 @@ diff -urNp linux-3.0.3/mm/madvise.c linux-3.0.3/mm/madvise.c
        error = 0;
        if (end == start)
                goto out;
-diff -urNp linux-3.0.3/mm/memory.c linux-3.0.3/mm/memory.c
---- linux-3.0.3/mm/memory.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/mm/memory.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/memory.c linux-3.0.4/mm/memory.c
+--- linux-3.0.4/mm/memory.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/mm/memory.c    2011-08-23 21:47:56.000000000 -0400
 @@ -457,8 +457,12 @@ static inline void free_pmd_range(struct
                return;
  
@@ -61330,9 +64108,9 @@ diff -urNp linux-3.0.3/mm/memory.c linux-3.0.3/mm/memory.c
        /*
         * Make sure the vDSO gets into every core dump.
         * Dumping its contents makes post-mortem fully interpretable later
-diff -urNp linux-3.0.3/mm/memory-failure.c linux-3.0.3/mm/memory-failure.c
---- linux-3.0.3/mm/memory-failure.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/memory-failure.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/memory-failure.c linux-3.0.4/mm/memory-failure.c
+--- linux-3.0.4/mm/memory-failure.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/memory-failure.c    2011-08-23 21:47:56.000000000 -0400
 @@ -59,7 +59,7 @@ int sysctl_memory_failure_early_kill __r
  
  int sysctl_memory_failure_recovery __read_mostly = 1;
@@ -61405,9 +64183,9 @@ diff -urNp linux-3.0.3/mm/memory-failure.c linux-3.0.3/mm/memory-failure.c
        SetPageHWPoison(page);
        /* keep elevated page count for bad page */
        return ret;
-diff -urNp linux-3.0.3/mm/mempolicy.c linux-3.0.3/mm/mempolicy.c
---- linux-3.0.3/mm/mempolicy.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mempolicy.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mempolicy.c linux-3.0.4/mm/mempolicy.c
+--- linux-3.0.4/mm/mempolicy.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mempolicy.c 2011-08-23 21:48:14.000000000 -0400
 @@ -639,6 +639,10 @@ static int mbind_range(struct mm_struct 
        unsigned long vmstart;
        unsigned long vmend;
@@ -61479,9 +64257,9 @@ diff -urNp linux-3.0.3/mm/mempolicy.c linux-3.0.3/mm/mempolicy.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-diff -urNp linux-3.0.3/mm/migrate.c linux-3.0.3/mm/migrate.c
---- linux-3.0.3/mm/migrate.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/migrate.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/migrate.c linux-3.0.4/mm/migrate.c
+--- linux-3.0.4/mm/migrate.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/migrate.c   2011-08-23 21:48:14.000000000 -0400
 @@ -1124,6 +1124,8 @@ static int do_pages_move(struct mm_struc
        unsigned long chunk_start;
        int err;
@@ -61516,9 +64294,9 @@ diff -urNp linux-3.0.3/mm/migrate.c linux-3.0.3/mm/migrate.c
                rcu_read_unlock();
                err = -EPERM;
                goto out;
-diff -urNp linux-3.0.3/mm/mlock.c linux-3.0.3/mm/mlock.c
---- linux-3.0.3/mm/mlock.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mlock.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mlock.c linux-3.0.4/mm/mlock.c
+--- linux-3.0.4/mm/mlock.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mlock.c     2011-08-23 21:48:14.000000000 -0400
 @@ -13,6 +13,7 @@
  #include <linux/pagemap.h>
  #include <linux/mempolicy.h>
@@ -61592,9 +64370,9 @@ diff -urNp linux-3.0.3/mm/mlock.c linux-3.0.3/mm/mlock.c
        if (!(flags & MCL_CURRENT) || (current->mm->total_vm <= lock_limit) ||
            capable(CAP_IPC_LOCK))
                ret = do_mlockall(flags);
-diff -urNp linux-3.0.3/mm/mmap.c linux-3.0.3/mm/mmap.c
---- linux-3.0.3/mm/mmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mmap.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mmap.c linux-3.0.4/mm/mmap.c
+--- linux-3.0.4/mm/mmap.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mmap.c      2011-08-23 21:48:14.000000000 -0400
 @@ -46,6 +46,16 @@
  #define arch_rebalance_pgtables(addr, len)            (addr)
  #endif
@@ -62853,9 +65631,9 @@ diff -urNp linux-3.0.3/mm/mmap.c linux-3.0.3/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-3.0.3/mm/mprotect.c linux-3.0.3/mm/mprotect.c
---- linux-3.0.3/mm/mprotect.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mprotect.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/mprotect.c linux-3.0.4/mm/mprotect.c
+--- linux-3.0.4/mm/mprotect.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mprotect.c  2011-08-23 21:48:14.000000000 -0400
 @@ -23,10 +23,16 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -63082,9 +65860,9 @@ diff -urNp linux-3.0.3/mm/mprotect.c linux-3.0.3/mm/mprotect.c
                nstart = tmp;
  
                if (nstart < prev->vm_end)
-diff -urNp linux-3.0.3/mm/mremap.c linux-3.0.3/mm/mremap.c
---- linux-3.0.3/mm/mremap.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/mremap.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/mremap.c linux-3.0.4/mm/mremap.c
+--- linux-3.0.4/mm/mremap.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/mremap.c    2011-08-23 21:47:56.000000000 -0400
 @@ -113,6 +113,12 @@ static void move_ptes(struct vm_area_str
                        continue;
                pte = ptep_clear_flush(vma, old_addr, old_pte);
@@ -63189,9 +65967,9 @@ diff -urNp linux-3.0.3/mm/mremap.c linux-3.0.3/mm/mremap.c
        }
  out:
        if (ret & ~PAGE_MASK)
-diff -urNp linux-3.0.3/mm/nobootmem.c linux-3.0.3/mm/nobootmem.c
---- linux-3.0.3/mm/nobootmem.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/nobootmem.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/nobootmem.c linux-3.0.4/mm/nobootmem.c
+--- linux-3.0.4/mm/nobootmem.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/nobootmem.c 2011-08-23 21:47:56.000000000 -0400
 @@ -110,19 +110,30 @@ static void __init __free_pages_memory(u
  unsigned long __init free_all_memory_core_early(int nodeid)
  {
@@ -63225,9 +66003,9 @@ diff -urNp linux-3.0.3/mm/nobootmem.c linux-3.0.3/mm/nobootmem.c
  
        return count;
  }
-diff -urNp linux-3.0.3/mm/nommu.c linux-3.0.3/mm/nommu.c
---- linux-3.0.3/mm/nommu.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/nommu.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/nommu.c linux-3.0.4/mm/nommu.c
+--- linux-3.0.4/mm/nommu.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/nommu.c     2011-08-23 21:47:56.000000000 -0400
 @@ -63,7 +63,6 @@ int sysctl_overcommit_memory = OVERCOMMI
  int sysctl_overcommit_ratio = 50; /* default is 50% */
  int sysctl_max_map_count = DEFAULT_MAX_MAP_COUNT;
@@ -63260,9 +66038,9 @@ diff -urNp linux-3.0.3/mm/nommu.c linux-3.0.3/mm/nommu.c
        *region = *vma->vm_region;
        new->vm_region = region;
  
-diff -urNp linux-3.0.3/mm/page_alloc.c linux-3.0.3/mm/page_alloc.c
---- linux-3.0.3/mm/page_alloc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/page_alloc.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/page_alloc.c linux-3.0.4/mm/page_alloc.c
+--- linux-3.0.4/mm/page_alloc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/page_alloc.c        2011-08-23 21:48:14.000000000 -0400
 @@ -340,7 +340,7 @@ out:
   * This usage means that zero-order pages may not be compound.
   */
@@ -63316,9 +66094,9 @@ diff -urNp linux-3.0.3/mm/page_alloc.c linux-3.0.3/mm/page_alloc.c
        for_each_populated_zone(zone) {
                if (skip_free_areas_node(filter, zone_to_nid(zone)))
                        continue;
-diff -urNp linux-3.0.3/mm/percpu.c linux-3.0.3/mm/percpu.c
---- linux-3.0.3/mm/percpu.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/percpu.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/percpu.c linux-3.0.4/mm/percpu.c
+--- linux-3.0.4/mm/percpu.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/percpu.c    2011-08-23 21:47:56.000000000 -0400
 @@ -121,7 +121,7 @@ static unsigned int pcpu_first_unit_cpu 
  static unsigned int pcpu_last_unit_cpu __read_mostly;
  
@@ -63328,9 +66106,9 @@ diff -urNp linux-3.0.3/mm/percpu.c linux-3.0.3/mm/percpu.c
  EXPORT_SYMBOL_GPL(pcpu_base_addr);
  
  static const int *pcpu_unit_map __read_mostly;                /* cpu -> unit */
-diff -urNp linux-3.0.3/mm/rmap.c linux-3.0.3/mm/rmap.c
---- linux-3.0.3/mm/rmap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/rmap.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/rmap.c linux-3.0.4/mm/rmap.c
+--- linux-3.0.4/mm/rmap.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/rmap.c      2011-08-23 21:47:56.000000000 -0400
 @@ -153,6 +153,10 @@ int anon_vma_prepare(struct vm_area_stru
        struct anon_vma *anon_vma = vma->anon_vma;
        struct anon_vma_chain *avc;
@@ -63420,9 +66198,9 @@ diff -urNp linux-3.0.3/mm/rmap.c linux-3.0.3/mm/rmap.c
  {
        struct anon_vma_chain *avc;
        struct anon_vma *anon_vma;
-diff -urNp linux-3.0.3/mm/shmem.c linux-3.0.3/mm/shmem.c
---- linux-3.0.3/mm/shmem.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/shmem.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/shmem.c linux-3.0.4/mm/shmem.c
+--- linux-3.0.4/mm/shmem.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/shmem.c     2011-08-23 21:48:14.000000000 -0400
 @@ -31,7 +31,7 @@
  #include <linux/percpu_counter.h>
  #include <linux/swap.h>
@@ -63460,9 +66238,9 @@ diff -urNp linux-3.0.3/mm/shmem.c linux-3.0.3/mm/shmem.c
        if (!sbinfo)
                return -ENOMEM;
  
-diff -urNp linux-3.0.3/mm/slab.c linux-3.0.3/mm/slab.c
---- linux-3.0.3/mm/slab.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/slab.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/slab.c linux-3.0.4/mm/slab.c
+--- linux-3.0.4/mm/slab.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/slab.c      2011-08-23 21:48:14.000000000 -0400
 @@ -151,7 +151,7 @@
  
  /* Legal flag mask for kmem_cache_create(). */
@@ -63634,9 +66412,9 @@ diff -urNp linux-3.0.3/mm/slab.c linux-3.0.3/mm/slab.c
  /**
   * ksize - get the actual amount of memory allocated for a given object
   * @objp: Pointer to the object
-diff -urNp linux-3.0.3/mm/slob.c linux-3.0.3/mm/slob.c
---- linux-3.0.3/mm/slob.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/slob.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/slob.c linux-3.0.4/mm/slob.c
+--- linux-3.0.4/mm/slob.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/slob.c      2011-08-23 21:47:56.000000000 -0400
 @@ -29,7 +29,7 @@
   * If kmalloc is asked for objects of PAGE_SIZE or larger, it calls
   * alloc_pages() directly, allocating compound pages so the page order
@@ -63985,9 +66763,9 @@ diff -urNp linux-3.0.3/mm/slob.c linux-3.0.3/mm/slob.c
  }
  EXPORT_SYMBOL(kmem_cache_free);
  
-diff -urNp linux-3.0.3/mm/slub.c linux-3.0.3/mm/slub.c
---- linux-3.0.3/mm/slub.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/slub.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/slub.c linux-3.0.4/mm/slub.c
+--- linux-3.0.4/mm/slub.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/slub.c      2011-08-23 21:48:14.000000000 -0400
 @@ -442,7 +442,7 @@ static void print_track(const char *s, s
        if (!t->addr)
                return;
@@ -64162,9 +66940,9 @@ diff -urNp linux-3.0.3/mm/slub.c linux-3.0.3/mm/slub.c
        return 0;
  }
  module_init(slab_proc_init);
-diff -urNp linux-3.0.3/mm/swap.c linux-3.0.3/mm/swap.c
---- linux-3.0.3/mm/swap.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/swap.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/swap.c linux-3.0.4/mm/swap.c
+--- linux-3.0.4/mm/swap.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/swap.c      2011-08-23 21:47:56.000000000 -0400
 @@ -31,6 +31,7 @@
  #include <linux/backing-dev.h>
  #include <linux/memcontrol.h>
@@ -64182,9 +66960,9 @@ diff -urNp linux-3.0.3/mm/swap.c linux-3.0.3/mm/swap.c
        (*dtor)(page);
  }
  
-diff -urNp linux-3.0.3/mm/swapfile.c linux-3.0.3/mm/swapfile.c
---- linux-3.0.3/mm/swapfile.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/swapfile.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/swapfile.c linux-3.0.4/mm/swapfile.c
+--- linux-3.0.4/mm/swapfile.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/swapfile.c  2011-08-23 21:47:56.000000000 -0400
 @@ -62,7 +62,7 @@ static DEFINE_MUTEX(swapon_mutex);
  
  static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
@@ -64232,9 +67010,9 @@ diff -urNp linux-3.0.3/mm/swapfile.c linux-3.0.3/mm/swapfile.c
        wake_up_interruptible(&proc_poll_wait);
  
        if (S_ISREG(inode->i_mode))
-diff -urNp linux-3.0.3/mm/util.c linux-3.0.3/mm/util.c
---- linux-3.0.3/mm/util.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/util.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/util.c linux-3.0.4/mm/util.c
+--- linux-3.0.4/mm/util.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/util.c      2011-08-23 21:47:56.000000000 -0400
 @@ -114,6 +114,7 @@ EXPORT_SYMBOL(memdup_user);
   * allocated buffer. Use this if you don't want to free the buffer immediately
   * like, for example, with RCU.
@@ -64264,9 +67042,9 @@ diff -urNp linux-3.0.3/mm/util.c linux-3.0.3/mm/util.c
        mm->get_unmapped_area = arch_get_unmapped_area;
        mm->unmap_area = arch_unmap_area;
  }
-diff -urNp linux-3.0.3/mm/vmalloc.c linux-3.0.3/mm/vmalloc.c
---- linux-3.0.3/mm/vmalloc.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/mm/vmalloc.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/mm/vmalloc.c linux-3.0.4/mm/vmalloc.c
+--- linux-3.0.4/mm/vmalloc.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/mm/vmalloc.c   2011-08-23 21:47:56.000000000 -0400
 @@ -39,8 +39,19 @@ static void vunmap_pte_range(pmd_t *pmd,
  
        pte = pte_offset_kernel(pmd, addr);
@@ -64499,9 +67277,9 @@ diff -urNp linux-3.0.3/mm/vmalloc.c linux-3.0.3/mm/vmalloc.c
        if ((PAGE_SIZE-1) & (unsigned long)addr)
                return -EINVAL;
  
-diff -urNp linux-3.0.3/mm/vmstat.c linux-3.0.3/mm/vmstat.c
---- linux-3.0.3/mm/vmstat.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/mm/vmstat.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/mm/vmstat.c linux-3.0.4/mm/vmstat.c
+--- linux-3.0.4/mm/vmstat.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/mm/vmstat.c    2011-08-23 21:48:14.000000000 -0400
 @@ -78,7 +78,7 @@ void vm_events_fold_cpu(int cpu)
   *
   * vm_stat contains the global counters
@@ -64554,9 +67332,9 @@ diff -urNp linux-3.0.3/mm/vmstat.c linux-3.0.3/mm/vmstat.c
  #endif
        return 0;
  }
-diff -urNp linux-3.0.3/net/8021q/vlan.c linux-3.0.3/net/8021q/vlan.c
---- linux-3.0.3/net/8021q/vlan.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/8021q/vlan.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/8021q/vlan.c linux-3.0.4/net/8021q/vlan.c
+--- linux-3.0.4/net/8021q/vlan.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/8021q/vlan.c       2011-08-23 21:47:56.000000000 -0400
 @@ -591,8 +591,7 @@ static int vlan_ioctl_handler(struct net
                err = -EPERM;
                if (!capable(CAP_NET_ADMIN))
@@ -64567,9 +67345,9 @@ diff -urNp linux-3.0.3/net/8021q/vlan.c linux-3.0.3/net/8021q/vlan.c
                        struct vlan_net *vn;
  
                        vn = net_generic(net, vlan_net_id);
-diff -urNp linux-3.0.3/net/atm/atm_misc.c linux-3.0.3/net/atm/atm_misc.c
---- linux-3.0.3/net/atm/atm_misc.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/atm_misc.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/atm_misc.c linux-3.0.4/net/atm/atm_misc.c
+--- linux-3.0.4/net/atm/atm_misc.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/atm_misc.c     2011-08-23 21:47:56.000000000 -0400
 @@ -17,7 +17,7 @@ int atm_charge(struct atm_vcc *vcc, int 
        if (atomic_read(&sk_atm(vcc)->sk_rmem_alloc) <= sk_atm(vcc)->sk_rcvbuf)
                return 1;
@@ -64606,9 +67384,9 @@ diff -urNp linux-3.0.3/net/atm/atm_misc.c linux-3.0.3/net/atm/atm_misc.c
        __SONET_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.3/net/atm/lec.h linux-3.0.3/net/atm/lec.h
---- linux-3.0.3/net/atm/lec.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/lec.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/lec.h linux-3.0.4/net/atm/lec.h
+--- linux-3.0.4/net/atm/lec.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/lec.h  2011-08-23 21:47:56.000000000 -0400
 @@ -48,7 +48,7 @@ struct lane2_ops {
                              const u8 *tlvs, u32 sizeoftlvs);
        void (*associate_indicator) (struct net_device *dev, const u8 *mac_addr,
@@ -64618,9 +67396,9 @@ diff -urNp linux-3.0.3/net/atm/lec.h linux-3.0.3/net/atm/lec.h
  
  /*
   * ATM LAN Emulation supports both LLC & Dix Ethernet EtherType
-diff -urNp linux-3.0.3/net/atm/mpc.h linux-3.0.3/net/atm/mpc.h
---- linux-3.0.3/net/atm/mpc.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/mpc.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/mpc.h linux-3.0.4/net/atm/mpc.h
+--- linux-3.0.4/net/atm/mpc.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/mpc.h  2011-08-23 21:47:56.000000000 -0400
 @@ -33,7 +33,7 @@ struct mpoa_client {
        struct mpc_parameters parameters;  /* parameters for this client    */
  
@@ -64630,9 +67408,9 @@ diff -urNp linux-3.0.3/net/atm/mpc.h linux-3.0.3/net/atm/mpc.h
  };
  
  
-diff -urNp linux-3.0.3/net/atm/mpoa_caches.c linux-3.0.3/net/atm/mpoa_caches.c
---- linux-3.0.3/net/atm/mpoa_caches.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/mpoa_caches.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/mpoa_caches.c linux-3.0.4/net/atm/mpoa_caches.c
+--- linux-3.0.4/net/atm/mpoa_caches.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/mpoa_caches.c  2011-08-23 21:48:14.000000000 -0400
 @@ -255,6 +255,8 @@ static void check_resolving_entries(stru
        struct timeval now;
        struct k_message msg;
@@ -64642,9 +67420,9 @@ diff -urNp linux-3.0.3/net/atm/mpoa_caches.c linux-3.0.3/net/atm/mpoa_caches.c
        do_gettimeofday(&now);
  
        read_lock_bh(&client->ingress_lock);
-diff -urNp linux-3.0.3/net/atm/proc.c linux-3.0.3/net/atm/proc.c
---- linux-3.0.3/net/atm/proc.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/proc.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/proc.c linux-3.0.4/net/atm/proc.c
+--- linux-3.0.4/net/atm/proc.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/proc.c 2011-08-23 21:47:56.000000000 -0400
 @@ -45,9 +45,9 @@ static void add_stats(struct seq_file *s
    const struct k_atm_aal_stats *stats)
  {
@@ -64658,9 +67436,9 @@ diff -urNp linux-3.0.3/net/atm/proc.c linux-3.0.3/net/atm/proc.c
  }
  
  static void atm_dev_info(struct seq_file *seq, const struct atm_dev *dev)
-diff -urNp linux-3.0.3/net/atm/resources.c linux-3.0.3/net/atm/resources.c
---- linux-3.0.3/net/atm/resources.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/atm/resources.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/atm/resources.c linux-3.0.4/net/atm/resources.c
+--- linux-3.0.4/net/atm/resources.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/atm/resources.c    2011-08-23 21:47:56.000000000 -0400
 @@ -160,7 +160,7 @@ EXPORT_SYMBOL(atm_dev_deregister);
  static void copy_aal_stats(struct k_atm_aal_stats *from,
      struct atm_aal_stats *to)
@@ -64679,9 +67457,9 @@ diff -urNp linux-3.0.3/net/atm/resources.c linux-3.0.3/net/atm/resources.c
        __AAL_STAT_ITEMS
  #undef __HANDLE_ITEM
  }
-diff -urNp linux-3.0.3/net/batman-adv/hard-interface.c linux-3.0.3/net/batman-adv/hard-interface.c
---- linux-3.0.3/net/batman-adv/hard-interface.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/hard-interface.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/hard-interface.c linux-3.0.4/net/batman-adv/hard-interface.c
+--- linux-3.0.4/net/batman-adv/hard-interface.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/hard-interface.c        2011-08-23 21:47:56.000000000 -0400
 @@ -351,8 +351,8 @@ int hardif_enable_interface(struct hard_
        hard_iface->batman_adv_ptype.dev = hard_iface->net_dev;
        dev_add_pack(&hard_iface->batman_adv_ptype);
@@ -64693,9 +67471,9 @@ diff -urNp linux-3.0.3/net/batman-adv/hard-interface.c linux-3.0.3/net/batman-ad
        bat_info(hard_iface->soft_iface, "Adding interface: %s\n",
                 hard_iface->net_dev->name);
  
-diff -urNp linux-3.0.3/net/batman-adv/routing.c linux-3.0.3/net/batman-adv/routing.c
---- linux-3.0.3/net/batman-adv/routing.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/routing.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/routing.c linux-3.0.4/net/batman-adv/routing.c
+--- linux-3.0.4/net/batman-adv/routing.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/routing.c       2011-08-23 21:47:56.000000000 -0400
 @@ -627,7 +627,7 @@ void receive_bat_packet(struct ethhdr *e
                return;
  
@@ -64705,9 +67483,9 @@ diff -urNp linux-3.0.3/net/batman-adv/routing.c linux-3.0.3/net/batman-adv/routi
  
        has_directlink_flag = (batman_packet->flags & DIRECTLINK ? 1 : 0);
  
-diff -urNp linux-3.0.3/net/batman-adv/send.c linux-3.0.3/net/batman-adv/send.c
---- linux-3.0.3/net/batman-adv/send.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/send.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/send.c linux-3.0.4/net/batman-adv/send.c
+--- linux-3.0.4/net/batman-adv/send.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/send.c  2011-08-23 21:47:56.000000000 -0400
 @@ -279,7 +279,7 @@ void schedule_own_packet(struct hard_ifa
  
        /* change sequence number to network order */
@@ -64726,9 +67504,9 @@ diff -urNp linux-3.0.3/net/batman-adv/send.c linux-3.0.3/net/batman-adv/send.c
  
        slide_own_bcast_window(hard_iface);
        send_time = own_send_time(bat_priv);
-diff -urNp linux-3.0.3/net/batman-adv/soft-interface.c linux-3.0.3/net/batman-adv/soft-interface.c
---- linux-3.0.3/net/batman-adv/soft-interface.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/soft-interface.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/soft-interface.c linux-3.0.4/net/batman-adv/soft-interface.c
+--- linux-3.0.4/net/batman-adv/soft-interface.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/soft-interface.c        2011-08-23 21:47:56.000000000 -0400
 @@ -628,7 +628,7 @@ int interface_tx(struct sk_buff *skb, st
  
                /* set broadcast sequence number */
@@ -64747,9 +67525,9 @@ diff -urNp linux-3.0.3/net/batman-adv/soft-interface.c linux-3.0.3/net/batman-ad
        atomic_set(&bat_priv->tt_local_changed, 0);
  
        bat_priv->primary_if = NULL;
-diff -urNp linux-3.0.3/net/batman-adv/types.h linux-3.0.3/net/batman-adv/types.h
---- linux-3.0.3/net/batman-adv/types.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/types.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/types.h linux-3.0.4/net/batman-adv/types.h
+--- linux-3.0.4/net/batman-adv/types.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/types.h 2011-08-23 21:47:56.000000000 -0400
 @@ -38,8 +38,8 @@ struct hard_iface {
        int16_t if_num;
        char if_status;
@@ -64770,9 +67548,9 @@ diff -urNp linux-3.0.3/net/batman-adv/types.h linux-3.0.3/net/batman-adv/types.h
        atomic_t bcast_queue_left;
        atomic_t batman_queue_left;
        char num_ifaces;
-diff -urNp linux-3.0.3/net/batman-adv/unicast.c linux-3.0.3/net/batman-adv/unicast.c
---- linux-3.0.3/net/batman-adv/unicast.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/batman-adv/unicast.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/batman-adv/unicast.c linux-3.0.4/net/batman-adv/unicast.c
+--- linux-3.0.4/net/batman-adv/unicast.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/batman-adv/unicast.c       2011-08-23 21:47:56.000000000 -0400
 @@ -265,7 +265,7 @@ int frag_send_skb(struct sk_buff *skb, s
        frag1->flags = UNI_FRAG_HEAD | large_tail;
        frag2->flags = large_tail;
@@ -64782,9 +67560,9 @@ diff -urNp linux-3.0.3/net/batman-adv/unicast.c linux-3.0.3/net/batman-adv/unica
        frag1->seqno = htons(seqno - 1);
        frag2->seqno = htons(seqno);
  
-diff -urNp linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3/net/bridge/br_multicast.c
---- linux-3.0.3/net/bridge/br_multicast.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/bridge/br_multicast.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/bridge/br_multicast.c linux-3.0.4/net/bridge/br_multicast.c
+--- linux-3.0.4/net/bridge/br_multicast.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/bridge/br_multicast.c      2011-08-23 21:47:56.000000000 -0400
 @@ -1485,7 +1485,7 @@ static int br_multicast_ipv6_rcv(struct 
        nexthdr = ip6h->nexthdr;
        offset = ipv6_skip_exthdr(skb, sizeof(*ip6h), &nexthdr);
@@ -64794,9 +67572,9 @@ diff -urNp linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3/net/bridge/br_multi
                return 0;
  
        /* Okay, we found ICMPv6 header */
-diff -urNp linux-3.0.3/net/bridge/netfilter/ebtables.c linux-3.0.3/net/bridge/netfilter/ebtables.c
---- linux-3.0.3/net/bridge/netfilter/ebtables.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/bridge/netfilter/ebtables.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/bridge/netfilter/ebtables.c linux-3.0.4/net/bridge/netfilter/ebtables.c
+--- linux-3.0.4/net/bridge/netfilter/ebtables.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/bridge/netfilter/ebtables.c        2011-08-23 21:48:14.000000000 -0400
 @@ -1512,7 +1512,7 @@ static int do_ebt_get_ctl(struct sock *s
                        tmp.valid_hooks = t->table->valid_hooks;
                }
@@ -64815,9 +67593,9 @@ diff -urNp linux-3.0.3/net/bridge/netfilter/ebtables.c linux-3.0.3/net/bridge/ne
        memset(&tinfo, 0, sizeof(tinfo));
  
        if (cmd == EBT_SO_GET_ENTRIES) {
-diff -urNp linux-3.0.3/net/caif/caif_socket.c linux-3.0.3/net/caif/caif_socket.c
---- linux-3.0.3/net/caif/caif_socket.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/caif/caif_socket.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/caif/caif_socket.c linux-3.0.4/net/caif/caif_socket.c
+--- linux-3.0.4/net/caif/caif_socket.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/caif/caif_socket.c 2011-08-23 21:47:56.000000000 -0400
 @@ -48,19 +48,20 @@ static struct dentry *debugfsdir;
  #ifdef CONFIG_DEBUG_FS
  struct debug_fs_counter {
@@ -64947,9 +67725,9 @@ diff -urNp linux-3.0.3/net/caif/caif_socket.c linux-3.0.3/net/caif/caif_socket.c
  #ifdef CONFIG_DEBUG_FS
        if (!IS_ERR(debugfsdir)) {
  
-diff -urNp linux-3.0.3/net/caif/cfctrl.c linux-3.0.3/net/caif/cfctrl.c
---- linux-3.0.3/net/caif/cfctrl.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/caif/cfctrl.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/caif/cfctrl.c linux-3.0.4/net/caif/cfctrl.c
+--- linux-3.0.4/net/caif/cfctrl.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/caif/cfctrl.c      2011-08-23 21:48:14.000000000 -0400
 @@ -9,6 +9,7 @@
  #include <linux/stddef.h>
  #include <linux/spinlock.h>
@@ -64997,9 +67775,9 @@ diff -urNp linux-3.0.3/net/caif/cfctrl.c linux-3.0.3/net/caif/cfctrl.c
  
        cfpkt_extr_head(pkt, &cmdrsp, 1);
        cmd = cmdrsp & CFCTRL_CMD_MASK;
-diff -urNp linux-3.0.3/net/core/datagram.c linux-3.0.3/net/core/datagram.c
---- linux-3.0.3/net/core/datagram.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/datagram.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/core/datagram.c linux-3.0.4/net/core/datagram.c
+--- linux-3.0.4/net/core/datagram.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/datagram.c    2011-08-23 21:47:56.000000000 -0400
 @@ -285,7 +285,7 @@ int skb_kill_datagram(struct sock *sk, s
        }
  
@@ -65009,9 +67787,9 @@ diff -urNp linux-3.0.3/net/core/datagram.c linux-3.0.3/net/core/datagram.c
        sk_mem_reclaim_partial(sk);
  
        return err;
-diff -urNp linux-3.0.3/net/core/dev.c linux-3.0.3/net/core/dev.c
---- linux-3.0.3/net/core/dev.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/dev.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/core/dev.c linux-3.0.4/net/core/dev.c
+--- linux-3.0.4/net/core/dev.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/dev.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1125,10 +1125,14 @@ void dev_load(struct net *net, const cha
        if (no_module && capable(CAP_NET_ADMIN))
                no_module = request_module("netdev-%s", name);
@@ -65054,9 +67832,9 @@ diff -urNp linux-3.0.3/net/core/dev.c linux-3.0.3/net/core/dev.c
  {
        struct softnet_data *sd = &__get_cpu_var(softnet_data);
        unsigned long time_limit = jiffies + 2;
-diff -urNp linux-3.0.3/net/core/flow.c linux-3.0.3/net/core/flow.c
---- linux-3.0.3/net/core/flow.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/flow.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/core/flow.c linux-3.0.4/net/core/flow.c
+--- linux-3.0.4/net/core/flow.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/flow.c        2011-08-23 21:47:56.000000000 -0400
 @@ -60,7 +60,7 @@ struct flow_cache {
        struct timer_list               rnd_timer;
  };
@@ -65093,9 +67871,9 @@ diff -urNp linux-3.0.3/net/core/flow.c linux-3.0.3/net/core/flow.c
                if (!IS_ERR(flo))
                        fle->object = flo;
                else
-diff -urNp linux-3.0.3/net/core/rtnetlink.c linux-3.0.3/net/core/rtnetlink.c
---- linux-3.0.3/net/core/rtnetlink.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/rtnetlink.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/core/rtnetlink.c linux-3.0.4/net/core/rtnetlink.c
+--- linux-3.0.4/net/core/rtnetlink.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/rtnetlink.c   2011-08-23 21:47:56.000000000 -0400
 @@ -56,7 +56,7 @@
  struct rtnl_link {
        rtnl_doit_func          doit;
@@ -65105,9 +67883,9 @@ diff -urNp linux-3.0.3/net/core/rtnetlink.c linux-3.0.3/net/core/rtnetlink.c
  
  static DEFINE_MUTEX(rtnl_mutex);
  
-diff -urNp linux-3.0.3/net/core/skbuff.c linux-3.0.3/net/core/skbuff.c
---- linux-3.0.3/net/core/skbuff.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/skbuff.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/core/skbuff.c linux-3.0.4/net/core/skbuff.c
+--- linux-3.0.4/net/core/skbuff.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/skbuff.c      2011-08-23 21:48:14.000000000 -0400
 @@ -1543,6 +1543,8 @@ int skb_splice_bits(struct sk_buff *skb,
        struct sock *sk = skb->sk;
        int ret = 0;
@@ -65117,9 +67895,9 @@ diff -urNp linux-3.0.3/net/core/skbuff.c linux-3.0.3/net/core/skbuff.c
        if (splice_grow_spd(pipe, &spd))
                return -ENOMEM;
  
-diff -urNp linux-3.0.3/net/core/sock.c linux-3.0.3/net/core/sock.c
---- linux-3.0.3/net/core/sock.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/core/sock.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/core/sock.c linux-3.0.4/net/core/sock.c
+--- linux-3.0.4/net/core/sock.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/core/sock.c        2011-08-23 21:48:14.000000000 -0400
 @@ -291,7 +291,7 @@ int sock_queue_rcv_skb(struct sock *sk, 
         */
        if (atomic_read(&sk->sk_rmem_alloc) + skb->truesize >=
@@ -65201,9 +67979,9 @@ diff -urNp linux-3.0.3/net/core/sock.c linux-3.0.3/net/core/sock.c
  }
  EXPORT_SYMBOL(sock_init_data);
  
-diff -urNp linux-3.0.3/net/decnet/sysctl_net_decnet.c linux-3.0.3/net/decnet/sysctl_net_decnet.c
---- linux-3.0.3/net/decnet/sysctl_net_decnet.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/decnet/sysctl_net_decnet.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/decnet/sysctl_net_decnet.c linux-3.0.4/net/decnet/sysctl_net_decnet.c
+--- linux-3.0.4/net/decnet/sysctl_net_decnet.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/decnet/sysctl_net_decnet.c 2011-08-23 21:47:56.000000000 -0400
 @@ -173,7 +173,7 @@ static int dn_node_address_handler(ctl_t
  
        if (len > *lenp) len = *lenp;
@@ -65222,9 +68000,9 @@ diff -urNp linux-3.0.3/net/decnet/sysctl_net_decnet.c linux-3.0.3/net/decnet/sys
                return -EFAULT;
  
        *lenp = len;
-diff -urNp linux-3.0.3/net/econet/Kconfig linux-3.0.3/net/econet/Kconfig
---- linux-3.0.3/net/econet/Kconfig     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/econet/Kconfig     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/econet/Kconfig linux-3.0.4/net/econet/Kconfig
+--- linux-3.0.4/net/econet/Kconfig     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/econet/Kconfig     2011-08-23 21:48:14.000000000 -0400
 @@ -4,7 +4,7 @@
  
  config ECONET
@@ -65234,9 +68012,9 @@ diff -urNp linux-3.0.3/net/econet/Kconfig linux-3.0.3/net/econet/Kconfig
        ---help---
          Econet is a fairly old and slow networking protocol mainly used by
          Acorn computers to access file and print servers. It uses native
-diff -urNp linux-3.0.3/net/ipv4/fib_frontend.c linux-3.0.3/net/ipv4/fib_frontend.c
---- linux-3.0.3/net/ipv4/fib_frontend.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/fib_frontend.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/fib_frontend.c linux-3.0.4/net/ipv4/fib_frontend.c
+--- linux-3.0.4/net/ipv4/fib_frontend.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/fib_frontend.c        2011-08-23 21:47:56.000000000 -0400
 @@ -970,12 +970,12 @@ static int fib_inetaddr_event(struct not
  #ifdef CONFIG_IP_ROUTE_MULTIPATH
                fib_sync_up(dev);
@@ -65261,9 +68039,9 @@ diff -urNp linux-3.0.3/net/ipv4/fib_frontend.c linux-3.0.3/net/ipv4/fib_frontend
                rt_cache_flush(dev_net(dev), -1);
                break;
        case NETDEV_DOWN:
-diff -urNp linux-3.0.3/net/ipv4/fib_semantics.c linux-3.0.3/net/ipv4/fib_semantics.c
---- linux-3.0.3/net/ipv4/fib_semantics.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/fib_semantics.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/fib_semantics.c linux-3.0.4/net/ipv4/fib_semantics.c
+--- linux-3.0.4/net/ipv4/fib_semantics.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/fib_semantics.c       2011-08-23 21:47:56.000000000 -0400
 @@ -691,7 +691,7 @@ __be32 fib_info_update_nh_saddr(struct n
        nh->nh_saddr = inet_select_addr(nh->nh_dev,
                                        nh->nh_gw,
@@ -65273,9 +68051,9 @@ diff -urNp linux-3.0.3/net/ipv4/fib_semantics.c linux-3.0.3/net/ipv4/fib_semanti
  
        return nh->nh_saddr;
  }
-diff -urNp linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3/net/ipv4/inet_diag.c
---- linux-3.0.3/net/ipv4/inet_diag.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/inet_diag.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/inet_diag.c linux-3.0.4/net/ipv4/inet_diag.c
+--- linux-3.0.4/net/ipv4/inet_diag.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/inet_diag.c   2011-08-23 21:48:14.000000000 -0400
 @@ -114,8 +114,14 @@ static int inet_csk_diag_fill(struct soc
        r->idiag_retrans = 0;
  
@@ -65337,9 +68115,9 @@ diff -urNp linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3/net/ipv4/inet_diag.c
  
        tmo = req->expires - jiffies;
        if (tmo < 0)
-diff -urNp linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3/net/ipv4/inet_hashtables.c
---- linux-3.0.3/net/ipv4/inet_hashtables.c     2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/inet_hashtables.c     2011-08-23 21:55:24.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/inet_hashtables.c linux-3.0.4/net/ipv4/inet_hashtables.c
+--- linux-3.0.4/net/ipv4/inet_hashtables.c     2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/inet_hashtables.c     2011-08-23 21:55:24.000000000 -0400
 @@ -18,12 +18,15 @@
  #include <linux/sched.h>
  #include <linux/slab.h>
@@ -65348,8 +68126,8 @@ diff -urNp linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3/net/ipv4/inet_hash
  
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
- #include <net/route.h>
  #include <net/secure_seq.h>
+ #include <net/route.h>
  #include <net/ip.h>
  
 +extern void gr_update_task_in_ip_table(struct task_struct *task, const struct inet_sock *inet);
@@ -65365,9 +68143,9 @@ diff -urNp linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3/net/ipv4/inet_hash
                if (tw) {
                        inet_twsk_deschedule(tw, death_row);
                        while (twrefcnt) {
-diff -urNp linux-3.0.3/net/ipv4/inetpeer.c linux-3.0.3/net/ipv4/inetpeer.c
---- linux-3.0.3/net/ipv4/inetpeer.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/inetpeer.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/inetpeer.c linux-3.0.4/net/ipv4/inetpeer.c
+--- linux-3.0.4/net/ipv4/inetpeer.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/inetpeer.c    2011-08-23 21:48:14.000000000 -0400
 @@ -481,6 +481,8 @@ struct inet_peer *inet_getpeer(struct in
        unsigned int sequence;
        int invalidated, newrefcnt = 0;
@@ -65388,9 +68166,9 @@ diff -urNp linux-3.0.3/net/ipv4/inetpeer.c linux-3.0.3/net/ipv4/inetpeer.c
                p->tcp_ts_stamp = 0;
                p->metrics[RTAX_LOCK-1] = INETPEER_METRICS_NEW;
                p->rate_tokens = 0;
-diff -urNp linux-3.0.3/net/ipv4/ip_fragment.c linux-3.0.3/net/ipv4/ip_fragment.c
---- linux-3.0.3/net/ipv4/ip_fragment.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/ip_fragment.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/ip_fragment.c linux-3.0.4/net/ipv4/ip_fragment.c
+--- linux-3.0.4/net/ipv4/ip_fragment.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/ip_fragment.c 2011-08-23 21:47:56.000000000 -0400
 @@ -315,7 +315,7 @@ static inline int ip_frag_too_far(struct
                return 0;
  
@@ -65400,9 +68178,9 @@ diff -urNp linux-3.0.3/net/ipv4/ip_fragment.c linux-3.0.3/net/ipv4/ip_fragment.c
        qp->rid = end;
  
        rc = qp->q.fragments && (end - start) > max;
-diff -urNp linux-3.0.3/net/ipv4/ip_sockglue.c linux-3.0.3/net/ipv4/ip_sockglue.c
---- linux-3.0.3/net/ipv4/ip_sockglue.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/ip_sockglue.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/ip_sockglue.c linux-3.0.4/net/ipv4/ip_sockglue.c
+--- linux-3.0.4/net/ipv4/ip_sockglue.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/ip_sockglue.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1073,6 +1073,8 @@ static int do_ip_getsockopt(struct sock 
        int val;
        int len;
@@ -65422,9 +68200,9 @@ diff -urNp linux-3.0.3/net/ipv4/ip_sockglue.c linux-3.0.3/net/ipv4/ip_sockglue.c
                        return -EFAULT;
                return 0;
        }
-diff -urNp linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c
---- linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c
+--- linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/netfilter/nf_nat_snmp_basic.c 2011-08-23 21:47:56.000000000 -0400
 @@ -399,7 +399,7 @@ static unsigned char asn1_octets_decode(
  
        *len = 0;
@@ -65434,9 +68212,9 @@ diff -urNp linux-3.0.3/net/ipv4/netfilter/nf_nat_snmp_basic.c linux-3.0.3/net/ip
        if (*octets == NULL) {
                if (net_ratelimit())
                        pr_notice("OOM in bsalg (%d)\n", __LINE__);
-diff -urNp linux-3.0.3/net/ipv4/ping.c linux-3.0.3/net/ipv4/ping.c
---- linux-3.0.3/net/ipv4/ping.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/ping.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/ping.c linux-3.0.4/net/ipv4/ping.c
+--- linux-3.0.4/net/ipv4/ping.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/ping.c        2011-08-23 21:47:56.000000000 -0400
 @@ -837,7 +837,7 @@ static void ping_format_sock(struct sock
                sk_rmem_alloc_get(sp),
                0, 0L, 0, sock_i_uid(sp), 0, sock_i_ino(sp),
@@ -65446,9 +68224,9 @@ diff -urNp linux-3.0.3/net/ipv4/ping.c linux-3.0.3/net/ipv4/ping.c
  }
  
  static int ping_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv4/raw.c linux-3.0.3/net/ipv4/raw.c
---- linux-3.0.3/net/ipv4/raw.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/raw.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/raw.c linux-3.0.4/net/ipv4/raw.c
+--- linux-3.0.4/net/ipv4/raw.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/raw.c 2011-08-23 21:48:14.000000000 -0400
 @@ -302,7 +302,7 @@ static int raw_rcv_skb(struct sock * sk,
  int raw_rcv(struct sock *sk, struct sk_buff *skb)
  {
@@ -65507,9 +68285,9 @@ diff -urNp linux-3.0.3/net/ipv4/raw.c linux-3.0.3/net/ipv4/raw.c
  }
  
  static int raw_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv4/route.c linux-3.0.3/net/ipv4/route.c
---- linux-3.0.3/net/ipv4/route.c       2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/route.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/route.c linux-3.0.4/net/ipv4/route.c
+--- linux-3.0.4/net/ipv4/route.c       2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/route.c       2011-08-23 21:47:56.000000000 -0400
 @@ -304,7 +304,7 @@ static inline unsigned int rt_hash(__be3
  
  static inline int rt_genid(struct net *net)
@@ -65537,9 +68315,9 @@ diff -urNp linux-3.0.3/net/ipv4/route.c linux-3.0.3/net/ipv4/route.c
                if (peer->tcp_ts_stamp) {
                        ts = peer->tcp_ts;
                        tsage = get_seconds() - peer->tcp_ts_stamp;
-diff -urNp linux-3.0.3/net/ipv4/tcp.c linux-3.0.3/net/ipv4/tcp.c
---- linux-3.0.3/net/ipv4/tcp.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp.c linux-3.0.4/net/ipv4/tcp.c
+--- linux-3.0.4/net/ipv4/tcp.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp.c 2011-08-23 21:48:14.000000000 -0400
 @@ -2122,6 +2122,8 @@ static int do_tcp_setsockopt(struct sock
        int val;
        int err = 0;
@@ -65558,9 +68336,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp.c linux-3.0.3/net/ipv4/tcp.c
        if (get_user(len, optlen))
                return -EFAULT;
  
-diff -urNp linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3/net/ipv4/tcp_ipv4.c
---- linux-3.0.3/net/ipv4/tcp_ipv4.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_ipv4.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_ipv4.c linux-3.0.4/net/ipv4/tcp_ipv4.c
+--- linux-3.0.4/net/ipv4/tcp_ipv4.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_ipv4.c    2011-08-23 21:48:14.000000000 -0400
 @@ -87,6 +87,9 @@ int sysctl_tcp_tw_reuse __read_mostly;
  int sysctl_tcp_low_latency __read_mostly;
  EXPORT_SYMBOL(sysctl_tcp_low_latency);
@@ -65656,9 +68434,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3/net/ipv4/tcp_ipv4.c
  }
  
  #define TMPSZ 150
-diff -urNp linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3/net/ipv4/tcp_minisocks.c
---- linux-3.0.3/net/ipv4/tcp_minisocks.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_minisocks.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_minisocks.c linux-3.0.4/net/ipv4/tcp_minisocks.c
+--- linux-3.0.4/net/ipv4/tcp_minisocks.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_minisocks.c       2011-08-23 21:48:14.000000000 -0400
 @@ -27,6 +27,10 @@
  #include <net/inet_common.h>
  #include <net/xfrm.h>
@@ -65681,9 +68459,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3/net/ipv4/tcp_minisoc
        if (!(flg & TCP_FLAG_RST))
                req->rsk_ops->send_reset(sk, skb);
  
-diff -urNp linux-3.0.3/net/ipv4/tcp_output.c linux-3.0.3/net/ipv4/tcp_output.c
---- linux-3.0.3/net/ipv4/tcp_output.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_output.c  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_output.c linux-3.0.4/net/ipv4/tcp_output.c
+--- linux-3.0.4/net/ipv4/tcp_output.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_output.c  2011-08-23 21:48:14.000000000 -0400
 @@ -2421,6 +2421,8 @@ struct sk_buff *tcp_make_synack(struct s
        int mss;
        int s_data_desired = 0;
@@ -65693,9 +68471,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_output.c linux-3.0.3/net/ipv4/tcp_output.c
        if (cvp != NULL && cvp->s_data_constant && cvp->s_data_desired)
                s_data_desired = cvp->s_data_desired;
        skb = sock_wmalloc(sk, MAX_TCP_HEADER + 15 + s_data_desired, 1, GFP_ATOMIC);
-diff -urNp linux-3.0.3/net/ipv4/tcp_probe.c linux-3.0.3/net/ipv4/tcp_probe.c
---- linux-3.0.3/net/ipv4/tcp_probe.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_probe.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_probe.c linux-3.0.4/net/ipv4/tcp_probe.c
+--- linux-3.0.4/net/ipv4/tcp_probe.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_probe.c   2011-08-23 21:47:56.000000000 -0400
 @@ -202,7 +202,7 @@ static ssize_t tcpprobe_read(struct file
                if (cnt + width >= len)
                        break;
@@ -65705,9 +68483,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_probe.c linux-3.0.3/net/ipv4/tcp_probe.c
                        return -EFAULT;
                cnt += width;
        }
-diff -urNp linux-3.0.3/net/ipv4/tcp_timer.c linux-3.0.3/net/ipv4/tcp_timer.c
---- linux-3.0.3/net/ipv4/tcp_timer.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/tcp_timer.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/tcp_timer.c linux-3.0.4/net/ipv4/tcp_timer.c
+--- linux-3.0.4/net/ipv4/tcp_timer.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/tcp_timer.c   2011-08-23 21:48:14.000000000 -0400
 @@ -22,6 +22,10 @@
  #include <linux/gfp.h>
  #include <net/tcp.h>
@@ -65733,9 +68511,9 @@ diff -urNp linux-3.0.3/net/ipv4/tcp_timer.c linux-3.0.3/net/ipv4/tcp_timer.c
        if (retransmits_timed_out(sk, retry_until,
                                  syn_set ? 0 : icsk->icsk_user_timeout, syn_set)) {
                /* Has it gone just too far? */
-diff -urNp linux-3.0.3/net/ipv4/udp.c linux-3.0.3/net/ipv4/udp.c
---- linux-3.0.3/net/ipv4/udp.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv4/udp.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv4/udp.c linux-3.0.4/net/ipv4/udp.c
+--- linux-3.0.4/net/ipv4/udp.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv4/udp.c 2011-08-23 21:48:14.000000000 -0400
 @@ -86,6 +86,7 @@
  #include <linux/types.h>
  #include <linux/fcntl.h>
@@ -65848,9 +68626,9 @@ diff -urNp linux-3.0.3/net/ipv4/udp.c linux-3.0.3/net/ipv4/udp.c
  }
  
  int udp4_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv6/inet6_connection_sock.c linux-3.0.3/net/ipv6/inet6_connection_sock.c
---- linux-3.0.3/net/ipv6/inet6_connection_sock.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv6/inet6_connection_sock.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/inet6_connection_sock.c linux-3.0.4/net/ipv6/inet6_connection_sock.c
+--- linux-3.0.4/net/ipv6/inet6_connection_sock.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv6/inet6_connection_sock.c       2011-08-23 21:47:56.000000000 -0400
 @@ -178,7 +178,7 @@ void __inet6_csk_dst_store(struct sock *
  #ifdef CONFIG_XFRM
        {
@@ -65869,9 +68647,9 @@ diff -urNp linux-3.0.3/net/ipv6/inet6_connection_sock.c linux-3.0.3/net/ipv6/ine
                        __sk_dst_reset(sk);
                        dst = NULL;
                }
-diff -urNp linux-3.0.3/net/ipv6/ipv6_sockglue.c linux-3.0.3/net/ipv6/ipv6_sockglue.c
---- linux-3.0.3/net/ipv6/ipv6_sockglue.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv6/ipv6_sockglue.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/ipv6_sockglue.c linux-3.0.4/net/ipv6/ipv6_sockglue.c
+--- linux-3.0.4/net/ipv6/ipv6_sockglue.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv6/ipv6_sockglue.c       2011-08-23 21:48:14.000000000 -0400
 @@ -129,6 +129,8 @@ static int do_ipv6_setsockopt(struct soc
        int val, valbool;
        int retv = -ENOPROTOOPT;
@@ -65890,9 +68668,9 @@ diff -urNp linux-3.0.3/net/ipv6/ipv6_sockglue.c linux-3.0.3/net/ipv6/ipv6_sockgl
        if (ip6_mroute_opt(optname))
                return ip6_mroute_getsockopt(sk, optname, optval, optlen);
  
-diff -urNp linux-3.0.3/net/ipv6/raw.c linux-3.0.3/net/ipv6/raw.c
---- linux-3.0.3/net/ipv6/raw.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/ipv6/raw.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/raw.c linux-3.0.4/net/ipv6/raw.c
+--- linux-3.0.4/net/ipv6/raw.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/ipv6/raw.c 2011-08-23 21:48:14.000000000 -0400
 @@ -376,7 +376,7 @@ static inline int rawv6_rcv_skb(struct s
  {
        if ((raw6_sk(sk)->checksum || rcu_dereference_raw(sk->sk_filter)) &&
@@ -65988,9 +68766,9 @@ diff -urNp linux-3.0.3/net/ipv6/raw.c linux-3.0.3/net/ipv6/raw.c
  }
  
  static int raw6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3/net/ipv6/tcp_ipv6.c
---- linux-3.0.3/net/ipv6/tcp_ipv6.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv6/tcp_ipv6.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/tcp_ipv6.c linux-3.0.4/net/ipv6/tcp_ipv6.c
+--- linux-3.0.4/net/ipv6/tcp_ipv6.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv6/tcp_ipv6.c    2011-08-23 21:48:14.000000000 -0400
 @@ -93,6 +93,10 @@ static struct tcp_md5sig_key *tcp_v6_md5
  }
  #endif
@@ -66090,9 +68868,9 @@ diff -urNp linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3/net/ipv6/tcp_ipv6.c
  }
  
  static int tcp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/ipv6/udp.c linux-3.0.3/net/ipv6/udp.c
---- linux-3.0.3/net/ipv6/udp.c 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/ipv6/udp.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/ipv6/udp.c linux-3.0.4/net/ipv6/udp.c
+--- linux-3.0.4/net/ipv6/udp.c 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/ipv6/udp.c 2011-08-23 21:48:14.000000000 -0400
 @@ -50,6 +50,10 @@
  #include <linux/seq_file.h>
  #include "udp_impl.h"
@@ -66157,9 +68935,9 @@ diff -urNp linux-3.0.3/net/ipv6/udp.c linux-3.0.3/net/ipv6/udp.c
  }
  
  int udp6_seq_show(struct seq_file *seq, void *v)
-diff -urNp linux-3.0.3/net/irda/ircomm/ircomm_tty.c linux-3.0.3/net/irda/ircomm/ircomm_tty.c
---- linux-3.0.3/net/irda/ircomm/ircomm_tty.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/irda/ircomm/ircomm_tty.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/irda/ircomm/ircomm_tty.c linux-3.0.4/net/irda/ircomm/ircomm_tty.c
+--- linux-3.0.4/net/irda/ircomm/ircomm_tty.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/irda/ircomm/ircomm_tty.c   2011-08-23 21:47:56.000000000 -0400
 @@ -282,16 +282,16 @@ static int ircomm_tty_block_til_ready(st
        add_wait_queue(&self->open_wait, &wait);
  
@@ -66282,9 +69060,9 @@ diff -urNp linux-3.0.3/net/irda/ircomm/ircomm_tty.c linux-3.0.3/net/irda/ircomm/
        seq_printf(m, "Max data size: %d\n", self->max_data_size);
        seq_printf(m, "Max header size: %d\n", self->max_header_size);
  
-diff -urNp linux-3.0.3/net/iucv/af_iucv.c linux-3.0.3/net/iucv/af_iucv.c
---- linux-3.0.3/net/iucv/af_iucv.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/iucv/af_iucv.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/iucv/af_iucv.c linux-3.0.4/net/iucv/af_iucv.c
+--- linux-3.0.4/net/iucv/af_iucv.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/iucv/af_iucv.c     2011-08-23 21:47:56.000000000 -0400
 @@ -648,10 +648,10 @@ static int iucv_sock_autobind(struct soc
  
        write_lock_bh(&iucv_sk_list.lock);
@@ -66298,9 +69076,9 @@ diff -urNp linux-3.0.3/net/iucv/af_iucv.c linux-3.0.3/net/iucv/af_iucv.c
        }
  
        write_unlock_bh(&iucv_sk_list.lock);
-diff -urNp linux-3.0.3/net/key/af_key.c linux-3.0.3/net/key/af_key.c
---- linux-3.0.3/net/key/af_key.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/key/af_key.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/key/af_key.c linux-3.0.4/net/key/af_key.c
+--- linux-3.0.4/net/key/af_key.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/key/af_key.c       2011-08-23 21:48:14.000000000 -0400
 @@ -2481,6 +2481,8 @@ static int pfkey_migrate(struct sock *sk
        struct xfrm_migrate m[XFRM_MAX_DEPTH];
        struct xfrm_kmaddress k;
@@ -66323,9 +69101,9 @@ diff -urNp linux-3.0.3/net/key/af_key.c linux-3.0.3/net/key/af_key.c
        } while (!res);
        return res;
  }
-diff -urNp linux-3.0.3/net/lapb/lapb_iface.c linux-3.0.3/net/lapb/lapb_iface.c
---- linux-3.0.3/net/lapb/lapb_iface.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/lapb/lapb_iface.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/lapb/lapb_iface.c linux-3.0.4/net/lapb/lapb_iface.c
+--- linux-3.0.4/net/lapb/lapb_iface.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/lapb/lapb_iface.c  2011-08-23 21:47:56.000000000 -0400
 @@ -158,7 +158,7 @@ int lapb_register(struct net_device *dev
                goto out;
  
@@ -66389,9 +69167,9 @@ diff -urNp linux-3.0.3/net/lapb/lapb_iface.c linux-3.0.3/net/lapb/lapb_iface.c
                used = 1;
        }
  
-diff -urNp linux-3.0.3/net/mac80211/debugfs_sta.c linux-3.0.3/net/mac80211/debugfs_sta.c
---- linux-3.0.3/net/mac80211/debugfs_sta.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/debugfs_sta.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/debugfs_sta.c linux-3.0.4/net/mac80211/debugfs_sta.c
+--- linux-3.0.4/net/mac80211/debugfs_sta.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/debugfs_sta.c     2011-08-23 21:48:14.000000000 -0400
 @@ -140,6 +140,8 @@ static ssize_t sta_agg_status_read(struc
        struct tid_ampdu_rx *tid_rx;
        struct tid_ampdu_tx *tid_tx;
@@ -66410,9 +69188,9 @@ diff -urNp linux-3.0.3/net/mac80211/debugfs_sta.c linux-3.0.3/net/mac80211/debug
        p += scnprintf(p, sizeof(buf) + buf - p, "ht %ssupported\n",
                        htc->ht_supported ? "" : "not ");
        if (htc->ht_supported) {
-diff -urNp linux-3.0.3/net/mac80211/ieee80211_i.h linux-3.0.3/net/mac80211/ieee80211_i.h
---- linux-3.0.3/net/mac80211/ieee80211_i.h     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/ieee80211_i.h     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/ieee80211_i.h linux-3.0.4/net/mac80211/ieee80211_i.h
+--- linux-3.0.4/net/mac80211/ieee80211_i.h     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/ieee80211_i.h     2011-08-23 21:47:56.000000000 -0400
 @@ -27,6 +27,7 @@
  #include <net/ieee80211_radiotap.h>
  #include <net/cfg80211.h>
@@ -66430,9 +69208,9 @@ diff -urNp linux-3.0.3/net/mac80211/ieee80211_i.h linux-3.0.3/net/mac80211/ieee8
        int monitors, cooked_mntrs;
        /* number of interfaces with corresponding FIF_ flags */
        int fif_fcsfail, fif_plcpfail, fif_control, fif_other_bss, fif_pspoll,
-diff -urNp linux-3.0.3/net/mac80211/iface.c linux-3.0.3/net/mac80211/iface.c
---- linux-3.0.3/net/mac80211/iface.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/mac80211/iface.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/iface.c linux-3.0.4/net/mac80211/iface.c
+--- linux-3.0.4/net/mac80211/iface.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/mac80211/iface.c   2011-08-23 21:47:56.000000000 -0400
 @@ -211,7 +211,7 @@ static int ieee80211_do_open(struct net_
                break;
        }
@@ -66487,9 +69265,9 @@ diff -urNp linux-3.0.3/net/mac80211/iface.c linux-3.0.3/net/mac80211/iface.c
                if (local->ops->napi_poll)
                        napi_disable(&local->napi);
                ieee80211_clear_tx_pending(local);
-diff -urNp linux-3.0.3/net/mac80211/main.c linux-3.0.3/net/mac80211/main.c
---- linux-3.0.3/net/mac80211/main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/main.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/main.c linux-3.0.4/net/mac80211/main.c
+--- linux-3.0.4/net/mac80211/main.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/main.c    2011-08-23 21:47:56.000000000 -0400
 @@ -209,7 +209,7 @@ int ieee80211_hw_config(struct ieee80211
                local->hw.conf.power_level = power;
        }
@@ -66499,9 +69277,9 @@ diff -urNp linux-3.0.3/net/mac80211/main.c linux-3.0.3/net/mac80211/main.c
                ret = drv_config(local, changed);
                /*
                 * Goal:
-diff -urNp linux-3.0.3/net/mac80211/mlme.c linux-3.0.3/net/mac80211/mlme.c
---- linux-3.0.3/net/mac80211/mlme.c    2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/mac80211/mlme.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/mlme.c linux-3.0.4/net/mac80211/mlme.c
+--- linux-3.0.4/net/mac80211/mlme.c    2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/mac80211/mlme.c    2011-08-23 21:48:14.000000000 -0400
 @@ -1444,6 +1444,8 @@ static bool ieee80211_assoc_success(stru
        bool have_higher_than_11mbit = false;
        u16 ap_ht_cap_flags;
@@ -66511,9 +69289,9 @@ diff -urNp linux-3.0.3/net/mac80211/mlme.c linux-3.0.3/net/mac80211/mlme.c
        /* AssocResp and ReassocResp have identical structure */
  
        aid = le16_to_cpu(mgmt->u.assoc_resp.aid);
-diff -urNp linux-3.0.3/net/mac80211/pm.c linux-3.0.3/net/mac80211/pm.c
---- linux-3.0.3/net/mac80211/pm.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/pm.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/pm.c linux-3.0.4/net/mac80211/pm.c
+--- linux-3.0.4/net/mac80211/pm.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/pm.c      2011-08-23 21:47:56.000000000 -0400
 @@ -47,7 +47,7 @@ int __ieee80211_suspend(struct ieee80211
        cancel_work_sync(&local->dynamic_ps_enable_work);
        del_timer_sync(&local->dynamic_ps_timer);
@@ -66532,9 +69310,9 @@ diff -urNp linux-3.0.3/net/mac80211/pm.c linux-3.0.3/net/mac80211/pm.c
                ieee80211_stop_device(local);
  
   suspend:
-diff -urNp linux-3.0.3/net/mac80211/rate.c linux-3.0.3/net/mac80211/rate.c
---- linux-3.0.3/net/mac80211/rate.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/rate.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/rate.c linux-3.0.4/net/mac80211/rate.c
+--- linux-3.0.4/net/mac80211/rate.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/rate.c    2011-08-23 21:47:56.000000000 -0400
 @@ -371,7 +371,7 @@ int ieee80211_init_rate_ctrl_alg(struct 
  
        ASSERT_RTNL();
@@ -66544,9 +69322,9 @@ diff -urNp linux-3.0.3/net/mac80211/rate.c linux-3.0.3/net/mac80211/rate.c
                return -EBUSY;
  
        if (local->hw.flags & IEEE80211_HW_HAS_RATE_CONTROL) {
-diff -urNp linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c
---- linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c
+--- linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/rc80211_pid_debugfs.c     2011-08-23 21:47:56.000000000 -0400
 @@ -192,7 +192,7 @@ static ssize_t rate_control_pid_events_r
  
        spin_unlock_irqrestore(&events->lock, status);
@@ -66556,9 +69334,9 @@ diff -urNp linux-3.0.3/net/mac80211/rc80211_pid_debugfs.c linux-3.0.3/net/mac802
                return -EFAULT;
  
        return p;
-diff -urNp linux-3.0.3/net/mac80211/util.c linux-3.0.3/net/mac80211/util.c
---- linux-3.0.3/net/mac80211/util.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/mac80211/util.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/mac80211/util.c linux-3.0.4/net/mac80211/util.c
+--- linux-3.0.4/net/mac80211/util.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/mac80211/util.c    2011-08-23 21:47:56.000000000 -0400
 @@ -1147,7 +1147,7 @@ int ieee80211_reconfig(struct ieee80211_
  #endif
  
@@ -66568,9 +69346,9 @@ diff -urNp linux-3.0.3/net/mac80211/util.c linux-3.0.3/net/mac80211/util.c
                /*
                 * Upon resume hardware can sometimes be goofy due to
                 * various platform / driver / bus issues, so restarting
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_conn.c        2011-08-23 21:47:56.000000000 -0400
 @@ -556,7 +556,7 @@ ip_vs_bind_dest(struct ip_vs_conn *cp, s
        /* Increase the refcnt counter of the dest */
        atomic_inc(&dest->refcnt);
@@ -66598,9 +69376,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_conn.c linux-3.0.3/net/netfilter
        if (i > 8 || i < 0) return 0;
  
        if (!todrop_rate[i]) return 0;
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_core.c        2011-08-23 21:47:56.000000000 -0400
 @@ -563,7 +563,7 @@ int ip_vs_leave(struct ip_vs_service *sv
                ret = cp->packet_xmit(skb, cp, pd->pp);
                /* do not touch skb anymore */
@@ -66619,9 +69397,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_core.c linux-3.0.3/net/netfilter
  
        if ((ipvs->sync_state & IP_VS_STATE_MASTER) &&
            cp->protocol == IPPROTO_SCTP) {
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_ctl.c 2011-08-23 21:48:14.000000000 -0400
 @@ -782,7 +782,7 @@ __ip_vs_update_dest(struct ip_vs_service
                ip_vs_rs_hash(ipvs, dest);
                write_unlock_bh(&ipvs->rs_lock);
@@ -66676,9 +69454,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_ctl.c linux-3.0.3/net/netfilter/
        NLA_PUT_U32(skb, IPVS_DEST_ATTR_WEIGHT, atomic_read(&dest->weight));
        NLA_PUT_U32(skb, IPVS_DEST_ATTR_U_THRESH, dest->u_threshold);
        NLA_PUT_U32(skb, IPVS_DEST_ATTR_L_THRESH, dest->l_threshold);
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_sync.c        2011-08-23 21:47:56.000000000 -0400
 @@ -648,7 +648,7 @@ control:
         * i.e only increment in_pkts for Templates.
         */
@@ -66697,9 +69475,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_sync.c linux-3.0.3/net/netfilter
        cp->state = state;
        cp->old_state = cp->state;
        /*
-diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/ipvs/ip_vs_xmit.c        2011-08-23 21:47:56.000000000 -0400
 @@ -1151,7 +1151,7 @@ ip_vs_icmp_xmit(struct sk_buff *skb, str
                else
                        rc = NF_ACCEPT;
@@ -66718,9 +69496,9 @@ diff -urNp linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3/net/netfilter
                goto out;
        }
  
-diff -urNp linux-3.0.3/net/netfilter/Kconfig linux-3.0.3/net/netfilter/Kconfig
---- linux-3.0.3/net/netfilter/Kconfig  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/Kconfig  2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/Kconfig linux-3.0.4/net/netfilter/Kconfig
+--- linux-3.0.4/net/netfilter/Kconfig  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/Kconfig  2011-08-23 21:48:14.000000000 -0400
 @@ -781,6 +781,16 @@ config NETFILTER_XT_MATCH_ESP
  
          To compile it as a module, choose M here.  If unsure, say N.
@@ -66738,9 +69516,9 @@ diff -urNp linux-3.0.3/net/netfilter/Kconfig linux-3.0.3/net/netfilter/Kconfig
  config NETFILTER_XT_MATCH_HASHLIMIT
        tristate '"hashlimit" match support'
        depends on (IP6_NF_IPTABLES || IP6_NF_IPTABLES=n)
-diff -urNp linux-3.0.3/net/netfilter/Makefile linux-3.0.3/net/netfilter/Makefile
---- linux-3.0.3/net/netfilter/Makefile 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/Makefile 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/Makefile linux-3.0.4/net/netfilter/Makefile
+--- linux-3.0.4/net/netfilter/Makefile 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/Makefile 2011-08-23 21:48:14.000000000 -0400
 @@ -81,6 +81,7 @@ obj-$(CONFIG_NETFILTER_XT_MATCH_DCCP) +=
  obj-$(CONFIG_NETFILTER_XT_MATCH_DEVGROUP) += xt_devgroup.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_DSCP) += xt_dscp.o
@@ -66749,9 +69527,9 @@ diff -urNp linux-3.0.3/net/netfilter/Makefile linux-3.0.3/net/netfilter/Makefile
  obj-$(CONFIG_NETFILTER_XT_MATCH_HASHLIMIT) += xt_hashlimit.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HELPER) += xt_helper.o
  obj-$(CONFIG_NETFILTER_XT_MATCH_HL) += xt_hl.o
-diff -urNp linux-3.0.3/net/netfilter/nfnetlink_log.c linux-3.0.3/net/netfilter/nfnetlink_log.c
---- linux-3.0.3/net/netfilter/nfnetlink_log.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/nfnetlink_log.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/nfnetlink_log.c linux-3.0.4/net/netfilter/nfnetlink_log.c
+--- linux-3.0.4/net/netfilter/nfnetlink_log.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/nfnetlink_log.c  2011-08-23 21:47:56.000000000 -0400
 @@ -70,7 +70,7 @@ struct nfulnl_instance {
  };
  
@@ -66770,9 +69548,9 @@ diff -urNp linux-3.0.3/net/netfilter/nfnetlink_log.c linux-3.0.3/net/netfilter/n
  
        if (data_len) {
                struct nlattr *nla;
-diff -urNp linux-3.0.3/net/netfilter/nfnetlink_queue.c linux-3.0.3/net/netfilter/nfnetlink_queue.c
---- linux-3.0.3/net/netfilter/nfnetlink_queue.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/nfnetlink_queue.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/nfnetlink_queue.c linux-3.0.4/net/netfilter/nfnetlink_queue.c
+--- linux-3.0.4/net/netfilter/nfnetlink_queue.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/nfnetlink_queue.c        2011-08-23 21:47:56.000000000 -0400
 @@ -58,7 +58,7 @@ struct nfqnl_instance {
   */
        spinlock_t      lock;
@@ -66800,9 +69578,9 @@ diff -urNp linux-3.0.3/net/netfilter/nfnetlink_queue.c linux-3.0.3/net/netfilter
  }
  
  static const struct seq_operations nfqnl_seq_ops = {
-diff -urNp linux-3.0.3/net/netfilter/xt_gradm.c linux-3.0.3/net/netfilter/xt_gradm.c
---- linux-3.0.3/net/netfilter/xt_gradm.c       1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/net/netfilter/xt_gradm.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/xt_gradm.c linux-3.0.4/net/netfilter/xt_gradm.c
+--- linux-3.0.4/net/netfilter/xt_gradm.c       1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/net/netfilter/xt_gradm.c       2011-08-23 21:48:14.000000000 -0400
 @@ -0,0 +1,51 @@
 +/*
 + *    gradm match for netfilter
@@ -66855,9 +69633,9 @@ diff -urNp linux-3.0.3/net/netfilter/xt_gradm.c linux-3.0.3/net/netfilter/xt_gra
 +MODULE_LICENSE("GPL");
 +MODULE_ALIAS("ipt_gradm");
 +MODULE_ALIAS("ip6t_gradm");
-diff -urNp linux-3.0.3/net/netfilter/xt_statistic.c linux-3.0.3/net/netfilter/xt_statistic.c
---- linux-3.0.3/net/netfilter/xt_statistic.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netfilter/xt_statistic.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netfilter/xt_statistic.c linux-3.0.4/net/netfilter/xt_statistic.c
+--- linux-3.0.4/net/netfilter/xt_statistic.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netfilter/xt_statistic.c   2011-08-23 21:47:56.000000000 -0400
 @@ -18,7 +18,7 @@
  #include <linux/netfilter/x_tables.h>
  
@@ -66888,9 +69666,9 @@ diff -urNp linux-3.0.3/net/netfilter/xt_statistic.c linux-3.0.3/net/netfilter/xt
  
        return 0;
  }
-diff -urNp linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3/net/netlink/af_netlink.c
---- linux-3.0.3/net/netlink/af_netlink.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netlink/af_netlink.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/netlink/af_netlink.c linux-3.0.4/net/netlink/af_netlink.c
+--- linux-3.0.4/net/netlink/af_netlink.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netlink/af_netlink.c       2011-08-23 21:47:56.000000000 -0400
 @@ -742,7 +742,7 @@ static void netlink_overrun(struct sock 
                        sk->sk_error_report(sk);
                }
@@ -66909,9 +69687,9 @@ diff -urNp linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3/net/netlink/af_netli
                           sock_i_ino(s)
                        );
  
-diff -urNp linux-3.0.3/net/netrom/af_netrom.c linux-3.0.3/net/netrom/af_netrom.c
---- linux-3.0.3/net/netrom/af_netrom.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/netrom/af_netrom.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/netrom/af_netrom.c linux-3.0.4/net/netrom/af_netrom.c
+--- linux-3.0.4/net/netrom/af_netrom.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/netrom/af_netrom.c 2011-08-23 21:48:14.000000000 -0400
 @@ -839,6 +839,7 @@ static int nr_getname(struct socket *soc
        struct sock *sk = sock->sk;
        struct nr_sock *nr = nr_sk(sk);
@@ -66928,9 +69706,9 @@ diff -urNp linux-3.0.3/net/netrom/af_netrom.c linux-3.0.3/net/netrom/af_netrom.c
                sax->fsa_ax25.sax25_call   = nr->source_addr;
                *uaddr_len = sizeof(struct sockaddr_ax25);
        }
-diff -urNp linux-3.0.3/net/packet/af_packet.c linux-3.0.3/net/packet/af_packet.c
---- linux-3.0.3/net/packet/af_packet.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/packet/af_packet.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/packet/af_packet.c linux-3.0.4/net/packet/af_packet.c
+--- linux-3.0.4/net/packet/af_packet.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/packet/af_packet.c 2011-08-23 21:47:56.000000000 -0400
 @@ -647,14 +647,14 @@ static int packet_rcv(struct sk_buff *sk
  
        spin_lock(&sk->sk_receive_queue.lock);
@@ -66966,9 +69744,9 @@ diff -urNp linux-3.0.3/net/packet/af_packet.c linux-3.0.3/net/packet/af_packet.c
                return -EFAULT;
        return 0;
  }
-diff -urNp linux-3.0.3/net/phonet/af_phonet.c linux-3.0.3/net/phonet/af_phonet.c
---- linux-3.0.3/net/phonet/af_phonet.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/phonet/af_phonet.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/phonet/af_phonet.c linux-3.0.4/net/phonet/af_phonet.c
+--- linux-3.0.4/net/phonet/af_phonet.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/phonet/af_phonet.c 2011-08-23 21:48:14.000000000 -0400
 @@ -41,7 +41,7 @@ static struct phonet_protocol *phonet_pr
  {
        struct phonet_protocol *pp;
@@ -66987,9 +69765,9 @@ diff -urNp linux-3.0.3/net/phonet/af_phonet.c linux-3.0.3/net/phonet/af_phonet.c
                return -EINVAL;
  
        err = proto_register(pp->prot, 1);
-diff -urNp linux-3.0.3/net/phonet/pep.c linux-3.0.3/net/phonet/pep.c
---- linux-3.0.3/net/phonet/pep.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/phonet/pep.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/phonet/pep.c linux-3.0.4/net/phonet/pep.c
+--- linux-3.0.4/net/phonet/pep.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/phonet/pep.c       2011-08-23 21:47:56.000000000 -0400
 @@ -387,7 +387,7 @@ static int pipe_do_rcv(struct sock *sk, 
  
        case PNS_PEP_CTRL_REQ:
@@ -67017,9 +69795,9 @@ diff -urNp linux-3.0.3/net/phonet/pep.c linux-3.0.3/net/phonet/pep.c
                        err = NET_RX_DROP;
                        break;
                }
-diff -urNp linux-3.0.3/net/phonet/socket.c linux-3.0.3/net/phonet/socket.c
---- linux-3.0.3/net/phonet/socket.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/phonet/socket.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/phonet/socket.c linux-3.0.4/net/phonet/socket.c
+--- linux-3.0.4/net/phonet/socket.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/phonet/socket.c    2011-08-23 21:48:14.000000000 -0400
 @@ -612,8 +612,13 @@ static int pn_sock_seq_show(struct seq_f
                        pn->resource, sk->sk_state,
                        sk_wmem_alloc_get(sk), sk_rmem_alloc_get(sk),
@@ -67036,9 +69814,9 @@ diff -urNp linux-3.0.3/net/phonet/socket.c linux-3.0.3/net/phonet/socket.c
        }
        seq_printf(seq, "%*s\n", 127 - len, "");
        return 0;
-diff -urNp linux-3.0.3/net/rds/cong.c linux-3.0.3/net/rds/cong.c
---- linux-3.0.3/net/rds/cong.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/cong.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/cong.c linux-3.0.4/net/rds/cong.c
+--- linux-3.0.4/net/rds/cong.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/cong.c 2011-08-23 21:47:56.000000000 -0400
 @@ -77,7 +77,7 @@
   * finds that the saved generation number is smaller than the global generation
   * number, it wakes up the process.
@@ -67066,9 +69844,9 @@ diff -urNp linux-3.0.3/net/rds/cong.c linux-3.0.3/net/rds/cong.c
  
        if (likely(*recent == gen))
                return 0;
-diff -urNp linux-3.0.3/net/rds/ib_cm.c linux-3.0.3/net/rds/ib_cm.c
---- linux-3.0.3/net/rds/ib_cm.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/ib_cm.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/ib_cm.c linux-3.0.4/net/rds/ib_cm.c
+--- linux-3.0.4/net/rds/ib_cm.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/ib_cm.c        2011-08-23 21:47:56.000000000 -0400
 @@ -720,7 +720,7 @@ void rds_ib_conn_shutdown(struct rds_con
        /* Clear the ACK state */
        clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
@@ -67078,9 +69856,9 @@ diff -urNp linux-3.0.3/net/rds/ib_cm.c linux-3.0.3/net/rds/ib_cm.c
  #else
        ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.3/net/rds/ib.h linux-3.0.3/net/rds/ib.h
---- linux-3.0.3/net/rds/ib.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/ib.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/ib.h linux-3.0.4/net/rds/ib.h
+--- linux-3.0.4/net/rds/ib.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/ib.h   2011-08-23 21:47:56.000000000 -0400
 @@ -127,7 +127,7 @@ struct rds_ib_connection {
        /* sending acks */
        unsigned long           i_ack_flags;
@@ -67090,9 +69868,9 @@ diff -urNp linux-3.0.3/net/rds/ib.h linux-3.0.3/net/rds/ib.h
  #else
        spinlock_t              i_ack_lock;     /* protect i_ack_next */
        u64                     i_ack_next;     /* next ACK to send */
-diff -urNp linux-3.0.3/net/rds/ib_recv.c linux-3.0.3/net/rds/ib_recv.c
---- linux-3.0.3/net/rds/ib_recv.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/ib_recv.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/ib_recv.c linux-3.0.4/net/rds/ib_recv.c
+--- linux-3.0.4/net/rds/ib_recv.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/ib_recv.c      2011-08-23 21:47:56.000000000 -0400
 @@ -592,7 +592,7 @@ static u64 rds_ib_get_ack(struct rds_ib_
  static void rds_ib_set_ack(struct rds_ib_connection *ic, u64 seq,
                                int ack_required)
@@ -67111,9 +69889,9 @@ diff -urNp linux-3.0.3/net/rds/ib_recv.c linux-3.0.3/net/rds/ib_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.3/net/rds/iw_cm.c linux-3.0.3/net/rds/iw_cm.c
---- linux-3.0.3/net/rds/iw_cm.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw_cm.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw_cm.c linux-3.0.4/net/rds/iw_cm.c
+--- linux-3.0.4/net/rds/iw_cm.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw_cm.c        2011-08-23 21:47:56.000000000 -0400
 @@ -664,7 +664,7 @@ void rds_iw_conn_shutdown(struct rds_con
        /* Clear the ACK state */
        clear_bit(IB_ACK_IN_FLIGHT, &ic->i_ack_flags);
@@ -67123,9 +69901,9 @@ diff -urNp linux-3.0.3/net/rds/iw_cm.c linux-3.0.3/net/rds/iw_cm.c
  #else
        ic->i_ack_next = 0;
  #endif
-diff -urNp linux-3.0.3/net/rds/iw.h linux-3.0.3/net/rds/iw.h
---- linux-3.0.3/net/rds/iw.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw.h linux-3.0.4/net/rds/iw.h
+--- linux-3.0.4/net/rds/iw.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw.h   2011-08-23 21:47:56.000000000 -0400
 @@ -133,7 +133,7 @@ struct rds_iw_connection {
        /* sending acks */
        unsigned long           i_ack_flags;
@@ -67135,9 +69913,9 @@ diff -urNp linux-3.0.3/net/rds/iw.h linux-3.0.3/net/rds/iw.h
  #else
        spinlock_t              i_ack_lock;     /* protect i_ack_next */
        u64                     i_ack_next;     /* next ACK to send */
-diff -urNp linux-3.0.3/net/rds/iw_rdma.c linux-3.0.3/net/rds/iw_rdma.c
---- linux-3.0.3/net/rds/iw_rdma.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw_rdma.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw_rdma.c linux-3.0.4/net/rds/iw_rdma.c
+--- linux-3.0.4/net/rds/iw_rdma.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw_rdma.c      2011-08-23 21:48:14.000000000 -0400
 @@ -182,6 +182,8 @@ int rds_iw_update_cm_id(struct rds_iw_de
        struct rdma_cm_id *pcm_id;
        int rc;
@@ -67147,9 +69925,9 @@ diff -urNp linux-3.0.3/net/rds/iw_rdma.c linux-3.0.3/net/rds/iw_rdma.c
        src_addr = (struct sockaddr_in *)&cm_id->route.addr.src_addr;
        dst_addr = (struct sockaddr_in *)&cm_id->route.addr.dst_addr;
  
-diff -urNp linux-3.0.3/net/rds/iw_recv.c linux-3.0.3/net/rds/iw_recv.c
---- linux-3.0.3/net/rds/iw_recv.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rds/iw_recv.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rds/iw_recv.c linux-3.0.4/net/rds/iw_recv.c
+--- linux-3.0.4/net/rds/iw_recv.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rds/iw_recv.c      2011-08-23 21:47:56.000000000 -0400
 @@ -427,7 +427,7 @@ static u64 rds_iw_get_ack(struct rds_iw_
  static void rds_iw_set_ack(struct rds_iw_connection *ic, u64 seq,
                                int ack_required)
@@ -67168,9 +69946,9 @@ diff -urNp linux-3.0.3/net/rds/iw_recv.c linux-3.0.3/net/rds/iw_recv.c
  }
  #endif
  
-diff -urNp linux-3.0.3/net/rxrpc/af_rxrpc.c linux-3.0.3/net/rxrpc/af_rxrpc.c
---- linux-3.0.3/net/rxrpc/af_rxrpc.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/af_rxrpc.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/af_rxrpc.c linux-3.0.4/net/rxrpc/af_rxrpc.c
+--- linux-3.0.4/net/rxrpc/af_rxrpc.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/af_rxrpc.c   2011-08-23 21:47:56.000000000 -0400
 @@ -39,7 +39,7 @@ static const struct proto_ops rxrpc_rpc_
  __be32 rxrpc_epoch;
  
@@ -67180,9 +69958,9 @@ diff -urNp linux-3.0.3/net/rxrpc/af_rxrpc.c linux-3.0.3/net/rxrpc/af_rxrpc.c
  
  /* count of skbs currently in use */
  atomic_t rxrpc_n_skbs;
-diff -urNp linux-3.0.3/net/rxrpc/ar-ack.c linux-3.0.3/net/rxrpc/ar-ack.c
---- linux-3.0.3/net/rxrpc/ar-ack.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-ack.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-ack.c linux-3.0.4/net/rxrpc/ar-ack.c
+--- linux-3.0.4/net/rxrpc/ar-ack.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-ack.c     2011-08-23 21:48:14.000000000 -0400
 @@ -175,7 +175,7 @@ static void rxrpc_resend(struct rxrpc_ca
  
        _enter("{%d,%d,%d,%d},",
@@ -67255,9 +70033,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-ack.c linux-3.0.3/net/rxrpc/ar-ack.c
        _proto("Tx %s %%%u", rxrpc_pkts[hdr.type], ntohl(hdr.serial));
  send_message_2:
  
-diff -urNp linux-3.0.3/net/rxrpc/ar-call.c linux-3.0.3/net/rxrpc/ar-call.c
---- linux-3.0.3/net/rxrpc/ar-call.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-call.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-call.c linux-3.0.4/net/rxrpc/ar-call.c
+--- linux-3.0.4/net/rxrpc/ar-call.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-call.c    2011-08-23 21:47:56.000000000 -0400
 @@ -83,7 +83,7 @@ static struct rxrpc_call *rxrpc_alloc_ca
        spin_lock_init(&call->lock);
        rwlock_init(&call->state_lock);
@@ -67267,9 +70045,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-call.c linux-3.0.3/net/rxrpc/ar-call.c
        call->state = RXRPC_CALL_CLIENT_SEND_REQUEST;
  
        memset(&call->sock_node, 0xed, sizeof(call->sock_node));
-diff -urNp linux-3.0.3/net/rxrpc/ar-connection.c linux-3.0.3/net/rxrpc/ar-connection.c
---- linux-3.0.3/net/rxrpc/ar-connection.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-connection.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-connection.c linux-3.0.4/net/rxrpc/ar-connection.c
+--- linux-3.0.4/net/rxrpc/ar-connection.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-connection.c      2011-08-23 21:47:56.000000000 -0400
 @@ -206,7 +206,7 @@ static struct rxrpc_connection *rxrpc_al
                rwlock_init(&conn->lock);
                spin_lock_init(&conn->state_lock);
@@ -67279,9 +70057,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-connection.c linux-3.0.3/net/rxrpc/ar-connec
                conn->avail_calls = RXRPC_MAXCALLS;
                conn->size_align = 4;
                conn->header_size = sizeof(struct rxrpc_header);
-diff -urNp linux-3.0.3/net/rxrpc/ar-connevent.c linux-3.0.3/net/rxrpc/ar-connevent.c
---- linux-3.0.3/net/rxrpc/ar-connevent.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-connevent.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-connevent.c linux-3.0.4/net/rxrpc/ar-connevent.c
+--- linux-3.0.4/net/rxrpc/ar-connevent.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-connevent.c       2011-08-23 21:47:56.000000000 -0400
 @@ -109,7 +109,7 @@ static int rxrpc_abort_connection(struct
  
        len = iov[0].iov_len + iov[1].iov_len;
@@ -67291,9 +70069,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-connevent.c linux-3.0.3/net/rxrpc/ar-conneve
        _proto("Tx CONN ABORT %%%u { %d }", ntohl(hdr.serial), abort_code);
  
        ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 2, len);
-diff -urNp linux-3.0.3/net/rxrpc/ar-input.c linux-3.0.3/net/rxrpc/ar-input.c
---- linux-3.0.3/net/rxrpc/ar-input.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-input.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-input.c linux-3.0.4/net/rxrpc/ar-input.c
+--- linux-3.0.4/net/rxrpc/ar-input.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-input.c   2011-08-23 21:47:56.000000000 -0400
 @@ -340,9 +340,9 @@ void rxrpc_fast_process_packet(struct rx
        /* track the latest serial number on this connection for ACK packet
         * information */
@@ -67306,9 +70084,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-input.c linux-3.0.3/net/rxrpc/ar-input.c
                                           serial);
  
        /* request ACK generation for any ACK or DATA packet that requests
-diff -urNp linux-3.0.3/net/rxrpc/ar-internal.h linux-3.0.3/net/rxrpc/ar-internal.h
---- linux-3.0.3/net/rxrpc/ar-internal.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-internal.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-internal.h linux-3.0.4/net/rxrpc/ar-internal.h
+--- linux-3.0.4/net/rxrpc/ar-internal.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-internal.h        2011-08-23 21:47:56.000000000 -0400
 @@ -272,8 +272,8 @@ struct rxrpc_connection {
        int                     error;          /* error code for local abort */
        int                     debug_id;       /* debug ID for printks */
@@ -67338,9 +70116,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-internal.h linux-3.0.3/net/rxrpc/ar-internal
  extern struct workqueue_struct *rxrpc_workqueue;
  
  /*
-diff -urNp linux-3.0.3/net/rxrpc/ar-local.c linux-3.0.3/net/rxrpc/ar-local.c
---- linux-3.0.3/net/rxrpc/ar-local.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-local.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-local.c linux-3.0.4/net/rxrpc/ar-local.c
+--- linux-3.0.4/net/rxrpc/ar-local.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-local.c   2011-08-23 21:47:56.000000000 -0400
 @@ -45,7 +45,7 @@ struct rxrpc_local *rxrpc_alloc_local(st
                spin_lock_init(&local->lock);
                rwlock_init(&local->services_lock);
@@ -67350,9 +70128,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-local.c linux-3.0.3/net/rxrpc/ar-local.c
                memcpy(&local->srx, srx, sizeof(*srx));
        }
  
-diff -urNp linux-3.0.3/net/rxrpc/ar-output.c linux-3.0.3/net/rxrpc/ar-output.c
---- linux-3.0.3/net/rxrpc/ar-output.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-output.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-output.c linux-3.0.4/net/rxrpc/ar-output.c
+--- linux-3.0.4/net/rxrpc/ar-output.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-output.c  2011-08-23 21:47:56.000000000 -0400
 @@ -681,9 +681,9 @@ static int rxrpc_send_data(struct kiocb 
                        sp->hdr.cid = call->cid;
                        sp->hdr.callNumber = call->call_id;
@@ -67365,9 +70143,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-output.c linux-3.0.3/net/rxrpc/ar-output.c
                        sp->hdr.type = RXRPC_PACKET_TYPE_DATA;
                        sp->hdr.userStatus = 0;
                        sp->hdr.securityIndex = conn->security_ix;
-diff -urNp linux-3.0.3/net/rxrpc/ar-peer.c linux-3.0.3/net/rxrpc/ar-peer.c
---- linux-3.0.3/net/rxrpc/ar-peer.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-peer.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-peer.c linux-3.0.4/net/rxrpc/ar-peer.c
+--- linux-3.0.4/net/rxrpc/ar-peer.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-peer.c    2011-08-23 21:47:56.000000000 -0400
 @@ -72,7 +72,7 @@ static struct rxrpc_peer *rxrpc_alloc_pe
                INIT_LIST_HEAD(&peer->error_targets);
                spin_lock_init(&peer->lock);
@@ -67377,9 +70155,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-peer.c linux-3.0.3/net/rxrpc/ar-peer.c
                memcpy(&peer->srx, srx, sizeof(*srx));
  
                rxrpc_assess_MTU_size(peer);
-diff -urNp linux-3.0.3/net/rxrpc/ar-proc.c linux-3.0.3/net/rxrpc/ar-proc.c
---- linux-3.0.3/net/rxrpc/ar-proc.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-proc.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-proc.c linux-3.0.4/net/rxrpc/ar-proc.c
+--- linux-3.0.4/net/rxrpc/ar-proc.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-proc.c    2011-08-23 21:47:56.000000000 -0400
 @@ -164,8 +164,8 @@ static int rxrpc_connection_seq_show(str
                   atomic_read(&conn->usage),
                   rxrpc_conn_states[conn->state],
@@ -67391,9 +70169,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-proc.c linux-3.0.3/net/rxrpc/ar-proc.c
  
        return 0;
  }
-diff -urNp linux-3.0.3/net/rxrpc/ar-transport.c linux-3.0.3/net/rxrpc/ar-transport.c
---- linux-3.0.3/net/rxrpc/ar-transport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/ar-transport.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/ar-transport.c linux-3.0.4/net/rxrpc/ar-transport.c
+--- linux-3.0.4/net/rxrpc/ar-transport.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/ar-transport.c       2011-08-23 21:47:56.000000000 -0400
 @@ -47,7 +47,7 @@ static struct rxrpc_transport *rxrpc_all
                spin_lock_init(&trans->client_lock);
                rwlock_init(&trans->conn_lock);
@@ -67403,9 +70181,9 @@ diff -urNp linux-3.0.3/net/rxrpc/ar-transport.c linux-3.0.3/net/rxrpc/ar-transpo
  
                if (peer->srx.transport.family == AF_INET) {
                        switch (peer->srx.transport_type) {
-diff -urNp linux-3.0.3/net/rxrpc/rxkad.c linux-3.0.3/net/rxrpc/rxkad.c
---- linux-3.0.3/net/rxrpc/rxkad.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/rxrpc/rxkad.c      2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/rxrpc/rxkad.c linux-3.0.4/net/rxrpc/rxkad.c
+--- linux-3.0.4/net/rxrpc/rxkad.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/rxrpc/rxkad.c      2011-08-23 21:48:14.000000000 -0400
 @@ -211,6 +211,8 @@ static int rxkad_secure_packet_encrypt(c
        u16 check;
        int nsg;
@@ -67442,9 +70220,9 @@ diff -urNp linux-3.0.3/net/rxrpc/rxkad.c linux-3.0.3/net/rxrpc/rxkad.c
        _proto("Tx RESPONSE %%%u", ntohl(hdr->serial));
  
        ret = kernel_sendmsg(conn->trans->local->socket, &msg, iov, 3, len);
-diff -urNp linux-3.0.3/net/sctp/proc.c linux-3.0.3/net/sctp/proc.c
---- linux-3.0.3/net/sctp/proc.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sctp/proc.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/sctp/proc.c linux-3.0.4/net/sctp/proc.c
+--- linux-3.0.4/net/sctp/proc.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sctp/proc.c        2011-08-23 21:48:14.000000000 -0400
 @@ -318,7 +318,8 @@ static int sctp_assocs_seq_show(struct s
                seq_printf(seq,
                           "%8pK %8pK %-3d %-3d %-2d %-4d "
@@ -67455,9 +70233,9 @@ diff -urNp linux-3.0.3/net/sctp/proc.c linux-3.0.3/net/sctp/proc.c
                           assoc->state, hash,
                           assoc->assoc_id,
                           assoc->sndbuf_used,
-diff -urNp linux-3.0.3/net/sctp/socket.c linux-3.0.3/net/sctp/socket.c
---- linux-3.0.3/net/sctp/socket.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sctp/socket.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sctp/socket.c linux-3.0.4/net/sctp/socket.c
+--- linux-3.0.4/net/sctp/socket.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sctp/socket.c      2011-08-23 21:47:56.000000000 -0400
 @@ -4452,7 +4452,7 @@ static int sctp_getsockopt_peer_addrs(st
                addrlen = sctp_get_af_specific(temp.sa.sa_family)->sockaddr_len;
                if (space_left < addrlen)
@@ -67467,9 +70245,9 @@ diff -urNp linux-3.0.3/net/sctp/socket.c linux-3.0.3/net/sctp/socket.c
                        return -EFAULT;
                to += addrlen;
                cnt++;
-diff -urNp linux-3.0.3/net/socket.c linux-3.0.3/net/socket.c
---- linux-3.0.3/net/socket.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/net/socket.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/socket.c linux-3.0.4/net/socket.c
+--- linux-3.0.4/net/socket.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/net/socket.c   2011-08-23 21:48:14.000000000 -0400
 @@ -88,6 +88,7 @@
  #include <linux/nsproxy.h>
  #include <linux/magic.h>
@@ -67629,9 +70407,9 @@ diff -urNp linux-3.0.3/net/socket.c linux-3.0.3/net/socket.c
        err = -EFAULT;
        if (MSG_CMSG_COMPAT & flags) {
                if (get_compat_msghdr(msg_sys, msg_compat))
-diff -urNp linux-3.0.3/net/sunrpc/sched.c linux-3.0.3/net/sunrpc/sched.c
---- linux-3.0.3/net/sunrpc/sched.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/sched.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/sched.c linux-3.0.4/net/sunrpc/sched.c
+--- linux-3.0.4/net/sunrpc/sched.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/sched.c     2011-08-23 21:47:56.000000000 -0400
 @@ -234,9 +234,9 @@ static int rpc_wait_bit_killable(void *w
  #ifdef RPC_DEBUG
  static void rpc_task_set_debuginfo(struct rpc_task *task)
@@ -67644,9 +70422,9 @@ diff -urNp linux-3.0.3/net/sunrpc/sched.c linux-3.0.3/net/sunrpc/sched.c
  }
  #else
  static inline void rpc_task_set_debuginfo(struct rpc_task *task)
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma.c 2011-08-23 21:47:56.000000000 -0400
 @@ -61,15 +61,15 @@ unsigned int svcrdma_max_req_size = RPCR
  static unsigned int min_max_inline = 4096;
  static unsigned int max_max_inline = 65536;
@@ -67754,9 +70532,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma.c linux-3.0.3/net/sunrpc/xpr
                .mode           = 0644,
                .proc_handler   = read_reset_stat,
        },
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c        2011-08-23 21:47:56.000000000 -0400
 @@ -499,7 +499,7 @@ next_sge:
                        svc_rdma_put_context(ctxt, 0);
                        goto out;
@@ -67784,9 +70562,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_recvfrom.c linux-3.0.3/net/s
  
        /* Build up the XDR from the receive buffers. */
        rdma_build_arg_xdr(rqstp, ctxt, ctxt->byte_len);
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_sendto.c  2011-08-23 21:47:56.000000000 -0400
 @@ -362,7 +362,7 @@ static int send_write(struct svcxprt_rdm
        write_wr.wr.rdma.remote_addr = to;
  
@@ -67796,9 +70574,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_sendto.c linux-3.0.3/net/sun
        if (svc_rdma_send(xprt, &write_wr))
                goto err;
        return 0;
-diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c
---- linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c
+--- linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sunrpc/xprtrdma/svc_rdma_transport.c       2011-08-23 21:47:56.000000000 -0400
 @@ -298,7 +298,7 @@ static void rq_cq_reap(struct svcxprt_rd
                return;
  
@@ -67844,9 +70622,9 @@ diff -urNp linux-3.0.3/net/sunrpc/xprtrdma/svc_rdma_transport.c linux-3.0.3/net/
  
                        /* See if we can opportunistically reap SQ WR to make room */
                        sq_cq_reap(xprt);
-diff -urNp linux-3.0.3/net/sysctl_net.c linux-3.0.3/net/sysctl_net.c
---- linux-3.0.3/net/sysctl_net.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/sysctl_net.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/sysctl_net.c linux-3.0.4/net/sysctl_net.c
+--- linux-3.0.4/net/sysctl_net.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/sysctl_net.c       2011-08-23 21:48:14.000000000 -0400
 @@ -46,7 +46,7 @@ static int net_ctl_permissions(struct ct
                               struct ctl_table *table)
  {
@@ -67856,9 +70634,9 @@ diff -urNp linux-3.0.3/net/sysctl_net.c linux-3.0.3/net/sysctl_net.c
                int mode = (table->mode >> 6) & 7;
                return (mode << 6) | (mode << 3) | mode;
        }
-diff -urNp linux-3.0.3/net/unix/af_unix.c linux-3.0.3/net/unix/af_unix.c
---- linux-3.0.3/net/unix/af_unix.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/unix/af_unix.c     2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/unix/af_unix.c linux-3.0.4/net/unix/af_unix.c
+--- linux-3.0.4/net/unix/af_unix.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/unix/af_unix.c     2011-08-23 21:48:14.000000000 -0400
 @@ -767,6 +767,12 @@ static struct sock *unix_find_other(stru
                err = -ECONNREFUSED;
                if (!S_ISSOCK(inode->i_mode))
@@ -67905,9 +70683,9 @@ diff -urNp linux-3.0.3/net/unix/af_unix.c linux-3.0.3/net/unix/af_unix.c
                mutex_unlock(&nd.path.dentry->d_inode->i_mutex);
                dput(nd.path.dentry);
                nd.path.dentry = dentry;
-diff -urNp linux-3.0.3/net/wireless/core.h linux-3.0.3/net/wireless/core.h
---- linux-3.0.3/net/wireless/core.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/wireless/core.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/wireless/core.h linux-3.0.4/net/wireless/core.h
+--- linux-3.0.4/net/wireless/core.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/wireless/core.h    2011-08-23 21:47:56.000000000 -0400
 @@ -27,7 +27,7 @@ struct cfg80211_registered_device {
        struct mutex mtx;
  
@@ -67917,9 +70695,9 @@ diff -urNp linux-3.0.3/net/wireless/core.h linux-3.0.3/net/wireless/core.h
        struct rfkill *rfkill;
        struct work_struct rfkill_sync;
  
-diff -urNp linux-3.0.3/net/wireless/wext-core.c linux-3.0.3/net/wireless/wext-core.c
---- linux-3.0.3/net/wireless/wext-core.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/wireless/wext-core.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/wireless/wext-core.c linux-3.0.4/net/wireless/wext-core.c
+--- linux-3.0.4/net/wireless/wext-core.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/wireless/wext-core.c       2011-08-23 21:47:56.000000000 -0400
 @@ -746,8 +746,7 @@ static int ioctl_standard_iw_point(struc
                 */
  
@@ -67953,9 +70731,9 @@ diff -urNp linux-3.0.3/net/wireless/wext-core.c linux-3.0.3/net/wireless/wext-co
        err = handler(dev, info, (union iwreq_data *) iwp, extra);
  
        iwp->length += essid_compat;
-diff -urNp linux-3.0.3/net/xfrm/xfrm_policy.c linux-3.0.3/net/xfrm/xfrm_policy.c
---- linux-3.0.3/net/xfrm/xfrm_policy.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/xfrm/xfrm_policy.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/net/xfrm/xfrm_policy.c linux-3.0.4/net/xfrm/xfrm_policy.c
+--- linux-3.0.4/net/xfrm/xfrm_policy.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/xfrm/xfrm_policy.c 2011-08-23 21:47:56.000000000 -0400
 @@ -299,7 +299,7 @@ static void xfrm_policy_kill(struct xfrm
  {
        policy->walk.dead = 1;
@@ -68028,9 +70806,9 @@ diff -urNp linux-3.0.3/net/xfrm/xfrm_policy.c linux-3.0.3/net/xfrm/xfrm_policy.c
                }
        }
  
-diff -urNp linux-3.0.3/net/xfrm/xfrm_user.c linux-3.0.3/net/xfrm/xfrm_user.c
---- linux-3.0.3/net/xfrm/xfrm_user.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/net/xfrm/xfrm_user.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/net/xfrm/xfrm_user.c linux-3.0.4/net/xfrm/xfrm_user.c
+--- linux-3.0.4/net/xfrm/xfrm_user.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/net/xfrm/xfrm_user.c   2011-08-23 21:48:14.000000000 -0400
 @@ -1394,6 +1394,8 @@ static int copy_to_user_tmpl(struct xfrm
        struct xfrm_user_tmpl vec[XFRM_MAX_DEPTH];
        int i;
@@ -68049,9 +70827,9 @@ diff -urNp linux-3.0.3/net/xfrm/xfrm_user.c linux-3.0.3/net/xfrm/xfrm_user.c
        if (attrs[XFRMA_MIGRATE] == NULL)
                return -EINVAL;
  
-diff -urNp linux-3.0.3/scripts/basic/fixdep.c linux-3.0.3/scripts/basic/fixdep.c
---- linux-3.0.3/scripts/basic/fixdep.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/basic/fixdep.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/basic/fixdep.c linux-3.0.4/scripts/basic/fixdep.c
+--- linux-3.0.4/scripts/basic/fixdep.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/basic/fixdep.c 2011-08-23 21:47:56.000000000 -0400
 @@ -235,9 +235,9 @@ static void use_config(const char *m, in
  
  static void parse_config_file(const char *map, size_t len)
@@ -68073,15 +70851,15 @@ diff -urNp linux-3.0.3/scripts/basic/fixdep.c linux-3.0.3/scripts/basic/fixdep.c
  
        if (*p != INT_CONF) {
                fprintf(stderr, "fixdep: sizeof(int) != 4 or wrong endianess? %#x\n",
-diff -urNp linux-3.0.3/scripts/gcc-plugin.sh linux-3.0.3/scripts/gcc-plugin.sh
---- linux-3.0.3/scripts/gcc-plugin.sh  1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/scripts/gcc-plugin.sh  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/gcc-plugin.sh linux-3.0.4/scripts/gcc-plugin.sh
+--- linux-3.0.4/scripts/gcc-plugin.sh  1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/scripts/gcc-plugin.sh  2011-08-23 21:47:56.000000000 -0400
 @@ -0,0 +1,2 @@
 +#!/bin/sh
 +echo "#include \"gcc-plugin.h\"" | $* -x c -shared - -o /dev/null -I`$* -print-file-name=plugin`/include >/dev/null 2>&1 && echo "y"
-diff -urNp linux-3.0.3/scripts/Makefile.build linux-3.0.3/scripts/Makefile.build
---- linux-3.0.3/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/Makefile.build linux-3.0.4/scripts/Makefile.build
+--- linux-3.0.4/scripts/Makefile.build 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/Makefile.build 2011-08-23 21:47:56.000000000 -0400
 @@ -109,7 +109,7 @@ endif
  endif
  
@@ -68091,9 +70869,9 @@ diff -urNp linux-3.0.3/scripts/Makefile.build linux-3.0.3/scripts/Makefile.build
  include scripts/Makefile.host
  endif
  
-diff -urNp linux-3.0.3/scripts/Makefile.clean linux-3.0.3/scripts/Makefile.clean
---- linux-3.0.3/scripts/Makefile.clean 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/Makefile.clean 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/Makefile.clean linux-3.0.4/scripts/Makefile.clean
+--- linux-3.0.4/scripts/Makefile.clean 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/Makefile.clean 2011-08-23 21:47:56.000000000 -0400
 @@ -43,7 +43,8 @@ subdir-ymn   := $(addprefix $(obj)/,$(subd
  __clean-files := $(extra-y) $(always)                  \
                   $(targets) $(clean-files)             \
@@ -68104,9 +70882,9 @@ diff -urNp linux-3.0.3/scripts/Makefile.clean linux-3.0.3/scripts/Makefile.clean
  
  __clean-files   := $(filter-out $(no-clean-files), $(__clean-files))
  
-diff -urNp linux-3.0.3/scripts/Makefile.host linux-3.0.3/scripts/Makefile.host
---- linux-3.0.3/scripts/Makefile.host  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/Makefile.host  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/Makefile.host linux-3.0.4/scripts/Makefile.host
+--- linux-3.0.4/scripts/Makefile.host  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/Makefile.host  2011-08-23 21:47:56.000000000 -0400
 @@ -31,6 +31,7 @@
  # Note: Shared libraries consisting of C++ files are not supported
  
@@ -68123,9 +70901,9 @@ diff -urNp linux-3.0.3/scripts/Makefile.host linux-3.0.3/scripts/Makefile.host
  # Remove .so files from "xxx-objs"
  host-cobjs    := $(filter-out %.so,$(host-cobjs))
  
-diff -urNp linux-3.0.3/scripts/mod/file2alias.c linux-3.0.3/scripts/mod/file2alias.c
---- linux-3.0.3/scripts/mod/file2alias.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/file2alias.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/file2alias.c linux-3.0.4/scripts/mod/file2alias.c
+--- linux-3.0.4/scripts/mod/file2alias.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/file2alias.c       2011-08-23 21:47:56.000000000 -0400
 @@ -72,7 +72,7 @@ static void device_id_check(const char *
                            unsigned long size, unsigned long id_size,
                            void *symval)
@@ -68180,9 +70958,9 @@ diff -urNp linux-3.0.3/scripts/mod/file2alias.c linux-3.0.3/scripts/mod/file2ali
  
        sprintf(alias, "dmi*");
  
-diff -urNp linux-3.0.3/scripts/mod/modpost.c linux-3.0.3/scripts/mod/modpost.c
---- linux-3.0.3/scripts/mod/modpost.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/modpost.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/modpost.c linux-3.0.4/scripts/mod/modpost.c
+--- linux-3.0.4/scripts/mod/modpost.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/modpost.c  2011-08-23 21:47:56.000000000 -0400
 @@ -892,6 +892,7 @@ enum mismatch {
        ANY_INIT_TO_ANY_EXIT,
        ANY_EXIT_TO_ANY_INIT,
@@ -68259,9 +71037,9 @@ diff -urNp linux-3.0.3/scripts/mod/modpost.c linux-3.0.3/scripts/mod/modpost.c
                goto close_write;
  
        tmp = NOFAIL(malloc(b->pos));
-diff -urNp linux-3.0.3/scripts/mod/modpost.h linux-3.0.3/scripts/mod/modpost.h
---- linux-3.0.3/scripts/mod/modpost.h  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/modpost.h  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/modpost.h linux-3.0.4/scripts/mod/modpost.h
+--- linux-3.0.4/scripts/mod/modpost.h  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/modpost.h  2011-08-23 21:47:56.000000000 -0400
 @@ -92,15 +92,15 @@ void *do_nofail(void *ptr, const char *e
  
  struct buffer {
@@ -68281,9 +71059,9 @@ diff -urNp linux-3.0.3/scripts/mod/modpost.h linux-3.0.3/scripts/mod/modpost.h
  
  struct module {
        struct module *next;
-diff -urNp linux-3.0.3/scripts/mod/sumversion.c linux-3.0.3/scripts/mod/sumversion.c
---- linux-3.0.3/scripts/mod/sumversion.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/mod/sumversion.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/mod/sumversion.c linux-3.0.4/scripts/mod/sumversion.c
+--- linux-3.0.4/scripts/mod/sumversion.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/mod/sumversion.c       2011-08-23 21:47:56.000000000 -0400
 @@ -470,7 +470,7 @@ static void write_version(const char *fi
                goto out;
        }
@@ -68293,9 +71071,9 @@ diff -urNp linux-3.0.3/scripts/mod/sumversion.c linux-3.0.3/scripts/mod/sumversi
                warn("writing sum in %s failed: %s\n",
                        filename, strerror(errno));
                goto out;
-diff -urNp linux-3.0.3/scripts/pnmtologo.c linux-3.0.3/scripts/pnmtologo.c
---- linux-3.0.3/scripts/pnmtologo.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/scripts/pnmtologo.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/scripts/pnmtologo.c linux-3.0.4/scripts/pnmtologo.c
+--- linux-3.0.4/scripts/pnmtologo.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/scripts/pnmtologo.c    2011-08-23 21:47:56.000000000 -0400
 @@ -237,14 +237,14 @@ static void write_header(void)
      fprintf(out, " *  Linux logo %s\n", logoname);
      fputs(" */\n\n", out);
@@ -68322,9 +71100,9 @@ diff -urNp linux-3.0.3/scripts/pnmtologo.c linux-3.0.3/scripts/pnmtologo.c
            logoname);
      write_hex_cnt = 0;
      for (i = 0; i < logo_clutsize; i++) {
-diff -urNp linux-3.0.3/security/apparmor/lsm.c linux-3.0.3/security/apparmor/lsm.c
---- linux-3.0.3/security/apparmor/lsm.c        2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/security/apparmor/lsm.c        2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/apparmor/lsm.c linux-3.0.4/security/apparmor/lsm.c
+--- linux-3.0.4/security/apparmor/lsm.c        2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/security/apparmor/lsm.c        2011-08-23 21:48:14.000000000 -0400
 @@ -621,7 +621,7 @@ static int apparmor_task_setrlimit(struc
        return error;
  }
@@ -68334,9 +71112,9 @@ diff -urNp linux-3.0.3/security/apparmor/lsm.c linux-3.0.3/security/apparmor/lsm
        .name =                         "apparmor",
  
        .ptrace_access_check =          apparmor_ptrace_access_check,
-diff -urNp linux-3.0.3/security/commoncap.c linux-3.0.3/security/commoncap.c
---- linux-3.0.3/security/commoncap.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/commoncap.c   2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/commoncap.c linux-3.0.4/security/commoncap.c
+--- linux-3.0.4/security/commoncap.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/commoncap.c   2011-08-23 21:48:14.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <linux/prctl.h>
  #include <linux/securebits.h>
@@ -68364,9 +71142,9 @@ diff -urNp linux-3.0.3/security/commoncap.c linux-3.0.3/security/commoncap.c
        if (cred->uid != 0) {
                if (bprm->cap_effective)
                        return 1;
-diff -urNp linux-3.0.3/security/integrity/ima/ima_api.c linux-3.0.3/security/integrity/ima/ima_api.c
---- linux-3.0.3/security/integrity/ima/ima_api.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima_api.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima_api.c linux-3.0.4/security/integrity/ima/ima_api.c
+--- linux-3.0.4/security/integrity/ima/ima_api.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima_api.c       2011-08-23 21:47:56.000000000 -0400
 @@ -75,7 +75,7 @@ void ima_add_violation(struct inode *ino
        int result;
  
@@ -68376,9 +71154,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima_api.c linux-3.0.3/security/int
  
        entry = kmalloc(sizeof(*entry), GFP_KERNEL);
        if (!entry) {
-diff -urNp linux-3.0.3/security/integrity/ima/ima_fs.c linux-3.0.3/security/integrity/ima/ima_fs.c
---- linux-3.0.3/security/integrity/ima/ima_fs.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima_fs.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima_fs.c linux-3.0.4/security/integrity/ima/ima_fs.c
+--- linux-3.0.4/security/integrity/ima/ima_fs.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima_fs.c        2011-08-23 21:47:56.000000000 -0400
 @@ -28,12 +28,12 @@
  static int valid_policy = 1;
  #define TMPBUFLEN 12
@@ -68394,9 +71172,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima_fs.c linux-3.0.3/security/inte
        return simple_read_from_buffer(buf, count, ppos, tmpbuf, len);
  }
  
-diff -urNp linux-3.0.3/security/integrity/ima/ima.h linux-3.0.3/security/integrity/ima/ima.h
---- linux-3.0.3/security/integrity/ima/ima.h   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima.h   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima.h linux-3.0.4/security/integrity/ima/ima.h
+--- linux-3.0.4/security/integrity/ima/ima.h   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima.h   2011-08-23 21:47:56.000000000 -0400
 @@ -85,8 +85,8 @@ void ima_add_violation(struct inode *ino
  extern spinlock_t ima_queue_lock;
  
@@ -68408,9 +71186,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima.h linux-3.0.3/security/integri
        struct hlist_head queue[IMA_MEASURE_HTABLE_SIZE];
  };
  extern struct ima_h_table ima_htable;
-diff -urNp linux-3.0.3/security/integrity/ima/ima_queue.c linux-3.0.3/security/integrity/ima/ima_queue.c
---- linux-3.0.3/security/integrity/ima/ima_queue.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/integrity/ima/ima_queue.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/integrity/ima/ima_queue.c linux-3.0.4/security/integrity/ima/ima_queue.c
+--- linux-3.0.4/security/integrity/ima/ima_queue.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/integrity/ima/ima_queue.c     2011-08-23 21:47:56.000000000 -0400
 @@ -79,7 +79,7 @@ static int ima_add_digest_entry(struct i
        INIT_LIST_HEAD(&qe->later);
        list_add_tail_rcu(&qe->later, &ima_measurements);
@@ -68420,9 +71198,9 @@ diff -urNp linux-3.0.3/security/integrity/ima/ima_queue.c linux-3.0.3/security/i
        key = ima_hash_key(entry->digest);
        hlist_add_head_rcu(&qe->hnext, &ima_htable.queue[key]);
        return 0;
-diff -urNp linux-3.0.3/security/Kconfig linux-3.0.3/security/Kconfig
---- linux-3.0.3/security/Kconfig       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/Kconfig       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/Kconfig linux-3.0.4/security/Kconfig
+--- linux-3.0.4/security/Kconfig       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/Kconfig       2011-08-23 21:48:14.000000000 -0400
 @@ -4,6 +4,554 @@
  
  menu "Security options"
@@ -68987,9 +71765,9 @@ diff -urNp linux-3.0.3/security/Kconfig linux-3.0.3/security/Kconfig
        default 65536
        help
          This is the portion of low virtual memory which should be protected
-diff -urNp linux-3.0.3/security/keys/keyring.c linux-3.0.3/security/keys/keyring.c
---- linux-3.0.3/security/keys/keyring.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/keys/keyring.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/keys/keyring.c linux-3.0.4/security/keys/keyring.c
+--- linux-3.0.4/security/keys/keyring.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/keys/keyring.c        2011-08-23 21:47:56.000000000 -0400
 @@ -215,15 +215,15 @@ static long keyring_read(const struct ke
                        ret = -EFAULT;
  
@@ -69009,9 +71787,9 @@ diff -urNp linux-3.0.3/security/keys/keyring.c linux-3.0.3/security/keys/keyring
                                        goto error;
  
                                buflen -= tmp;
-diff -urNp linux-3.0.3/security/min_addr.c linux-3.0.3/security/min_addr.c
---- linux-3.0.3/security/min_addr.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/min_addr.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/min_addr.c linux-3.0.4/security/min_addr.c
+--- linux-3.0.4/security/min_addr.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/min_addr.c    2011-08-23 21:48:14.000000000 -0400
 @@ -14,6 +14,7 @@ unsigned long dac_mmap_min_addr = CONFIG
   */
  static void update_mmap_min_addr(void)
@@ -69028,9 +71806,9 @@ diff -urNp linux-3.0.3/security/min_addr.c linux-3.0.3/security/min_addr.c
  }
  
  /*
-diff -urNp linux-3.0.3/security/security.c linux-3.0.3/security/security.c
---- linux-3.0.3/security/security.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/security.c    2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/security.c linux-3.0.4/security/security.c
+--- linux-3.0.4/security/security.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/security.c    2011-08-23 21:48:14.000000000 -0400
 @@ -25,8 +25,8 @@ static __initdata char chosen_lsm[SECURI
  /* things that live in capability.c */
  extern void __init security_fixup_ops(struct security_operations *ops);
@@ -69052,9 +71830,9 @@ diff -urNp linux-3.0.3/security/security.c linux-3.0.3/security/security.c
  }
  
  /* Save user chosen LSM */
-diff -urNp linux-3.0.3/security/selinux/hooks.c linux-3.0.3/security/selinux/hooks.c
---- linux-3.0.3/security/selinux/hooks.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/selinux/hooks.c       2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/selinux/hooks.c linux-3.0.4/security/selinux/hooks.c
+--- linux-3.0.4/security/selinux/hooks.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/selinux/hooks.c       2011-08-23 21:48:14.000000000 -0400
 @@ -93,7 +93,6 @@
  #define NUM_SEL_MNT_OPTS 5
  
@@ -69072,9 +71850,9 @@ diff -urNp linux-3.0.3/security/selinux/hooks.c linux-3.0.3/security/selinux/hoo
        .name =                         "selinux",
  
        .ptrace_access_check =          selinux_ptrace_access_check,
-diff -urNp linux-3.0.3/security/selinux/include/xfrm.h linux-3.0.3/security/selinux/include/xfrm.h
---- linux-3.0.3/security/selinux/include/xfrm.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/selinux/include/xfrm.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/selinux/include/xfrm.h linux-3.0.4/security/selinux/include/xfrm.h
+--- linux-3.0.4/security/selinux/include/xfrm.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/selinux/include/xfrm.h        2011-08-23 21:47:56.000000000 -0400
 @@ -48,7 +48,7 @@ int selinux_xfrm_decode_session(struct s
  
  static inline void selinux_xfrm_notify_policyload(void)
@@ -69084,9 +71862,9 @@ diff -urNp linux-3.0.3/security/selinux/include/xfrm.h linux-3.0.3/security/seli
  }
  #else
  static inline int selinux_xfrm_enabled(void)
-diff -urNp linux-3.0.3/security/selinux/ss/services.c linux-3.0.3/security/selinux/ss/services.c
---- linux-3.0.3/security/selinux/ss/services.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/selinux/ss/services.c 2011-08-23 21:48:14.000000000 -0400
+diff -urNp linux-3.0.4/security/selinux/ss/services.c linux-3.0.4/security/selinux/ss/services.c
+--- linux-3.0.4/security/selinux/ss/services.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/selinux/ss/services.c 2011-08-23 21:48:14.000000000 -0400
 @@ -1814,6 +1814,8 @@ int security_load_policy(void *data, siz
        int rc = 0;
        struct policy_file file = { data, len }, *fp = &file;
@@ -69096,9 +71874,9 @@ diff -urNp linux-3.0.3/security/selinux/ss/services.c linux-3.0.3/security/selin
        if (!ss_initialized) {
                avtab_cache_init();
                rc = policydb_read(&policydb, fp);
-diff -urNp linux-3.0.3/security/smack/smack_lsm.c linux-3.0.3/security/smack/smack_lsm.c
---- linux-3.0.3/security/smack/smack_lsm.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/smack/smack_lsm.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/smack/smack_lsm.c linux-3.0.4/security/smack/smack_lsm.c
+--- linux-3.0.4/security/smack/smack_lsm.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/smack/smack_lsm.c     2011-08-23 21:47:56.000000000 -0400
 @@ -3392,7 +3392,7 @@ static int smack_inode_getsecctx(struct 
        return 0;
  }
@@ -69108,9 +71886,9 @@ diff -urNp linux-3.0.3/security/smack/smack_lsm.c linux-3.0.3/security/smack/sma
        .name =                         "smack",
  
        .ptrace_access_check =          smack_ptrace_access_check,
-diff -urNp linux-3.0.3/security/tomoyo/tomoyo.c linux-3.0.3/security/tomoyo/tomoyo.c
---- linux-3.0.3/security/tomoyo/tomoyo.c       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/security/tomoyo/tomoyo.c       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/security/tomoyo/tomoyo.c linux-3.0.4/security/tomoyo/tomoyo.c
+--- linux-3.0.4/security/tomoyo/tomoyo.c       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/security/tomoyo/tomoyo.c       2011-08-23 21:47:56.000000000 -0400
 @@ -240,7 +240,7 @@ static int tomoyo_sb_pivotroot(struct pa
   * tomoyo_security_ops is a "struct security_operations" which is used for
   * registering TOMOYO.
@@ -69120,9 +71898,9 @@ diff -urNp linux-3.0.3/security/tomoyo/tomoyo.c linux-3.0.3/security/tomoyo/tomo
        .name                = "tomoyo",
        .cred_alloc_blank    = tomoyo_cred_alloc_blank,
        .cred_prepare        = tomoyo_cred_prepare,
-diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.c linux-3.0.3/sound/aoa/codecs/onyx.c
---- linux-3.0.3/sound/aoa/codecs/onyx.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/aoa/codecs/onyx.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.c linux-3.0.4/sound/aoa/codecs/onyx.c
+--- linux-3.0.4/sound/aoa/codecs/onyx.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/aoa/codecs/onyx.c        2011-08-23 21:47:56.000000000 -0400
 @@ -54,7 +54,7 @@ struct onyx {
                                spdif_locked:1,
                                analog_locked:1,
@@ -69151,9 +71929,9 @@ diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.c linux-3.0.3/sound/aoa/codecs/onyx
                onyx->spdif_locked = onyx->analog_locked = 0;
        mutex_unlock(&onyx->mutex);
  
-diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.h linux-3.0.3/sound/aoa/codecs/onyx.h
---- linux-3.0.3/sound/aoa/codecs/onyx.h        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/aoa/codecs/onyx.h        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/aoa/codecs/onyx.h linux-3.0.4/sound/aoa/codecs/onyx.h
+--- linux-3.0.4/sound/aoa/codecs/onyx.h        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/aoa/codecs/onyx.h        2011-08-23 21:47:56.000000000 -0400
 @@ -11,6 +11,7 @@
  #include <linux/i2c.h>
  #include <asm/pmac_low_i2c.h>
@@ -69162,9 +71940,9 @@ diff -urNp linux-3.0.3/sound/aoa/codecs/onyx.h linux-3.0.3/sound/aoa/codecs/onyx
  
  /* PCM3052 register definitions */
  
-diff -urNp linux-3.0.3/sound/core/seq/seq_device.c linux-3.0.3/sound/core/seq/seq_device.c
---- linux-3.0.3/sound/core/seq/seq_device.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/core/seq/seq_device.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/core/seq/seq_device.c linux-3.0.4/sound/core/seq/seq_device.c
+--- linux-3.0.4/sound/core/seq/seq_device.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/core/seq/seq_device.c    2011-08-23 21:47:56.000000000 -0400
 @@ -63,7 +63,7 @@ struct ops_list {
        int argsize;            /* argument size */
  
@@ -69201,9 +71979,9 @@ diff -urNp linux-3.0.3/sound/core/seq/seq_device.c linux-3.0.3/sound/core/seq/se
                dev->status = SNDRV_SEQ_DEVICE_FREE;
                dev->driver_data = NULL;
                ops->num_init_devices--;
-diff -urNp linux-3.0.3/sound/drivers/mts64.c linux-3.0.3/sound/drivers/mts64.c
---- linux-3.0.3/sound/drivers/mts64.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/drivers/mts64.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/drivers/mts64.c linux-3.0.4/sound/drivers/mts64.c
+--- linux-3.0.4/sound/drivers/mts64.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/drivers/mts64.c  2011-08-23 21:47:56.000000000 -0400
 @@ -28,6 +28,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -69260,9 +72038,9 @@ diff -urNp linux-3.0.3/sound/drivers/mts64.c linux-3.0.3/sound/drivers/mts64.c
  
        return 0;
  }
-diff -urNp linux-3.0.3/sound/drivers/opl4/opl4_lib.c linux-3.0.3/sound/drivers/opl4/opl4_lib.c
---- linux-3.0.3/sound/drivers/opl4/opl4_lib.c  2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/drivers/opl4/opl4_lib.c  2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/drivers/opl4/opl4_lib.c linux-3.0.4/sound/drivers/opl4/opl4_lib.c
+--- linux-3.0.4/sound/drivers/opl4/opl4_lib.c  2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/drivers/opl4/opl4_lib.c  2011-08-23 21:47:56.000000000 -0400
 @@ -28,7 +28,7 @@ MODULE_AUTHOR("Clemens Ladisch <clemens@
  MODULE_DESCRIPTION("OPL4 driver");
  MODULE_LICENSE("GPL");
@@ -69272,9 +72050,9 @@ diff -urNp linux-3.0.3/sound/drivers/opl4/opl4_lib.c linux-3.0.3/sound/drivers/o
  {
        int timeout = 10;
        while ((inb(opl4->fm_port) & OPL4_STATUS_BUSY) && --timeout > 0)
-diff -urNp linux-3.0.3/sound/drivers/portman2x4.c linux-3.0.3/sound/drivers/portman2x4.c
---- linux-3.0.3/sound/drivers/portman2x4.c     2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/drivers/portman2x4.c     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/drivers/portman2x4.c linux-3.0.4/sound/drivers/portman2x4.c
+--- linux-3.0.4/sound/drivers/portman2x4.c     2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/drivers/portman2x4.c     2011-08-23 21:47:56.000000000 -0400
 @@ -47,6 +47,7 @@
  #include <sound/initval.h>
  #include <sound/rawmidi.h>
@@ -69292,9 +72070,9 @@ diff -urNp linux-3.0.3/sound/drivers/portman2x4.c linux-3.0.3/sound/drivers/port
        int mode[PORTMAN_NUM_INPUT_PORTS];
        struct snd_rawmidi_substream *midi_input[PORTMAN_NUM_INPUT_PORTS];
  };
-diff -urNp linux-3.0.3/sound/firewire/amdtp.c linux-3.0.3/sound/firewire/amdtp.c
---- linux-3.0.3/sound/firewire/amdtp.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/firewire/amdtp.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/firewire/amdtp.c linux-3.0.4/sound/firewire/amdtp.c
+--- linux-3.0.4/sound/firewire/amdtp.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/firewire/amdtp.c 2011-08-23 21:47:56.000000000 -0400
 @@ -371,7 +371,7 @@ static void queue_out_packet(struct amdt
                ptr = s->pcm_buffer_pointer + data_blocks;
                if (ptr >= pcm->runtime->buffer_size)
@@ -69313,9 +72091,9 @@ diff -urNp linux-3.0.3/sound/firewire/amdtp.c linux-3.0.3/sound/firewire/amdtp.c
                (fw_parent_device(s->unit)->card->node_id & 0x3f) << 24;
  }
  EXPORT_SYMBOL(amdtp_out_stream_update);
-diff -urNp linux-3.0.3/sound/firewire/amdtp.h linux-3.0.3/sound/firewire/amdtp.h
---- linux-3.0.3/sound/firewire/amdtp.h 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/firewire/amdtp.h 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/firewire/amdtp.h linux-3.0.4/sound/firewire/amdtp.h
+--- linux-3.0.4/sound/firewire/amdtp.h 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/firewire/amdtp.h 2011-08-23 21:47:56.000000000 -0400
 @@ -146,7 +146,7 @@ static inline void amdtp_out_stream_pcm_
  static inline void amdtp_out_stream_pcm_trigger(struct amdtp_out_stream *s,
                                                struct snd_pcm_substream *pcm)
@@ -69325,9 +72103,9 @@ diff -urNp linux-3.0.3/sound/firewire/amdtp.h linux-3.0.3/sound/firewire/amdtp.h
  }
  
  /**
-diff -urNp linux-3.0.3/sound/firewire/isight.c linux-3.0.3/sound/firewire/isight.c
---- linux-3.0.3/sound/firewire/isight.c        2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/firewire/isight.c        2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/firewire/isight.c linux-3.0.4/sound/firewire/isight.c
+--- linux-3.0.4/sound/firewire/isight.c        2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/firewire/isight.c        2011-08-23 21:47:56.000000000 -0400
 @@ -97,7 +97,7 @@ static void isight_update_pointers(struc
        ptr += count;
        if (ptr >= runtime->buffer_size)
@@ -69368,9 +72146,9 @@ diff -urNp linux-3.0.3/sound/firewire/isight.c linux-3.0.3/sound/firewire/isight
                break;
        default:
                return -EINVAL;
-diff -urNp linux-3.0.3/sound/isa/cmi8330.c linux-3.0.3/sound/isa/cmi8330.c
---- linux-3.0.3/sound/isa/cmi8330.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/isa/cmi8330.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/isa/cmi8330.c linux-3.0.4/sound/isa/cmi8330.c
+--- linux-3.0.4/sound/isa/cmi8330.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/isa/cmi8330.c    2011-08-23 21:47:56.000000000 -0400
 @@ -172,7 +172,7 @@ struct snd_cmi8330 {
  
        struct snd_pcm *pcm;
@@ -69380,9 +72158,9 @@ diff -urNp linux-3.0.3/sound/isa/cmi8330.c linux-3.0.3/sound/isa/cmi8330.c
                snd_pcm_open_callback_t open;
                void *private_data; /* sb or wss */
        } streams[2];
-diff -urNp linux-3.0.3/sound/oss/sb_audio.c linux-3.0.3/sound/oss/sb_audio.c
---- linux-3.0.3/sound/oss/sb_audio.c   2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/oss/sb_audio.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/oss/sb_audio.c linux-3.0.4/sound/oss/sb_audio.c
+--- linux-3.0.4/sound/oss/sb_audio.c   2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/oss/sb_audio.c   2011-08-23 21:47:56.000000000 -0400
 @@ -901,7 +901,7 @@ sb16_copy_from_user(int dev,
                buf16 = (signed short *)(localbuf + localoffs);
                while (c)
@@ -69392,9 +72170,9 @@ diff -urNp linux-3.0.3/sound/oss/sb_audio.c linux-3.0.3/sound/oss/sb_audio.c
                        if (copy_from_user(lbuf8,
                                           userbuf+useroffs + p,
                                           locallen))
-diff -urNp linux-3.0.3/sound/oss/swarm_cs4297a.c linux-3.0.3/sound/oss/swarm_cs4297a.c
---- linux-3.0.3/sound/oss/swarm_cs4297a.c      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/oss/swarm_cs4297a.c      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/oss/swarm_cs4297a.c linux-3.0.4/sound/oss/swarm_cs4297a.c
+--- linux-3.0.4/sound/oss/swarm_cs4297a.c      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/oss/swarm_cs4297a.c      2011-08-23 21:47:56.000000000 -0400
 @@ -2606,7 +2606,6 @@ static int __init cs4297a_init(void)
  {
        struct cs4297a_state *s;
@@ -69429,9 +72207,9 @@ diff -urNp linux-3.0.3/sound/oss/swarm_cs4297a.c linux-3.0.3/sound/oss/swarm_cs4
  
                  list_add(&s->list, &cs4297a_devs);
  
-diff -urNp linux-3.0.3/sound/pci/hda/hda_codec.h linux-3.0.3/sound/pci/hda/hda_codec.h
---- linux-3.0.3/sound/pci/hda/hda_codec.h      2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/pci/hda/hda_codec.h      2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/pci/hda/hda_codec.h linux-3.0.4/sound/pci/hda/hda_codec.h
+--- linux-3.0.4/sound/pci/hda/hda_codec.h      2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/pci/hda/hda_codec.h      2011-08-23 21:47:56.000000000 -0400
 @@ -615,7 +615,7 @@ struct hda_bus_ops {
        /* notify power-up/down from codec to controller */
        void (*pm_notify)(struct hda_bus *bus);
@@ -69467,9 +72245,9 @@ diff -urNp linux-3.0.3/sound/pci/hda/hda_codec.h linux-3.0.3/sound/pci/hda/hda_c
  
        /* PCM to create, set by patch_ops.build_pcms callback */
        unsigned int num_pcms;
-diff -urNp linux-3.0.3/sound/pci/ice1712/ice1712.h linux-3.0.3/sound/pci/ice1712/ice1712.h
---- linux-3.0.3/sound/pci/ice1712/ice1712.h    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/pci/ice1712/ice1712.h    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/pci/ice1712/ice1712.h linux-3.0.4/sound/pci/ice1712/ice1712.h
+--- linux-3.0.4/sound/pci/ice1712/ice1712.h    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/pci/ice1712/ice1712.h    2011-08-23 21:47:56.000000000 -0400
 @@ -269,7 +269,7 @@ struct snd_ak4xxx_private {
        unsigned int mask_flags;        /* total mask bits */
        struct snd_akm4xxx_ops {
@@ -69488,9 +72266,9 @@ diff -urNp linux-3.0.3/sound/pci/ice1712/ice1712.h linux-3.0.3/sound/pci/ice1712
  };
  
  
-diff -urNp linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c
---- linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c 2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c 2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c
+--- linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c 2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/pci/ymfpci/ymfpci_main.c 2011-08-23 21:47:56.000000000 -0400
 @@ -202,8 +202,8 @@ static void snd_ymfpci_hw_stop(struct sn
                if ((snd_ymfpci_readl(chip, YDSXGR_STATUS) & 2) == 0)
                        break;
@@ -69531,9 +72309,9 @@ diff -urNp linux-3.0.3/sound/pci/ymfpci/ymfpci_main.c linux-3.0.3/sound/pci/ymfp
        chip->card = card;
        chip->pci = pci;
        chip->irq = -1;
-diff -urNp linux-3.0.3/sound/soc/soc-core.c linux-3.0.3/sound/soc/soc-core.c
---- linux-3.0.3/sound/soc/soc-core.c   2011-08-23 21:44:40.000000000 -0400
-+++ linux-3.0.3/sound/soc/soc-core.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/soc/soc-core.c linux-3.0.4/sound/soc/soc-core.c
+--- linux-3.0.4/sound/soc/soc-core.c   2011-08-23 21:44:40.000000000 -0400
++++ linux-3.0.4/sound/soc/soc-core.c   2011-08-23 21:47:56.000000000 -0400
 @@ -1021,7 +1021,7 @@ static snd_pcm_uframes_t soc_pcm_pointer
  }
  
@@ -69551,9 +72329,9 @@ diff -urNp linux-3.0.3/sound/soc/soc-core.c linux-3.0.3/sound/soc/soc-core.c
                soc_pcm_ops.mmap = platform->driver->ops->mmap;
                soc_pcm_ops.pointer = platform->driver->ops->pointer;
                soc_pcm_ops.ioctl = platform->driver->ops->ioctl;
-diff -urNp linux-3.0.3/sound/usb/card.h linux-3.0.3/sound/usb/card.h
---- linux-3.0.3/sound/usb/card.h       2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/sound/usb/card.h       2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/sound/usb/card.h linux-3.0.4/sound/usb/card.h
+--- linux-3.0.4/sound/usb/card.h       2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/sound/usb/card.h       2011-08-23 21:47:56.000000000 -0400
 @@ -44,6 +44,7 @@ struct snd_urb_ops {
        int (*prepare_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
        int (*retire_sync)(struct snd_usb_substream *subs, struct snd_pcm_runtime *runtime, struct urb *u);
@@ -69571,10 +72349,10 @@ diff -urNp linux-3.0.3/sound/usb/card.h linux-3.0.3/sound/usb/card.h
  };
  
  struct snd_usb_stream {
-diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constify_plugin.c
---- linux-3.0.3/tools/gcc/constify_plugin.c    1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/tools/gcc/constify_plugin.c    2011-08-24 18:13:06.000000000 -0400
-@@ -0,0 +1,259 @@
+diff -urNp linux-3.0.4/tools/gcc/constify_plugin.c linux-3.0.4/tools/gcc/constify_plugin.c
+--- linux-3.0.4/tools/gcc/constify_plugin.c    1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/tools/gcc/constify_plugin.c    2011-08-29 22:01:36.000000000 -0400
+@@ -0,0 +1,289 @@
 +/*
 + * Copyright 2011 by Emese Revfy <re.emese@gmail.com>
 + * Licensed under the GPL v2, or (at your option) v3
@@ -69599,31 +72377,32 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +#include "function.h"
 +#include "tree-flow.h"
 +#include "plugin.h"
++#include "diagnostic.h"
 +//#include "c-tree.h"
 +
-+#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1 (TYPE)
++#define C_TYPE_FIELDS_READONLY(TYPE) TREE_LANG_FLAG_1(TYPE)
 +
 +int plugin_is_GPL_compatible;
 +
 +static struct plugin_info const_plugin_info = {
-+      .version        = "20110824",
++      .version        = "20110826",
 +      .help           = "no-constify\tturn off constification\n",
 +};
 +
++static void constify_type(tree type);
 +static bool walk_struct(tree node);
 +
-+static void deconstify_node(tree type)
++static tree deconstify_type(tree old_type)
 +{
-+      tree field;
++      tree new_type, field;
 +
-+      C_TYPE_FIELDS_READONLY(type) = 0;
-+      for (field = TYPE_FIELDS(type); field; field = TREE_CHAIN(field)) {
-+              enum tree_code code = TREE_CODE(TREE_TYPE(field));
-+              if (code == RECORD_TYPE || code == UNION_TYPE)
-+                      deconstify_node(TREE_TYPE(field));
-+              TREE_READONLY(field) = 0;
-+              TYPE_READONLY(TREE_TYPE(field)) = 0;
-+      }
++      new_type = build_qualified_type(old_type, TYPE_QUALS(old_type) & ~TYPE_QUAL_CONST);
++      TYPE_FIELDS(new_type) = copy_list(TYPE_FIELDS(new_type));
++      for (field = TYPE_FIELDS(new_type); field; field = TREE_CHAIN(field))
++              DECL_FIELD_CONTEXT(field) = new_type;
++      TYPE_READONLY(new_type) = 0;
++      C_TYPE_FIELDS_READONLY(new_type) = 0;
++      return new_type;
 +}
 +
 +static tree handle_no_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
@@ -69641,7 +72420,7 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +              return NULL_TREE;
 +      }
 +
-+      if (!DECL_P(*node)) {
++      if (TYPE_P(*node)) {
 +              if (TREE_CODE(*node) == RECORD_TYPE || TREE_CODE(*node) == UNION_TYPE)
 +                      *no_add_attrs = false;
 +              else
@@ -69656,7 +72435,7 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +              return NULL_TREE;
 +      }
 +
-+      if (lookup_attribute("no_const", TYPE_ATTRIBUTES(type))) {
++      if (lookup_attribute(IDENTIFIER_POINTER(name), TYPE_ATTRIBUTES(type))) {
 +              error("%qE attribute is already applied to the type", name);
 +              return NULL_TREE;
 +      }
@@ -69667,15 +72446,32 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +      }
 +
 +      if (TREE_CODE(*node) == TYPE_DECL) {
-+              TREE_TYPE(*node) = build_qualified_type(type, TYPE_QUALS(type) & ~TYPE_QUAL_CONST);
-+              TYPE_FIELDS(TREE_TYPE(*node)) = copy_list(TYPE_FIELDS(TREE_TYPE(*node)));
-+              deconstify_node(TREE_TYPE(*node));
++              TREE_TYPE(*node) = deconstify_type(type);
++              TREE_READONLY(*node) = 0;
 +              return NULL_TREE;
 +      }
 +
 +      return NULL_TREE;
 +}
 +
++static tree handle_do_const_attribute(tree *node, tree name, tree args, int flags, bool *no_add_attrs)
++{
++      *no_add_attrs = true;
++      if (!TYPE_P(*node)) {
++              error("%qE attribute applies to types only", name);
++              return NULL_TREE;
++      }
++
++      if (TREE_CODE(*node) != RECORD_TYPE && TREE_CODE(*node) != UNION_TYPE) {
++              error("%qE attribute applies to struct and union types only", name);
++              return NULL_TREE;
++      }
++
++      *no_add_attrs = false;
++      constify_type(*node);
++      return NULL_TREE;
++}
++
 +static struct attribute_spec no_const_attr = {
 +      .name                   = "no_const",
 +      .min_length             = 0,
@@ -69686,14 +72482,26 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +      .handler                = handle_no_const_attribute
 +};
 +
++static struct attribute_spec do_const_attr = {
++      .name                   = "do_const",
++      .min_length             = 0,
++      .max_length             = 0,
++      .decl_required          = false,
++      .type_required          = false,
++      .function_type_required = false,
++      .handler                = handle_do_const_attribute
++};
++
 +static void register_attributes(void *event_data, void *data)
 +{
 +      register_attribute(&no_const_attr);
++      register_attribute(&do_const_attr);
 +}
 +
-+static void constify_node(tree node)
++static void constify_type(tree type)
 +{
-+      TREE_READONLY(node) = 1;
++      TYPE_READONLY(type) = 1;
++      C_TYPE_FIELDS_READONLY(type) = 1;
 +}
 +
 +static bool is_fptr(tree field)
@@ -69722,7 +72530,7 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +              if (code == RECORD_TYPE || code == UNION_TYPE) {
 +                      if (!(walk_struct(type)))
 +                              return false;
-+              } else if (is_fptr(field) == false && !TREE_READONLY(field))
++              } else if (!is_fptr(field) && !TREE_READONLY(field))
 +                      return false;
 +      }
 +      return true;
@@ -69730,16 +72538,16 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +
 +static void finish_type(void *event_data, void *data)
 +{
-+      tree node = (tree)event_data;
++      tree type = (tree)event_data;
 +
-+      if (node == NULL_TREE)
++      if (type == NULL_TREE)
 +              return;
 +
-+      if (TREE_READONLY(node))
++      if (TYPE_READONLY(type))
 +              return;
 +
-+      if (walk_struct(node))
-+              constify_node(node);
++      if (walk_struct(type))
++              constify_type(type);
 +}
 +
 +static unsigned int check_local_variables(void);
@@ -69834,9 +72642,9 @@ diff -urNp linux-3.0.3/tools/gcc/constify_plugin.c linux-3.0.3/tools/gcc/constif
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.3/tools/gcc/Makefile linux-3.0.3/tools/gcc/Makefile
---- linux-3.0.3/tools/gcc/Makefile     1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/tools/gcc/Makefile     2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/tools/gcc/Makefile linux-3.0.4/tools/gcc/Makefile
+--- linux-3.0.4/tools/gcc/Makefile     1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/tools/gcc/Makefile     2011-08-23 21:47:56.000000000 -0400
 @@ -0,0 +1,12 @@
 +#CC := gcc
 +#PLUGIN_SOURCE_FILES := pax_plugin.c
@@ -69850,9 +72658,9 @@ diff -urNp linux-3.0.3/tools/gcc/Makefile linux-3.0.3/tools/gcc/Makefile
 +always := $(hostlibs-y)
 +stackleak_plugin-objs := stackleak_plugin.o
 +constify_plugin-objs := constify_plugin.o
-diff -urNp linux-3.0.3/tools/gcc/stackleak_plugin.c linux-3.0.3/tools/gcc/stackleak_plugin.c
---- linux-3.0.3/tools/gcc/stackleak_plugin.c   1969-12-31 19:00:00.000000000 -0500
-+++ linux-3.0.3/tools/gcc/stackleak_plugin.c   2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/tools/gcc/stackleak_plugin.c linux-3.0.4/tools/gcc/stackleak_plugin.c
+--- linux-3.0.4/tools/gcc/stackleak_plugin.c   1969-12-31 19:00:00.000000000 -0500
++++ linux-3.0.4/tools/gcc/stackleak_plugin.c   2011-08-23 21:47:56.000000000 -0400
 @@ -0,0 +1,243 @@
 +/*
 + * Copyright 2011 by the PaX Team <pageexec@freemail.hu>
@@ -70097,9 +72905,9 @@ diff -urNp linux-3.0.3/tools/gcc/stackleak_plugin.c linux-3.0.3/tools/gcc/stackl
 +
 +      return 0;
 +}
-diff -urNp linux-3.0.3/usr/gen_init_cpio.c linux-3.0.3/usr/gen_init_cpio.c
---- linux-3.0.3/usr/gen_init_cpio.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/usr/gen_init_cpio.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/usr/gen_init_cpio.c linux-3.0.4/usr/gen_init_cpio.c
+--- linux-3.0.4/usr/gen_init_cpio.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/usr/gen_init_cpio.c    2011-08-23 21:47:56.000000000 -0400
 @@ -303,7 +303,7 @@ static int cpio_mkfile(const char *name,
        int retval;
        int rc = -1;
@@ -70122,9 +72930,9 @@ diff -urNp linux-3.0.3/usr/gen_init_cpio.c linux-3.0.3/usr/gen_init_cpio.c
                 } else
                         break;
         }
-diff -urNp linux-3.0.3/virt/kvm/kvm_main.c linux-3.0.3/virt/kvm/kvm_main.c
---- linux-3.0.3/virt/kvm/kvm_main.c    2011-07-21 22:17:23.000000000 -0400
-+++ linux-3.0.3/virt/kvm/kvm_main.c    2011-08-23 21:47:56.000000000 -0400
+diff -urNp linux-3.0.4/virt/kvm/kvm_main.c linux-3.0.4/virt/kvm/kvm_main.c
+--- linux-3.0.4/virt/kvm/kvm_main.c    2011-07-21 22:17:23.000000000 -0400
++++ linux-3.0.4/virt/kvm/kvm_main.c    2011-08-23 21:47:56.000000000 -0400
 @@ -73,7 +73,7 @@ LIST_HEAD(vm_list);
  
  static cpumask_var_t cpus_hardware_enabled;

diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch
index ce0a7a559bc12470863dc850d71a90d6fb981614..a657330d74459a56a857a0a9c16b627144df7241 100644 (file)
--- a/kernel-vserver-2.3.patch
+++ b/kernel-vserver-2.3.patch
@@ -1,6 +1,6 @@
-diff -NurpP --minimal linux-3.0.1/.config.inet linux-3.0.1-vs2.3.1-pre9/.config.inet
---- linux-3.0.1/.config.inet   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/.config.inet      2011-06-13 14:55:18.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/.config.inet linux-3.0.3-vs2.3.1-pre10/.config.inet
+--- linux-3.0.3/.config.inet   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/.config.inet     2011-06-13 14:55:18.000000000 +0200
 @@ -0,0 +1,1620 @@
 +#
 +# Automatically generated make config: don't edit
@@ -1622,9 +1622,9 @@ diff -NurpP --minimal linux-3.0.1/.config.inet linux-3.0.1-vs2.3.1-pre9/.config.
 +CONFIG_CPU_RMAP=y
 +CONFIG_NLATTR=y
 +# CONFIG_AVERAGE is not set
-diff -NurpP --minimal linux-3.0.1/Documentation/vserver/debug.txt linux-3.0.1-vs2.3.1-pre9/Documentation/vserver/debug.txt
---- linux-3.0.1/Documentation/vserver/debug.txt        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/Documentation/vserver/debug.txt   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/Documentation/vserver/debug.txt linux-3.0.3-vs2.3.1-pre10/Documentation/vserver/debug.txt
+--- linux-3.0.3/Documentation/vserver/debug.txt        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/Documentation/vserver/debug.txt  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,154 @@
 +
 +debug_cvirt:
@@ -1780,9 +1780,9 @@ diff -NurpP --minimal linux-3.0.1/Documentation/vserver/debug.txt linux-3.0.1-vs
 + m 2^m        "vx_acc_page[%5d,%s,%2d]: %5d%s"
 +      "vx_acc_pages[%5d,%s,%2d]: %5d += %5d"
 +      "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d"
-diff -NurpP --minimal linux-3.0.1/arch/alpha/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/alpha/Kconfig
---- linux-3.0.1/arch/alpha/Kconfig     2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/Kconfig        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/alpha/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/alpha/Kconfig
+--- linux-3.0.3/arch/alpha/Kconfig     2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/Kconfig       2011-06-10 22:11:24.000000000 +0200
 @@ -668,6 +668,8 @@ config DUMMY_CONSOLE
        depends on VGA_HOSE
        default y
@@ -1792,9 +1792,9 @@ diff -NurpP --minimal linux-3.0.1/arch/alpha/Kconfig linux-3.0.1-vs2.3.1-pre9/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/entry.S linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/entry.S
---- linux-3.0.1/arch/alpha/kernel/entry.S      2010-10-21 13:06:45.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/entry.S linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/entry.S
+--- linux-3.0.3/arch/alpha/kernel/entry.S      2010-10-21 13:06:45.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/entry.S        2011-06-10 22:11:24.000000000 +0200
 @@ -860,24 +860,15 @@ sys_getxgid:
        .globl  sys_getxpid
        .ent    sys_getxpid
@@ -1827,9 +1827,9 @@ diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/entry.S linux-3.0.1-vs2.3.1-
        ret
  .end sys_getxpid
  
-diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/ptrace.c
---- linux-3.0.1/arch/alpha/kernel/ptrace.c     2011-01-05 21:48:40.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/ptrace.c
+--- linux-3.0.3/arch/alpha/kernel/ptrace.c     2011-01-05 21:48:40.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/ptrace.c       2011-06-10 22:11:24.000000000 +0200
 @@ -13,6 +13,7 @@
  #include <linux/user.h>
  #include <linux/security.h>
@@ -1838,9 +1838,9 @@ diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/ptrace.c linux-3.0.1-vs2.3.1
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/systbls.S linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/systbls.S
---- linux-3.0.1/arch/alpha/kernel/systbls.S    2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/systbls.S       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/systbls.S linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/systbls.S
+--- linux-3.0.3/arch/alpha/kernel/systbls.S    2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/systbls.S      2011-06-10 22:11:24.000000000 +0200
 @@ -446,7 +446,7 @@ sys_call_table:
        .quad sys_stat64                        /* 425 */
        .quad sys_lstat64
@@ -1850,9 +1850,9 @@ diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/systbls.S linux-3.0.1-vs2.3.
        .quad sys_ni_syscall                    /* sys_mbind */
        .quad sys_ni_syscall                    /* sys_get_mempolicy */
        .quad sys_ni_syscall                    /* sys_set_mempolicy */
-diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/traps.c
---- linux-3.0.1/arch/alpha/kernel/traps.c      2010-10-21 13:06:46.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/alpha/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/alpha/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/traps.c
+--- linux-3.0.3/arch/alpha/kernel/traps.c      2010-10-21 13:06:46.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/alpha/kernel/traps.c        2011-06-10 22:11:24.000000000 +0200
 @@ -183,7 +183,8 @@ die_if_kernel(char * str, struct pt_regs
  #ifdef CONFIG_SMP
        printk("CPU %d ", hard_smp_processor_id());
@@ -1863,9 +1863,9 @@ diff -NurpP --minimal linux-3.0.1/arch/alpha/kernel/traps.c linux-3.0.1-vs2.3.1-
        dik_show_regs(regs, r9_15);
        add_taint(TAINT_DIE);
        dik_show_trace((unsigned long *)(regs+1));
-diff -NurpP --minimal linux-3.0.1/arch/arm/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/arm/Kconfig
---- linux-3.0.1/arch/arm/Kconfig       2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/arm/Kconfig  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/arm/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/arm/Kconfig
+--- linux-3.0.3/arch/arm/Kconfig       2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/arm/Kconfig 2011-06-10 22:11:24.000000000 +0200
 @@ -2035,6 +2035,8 @@ source "fs/Kconfig"
  
  source "arch/arm/Kconfig.debug"
@@ -1875,9 +1875,9 @@ diff -NurpP --minimal linux-3.0.1/arch/arm/Kconfig linux-3.0.1-vs2.3.1-pre9/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/calls.S linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/calls.S
---- linux-3.0.1/arch/arm/kernel/calls.S        2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/calls.S   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/calls.S linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/calls.S
+--- linux-3.0.3/arch/arm/kernel/calls.S        2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/calls.S  2011-06-10 22:11:24.000000000 +0200
 @@ -322,7 +322,7 @@
  /* 310 */     CALL(sys_request_key)
                CALL(sys_keyctl)
@@ -1887,9 +1887,9 @@ diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/calls.S linux-3.0.1-vs2.3.1-pr
                CALL(sys_ioprio_set)
  /* 315 */     CALL(sys_ioprio_get)
                CALL(sys_inotify_init)
-diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/process.c linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/process.c
---- linux-3.0.1/arch/arm/kernel/process.c      2011-05-22 16:16:47.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/process.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/process.c linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/process.c
+--- linux-3.0.3/arch/arm/kernel/process.c      2011-05-22 16:16:47.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/process.c        2011-06-10 22:11:24.000000000 +0200
 @@ -315,7 +315,8 @@ void __show_regs(struct pt_regs *regs)
  void show_regs(struct pt_regs * regs)
  {
@@ -1900,9 +1900,9 @@ diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/process.c linux-3.0.1-vs2.3.1-
        __show_regs(regs);
        __backtrace();
  }
-diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/traps.c
---- linux-3.0.1/arch/arm/kernel/traps.c        2011-07-22 11:17:32.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/arm/kernel/traps.c   2011-06-22 12:39:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/arm/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/traps.c
+--- linux-3.0.3/arch/arm/kernel/traps.c        2011-07-22 11:17:32.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/arm/kernel/traps.c  2011-06-22 12:39:12.000000000 +0200
 @@ -242,8 +242,8 @@ static int __die(const char *str, int er
  
        print_modules();
@@ -1914,9 +1914,9 @@ diff -NurpP --minimal linux-3.0.1/arch/arm/kernel/traps.c linux-3.0.1-vs2.3.1-pr
  
        if (!user_mode(regs) || in_interrupt()) {
                dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp,
-diff -NurpP --minimal linux-3.0.1/arch/cris/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/cris/Kconfig
---- linux-3.0.1/arch/cris/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/cris/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/cris/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/cris/Kconfig
+--- linux-3.0.3/arch/cris/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/cris/Kconfig        2011-06-10 22:11:24.000000000 +0200
 @@ -678,6 +678,8 @@ source "drivers/staging/Kconfig"
  
  source "arch/cris/Kconfig.debug"
@@ -1926,9 +1926,9 @@ diff -NurpP --minimal linux-3.0.1/arch/cris/Kconfig linux-3.0.1-vs2.3.1-pre9/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/frv/kernel/kernel_thread.S linux-3.0.1-vs2.3.1-pre9/arch/frv/kernel/kernel_thread.S
---- linux-3.0.1/arch/frv/kernel/kernel_thread.S        2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/frv/kernel/kernel_thread.S   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/frv/kernel/kernel_thread.S linux-3.0.3-vs2.3.1-pre10/arch/frv/kernel/kernel_thread.S
+--- linux-3.0.3/arch/frv/kernel/kernel_thread.S        2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/frv/kernel/kernel_thread.S  2011-06-10 22:11:24.000000000 +0200
 @@ -37,7 +37,7 @@ kernel_thread:
  
        # start by forking the current process, but with shared VM
@@ -1938,9 +1938,9 @@ diff -NurpP --minimal linux-3.0.1/arch/frv/kernel/kernel_thread.S linux-3.0.1-vs
        sethi.p         #0xe4e4,gr9             ; second syscall arg    [newsp]
        setlo           #0xe4e4,gr9
        setlos.p        #0,gr10                 ; third syscall arg     [parent_tidptr]
-diff -NurpP --minimal linux-3.0.1/arch/h8300/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/h8300/Kconfig
---- linux-3.0.1/arch/h8300/Kconfig     2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/h8300/Kconfig        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/h8300/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/h8300/Kconfig
+--- linux-3.0.3/arch/h8300/Kconfig     2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/h8300/Kconfig       2011-06-10 22:11:24.000000000 +0200
 @@ -213,6 +213,8 @@ source "fs/Kconfig"
  
  source "arch/h8300/Kconfig.debug"
@@ -1950,9 +1950,9 @@ diff -NurpP --minimal linux-3.0.1/arch/h8300/Kconfig linux-3.0.1-vs2.3.1-pre9/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/ia64/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/ia64/Kconfig
---- linux-3.0.1/arch/ia64/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/ia64/Kconfig
+--- linux-3.0.3/arch/ia64/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/Kconfig        2011-06-10 22:11:24.000000000 +0200
 @@ -671,6 +671,8 @@ source "fs/Kconfig"
  
  source "arch/ia64/Kconfig.debug"
@@ -1962,9 +1962,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/Kconfig linux-3.0.1-vs2.3.1-pre9/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/ia64/include/asm/tlb.h linux-3.0.1-vs2.3.1-pre9/arch/ia64/include/asm/tlb.h
---- linux-3.0.1/arch/ia64/include/asm/tlb.h    2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/include/asm/tlb.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/include/asm/tlb.h linux-3.0.3-vs2.3.1-pre10/arch/ia64/include/asm/tlb.h
+--- linux-3.0.3/arch/ia64/include/asm/tlb.h    2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/include/asm/tlb.h      2011-06-10 22:11:24.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -1973,9 +1973,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/include/asm/tlb.h linux-3.0.1-vs2.3.
  
  #include <asm/pgalloc.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/entry.S linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/entry.S
---- linux-3.0.1/arch/ia64/kernel/entry.S       2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/entry.S  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/entry.S linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/entry.S
+--- linux-3.0.3/arch/ia64/kernel/entry.S       2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/entry.S 2011-06-10 22:11:24.000000000 +0200
 @@ -1714,7 +1714,7 @@ sys_call_table:
        data8 sys_mq_notify
        data8 sys_mq_getsetattr
@@ -1985,9 +1985,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/entry.S linux-3.0.1-vs2.3.1-p
        data8 sys_waitid                        // 1270
        data8 sys_add_key
        data8 sys_request_key
-diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/perfmon.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/perfmon.c
---- linux-3.0.1/arch/ia64/kernel/perfmon.c     2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/perfmon.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/perfmon.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/perfmon.c
+--- linux-3.0.3/arch/ia64/kernel/perfmon.c     2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/perfmon.c       2011-06-10 22:11:24.000000000 +0200
 @@ -42,6 +42,7 @@
  #include <linux/completion.h>
  #include <linux/tracehook.h>
@@ -1996,9 +1996,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/perfmon.c linux-3.0.1-vs2.3.1
  
  #include <asm/errno.h>
  #include <asm/intrinsics.h>
-diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/process.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/process.c
---- linux-3.0.1/arch/ia64/kernel/process.c     2011-03-15 18:06:39.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/process.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/process.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/process.c
+--- linux-3.0.3/arch/ia64/kernel/process.c     2011-03-15 18:06:39.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/process.c       2011-06-10 22:11:24.000000000 +0200
 @@ -109,8 +109,8 @@ show_regs (struct pt_regs *regs)
        unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri;
  
@@ -2010,9 +2010,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/process.c linux-3.0.1-vs2.3.1
        printk("psr : %016lx ifs : %016lx ip  : [<%016lx>]    %s (%s)\n",
               regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(),
               init_utsname()->release);
-diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/ptrace.c
---- linux-3.0.1/arch/ia64/kernel/ptrace.c      2011-01-05 21:48:59.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/ptrace.c
+--- linux-3.0.3/arch/ia64/kernel/ptrace.c      2011-01-05 21:48:59.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/regset.h>
  #include <linux/elf.h>
@@ -2021,9 +2021,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/ptrace.c linux-3.0.1-vs2.3.1-
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/traps.c
---- linux-3.0.1/arch/ia64/kernel/traps.c       2010-07-07 18:31:01.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/kernel/traps.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/traps.c
+--- linux-3.0.3/arch/ia64/kernel/traps.c       2010-07-07 18:31:01.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
 @@ -59,8 +59,9 @@ die (const char *str, struct pt_regs *re
        put_cpu();
  
@@ -2048,9 +2048,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/kernel/traps.c linux-3.0.1-vs2.3.1-p
                        }
                }
        }
-diff -NurpP --minimal linux-3.0.1/arch/ia64/mm/fault.c linux-3.0.1-vs2.3.1-pre9/arch/ia64/mm/fault.c
---- linux-3.0.1/arch/ia64/mm/fault.c   2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/ia64/mm/fault.c      2011-06-10 22:28:23.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/ia64/mm/fault.c linux-3.0.3-vs2.3.1-pre10/arch/ia64/mm/fault.c
+--- linux-3.0.3/arch/ia64/mm/fault.c   2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/ia64/mm/fault.c     2011-06-10 22:28:23.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/kprobes.h>
  #include <linux/kdebug.h>
@@ -2059,9 +2059,9 @@ diff -NurpP --minimal linux-3.0.1/arch/ia64/mm/fault.c linux-3.0.1-vs2.3.1-pre9/
  
  #include <asm/pgtable.h>
  #include <asm/processor.h>
-diff -NurpP --minimal linux-3.0.1/arch/m32r/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/m32r/kernel/traps.c
---- linux-3.0.1/arch/m32r/kernel/traps.c       2009-12-03 20:01:57.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/m32r/kernel/traps.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/m32r/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/m32r/kernel/traps.c
+--- linux-3.0.3/arch/m32r/kernel/traps.c       2009-12-03 20:01:57.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/m32r/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
 @@ -196,8 +196,9 @@ static void show_registers(struct pt_reg
        } else {
                printk("SPI: %08lx\n", sp);
@@ -2074,9 +2074,9 @@ diff -NurpP --minimal linux-3.0.1/arch/m32r/kernel/traps.c linux-3.0.1-vs2.3.1-p
  
        /*
         * When in-kernel, we also print out the stack and code at the
-diff -NurpP --minimal linux-3.0.1/arch/m68k/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/m68k/Kconfig
---- linux-3.0.1/arch/m68k/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/m68k/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/m68k/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/m68k/Kconfig
+--- linux-3.0.3/arch/m68k/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/m68k/Kconfig        2011-06-10 22:11:24.000000000 +0200
 @@ -241,6 +241,8 @@ source "fs/Kconfig"
  
  source "arch/m68k/Kconfig.debug"
@@ -2086,9 +2086,9 @@ diff -NurpP --minimal linux-3.0.1/arch/m68k/Kconfig linux-3.0.1-vs2.3.1-pre9/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/mips/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/mips/Kconfig
---- linux-3.0.1/arch/mips/Kconfig      2011-07-22 11:17:35.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/mips/Kconfig 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/mips/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/mips/Kconfig
+--- linux-3.0.3/arch/mips/Kconfig      2011-07-22 11:17:35.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/mips/Kconfig        2011-06-10 22:11:24.000000000 +0200
 @@ -2485,6 +2485,8 @@ source "fs/Kconfig"
  
  source "arch/mips/Kconfig.debug"
@@ -2098,9 +2098,9 @@ diff -NurpP --minimal linux-3.0.1/arch/mips/Kconfig linux-3.0.1-vs2.3.1-pre9/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/ptrace.c
---- linux-3.0.1/arch/mips/kernel/ptrace.c      2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/ptrace.c
+--- linux-3.0.3/arch/mips/kernel/ptrace.c      2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/security.h>
  #include <linux/audit.h>
@@ -2119,9 +2119,9 @@ diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/ptrace.c linux-3.0.1-vs2.3.1-
        switch (request) {
        /* when I and D space are separate, these will need to be fixed. */
        case PTRACE_PEEKTEXT: /* read word at location addr. */
-diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall32-o32.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall32-o32.S
---- linux-3.0.1/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall32-o32.S    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall32-o32.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall32-o32.S
+--- linux-3.0.3/arch/mips/kernel/scall32-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall32-o32.S   2011-06-10 22:11:24.000000000 +0200
 @@ -523,7 +523,7 @@ einval:    li      v0, -ENOSYS
        sys     sys_mq_timedreceive     5
        sys     sys_mq_notify           2       /* 4275 */
@@ -2131,9 +2131,9 @@ diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall32-o32.S linux-3.0.1-vs2
        sys     sys_waitid              5
        sys     sys_ni_syscall          0       /* available, was setaltroot */
        sys     sys_add_key             5       /* 4280 */
-diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-64.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-64.S
---- linux-3.0.1/arch/mips/kernel/scall64-64.S  2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-64.S     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-64.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-64.S
+--- linux-3.0.3/arch/mips/kernel/scall64-64.S  2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-64.S    2011-06-10 22:11:24.000000000 +0200
 @@ -362,7 +362,7 @@ sys_call_table:
        PTR     sys_mq_timedreceive
        PTR     sys_mq_notify
@@ -2143,9 +2143,9 @@ diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-64.S linux-3.0.1-vs2.
        PTR     sys_waitid
        PTR     sys_ni_syscall                  /* available, was setaltroot */
        PTR     sys_add_key
-diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-n32.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-n32.S
---- linux-3.0.1/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-n32.S    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-n32.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-n32.S
+--- linux-3.0.3/arch/mips/kernel/scall64-n32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-n32.S   2011-06-10 22:11:24.000000000 +0200
 @@ -361,7 +361,7 @@ EXPORT(sysn32_call_table)
        PTR     compat_sys_mq_timedreceive
        PTR     compat_sys_mq_notify
@@ -2155,9 +2155,9 @@ diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-n32.S linux-3.0.1-vs2
        PTR     compat_sys_waitid
        PTR     sys_ni_syscall                  /* available, was setaltroot */
        PTR     sys_add_key
-diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-o32.S linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-o32.S
---- linux-3.0.1/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/scall64-o32.S    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/scall64-o32.S linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-o32.S
+--- linux-3.0.3/arch/mips/kernel/scall64-o32.S 2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/scall64-o32.S   2011-06-10 22:11:24.000000000 +0200
 @@ -480,7 +480,7 @@ sys_call_table:
        PTR     compat_sys_mq_timedreceive
        PTR     compat_sys_mq_notify            /* 4275 */
@@ -2167,9 +2167,9 @@ diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/scall64-o32.S linux-3.0.1-vs2
        PTR     sys_32_waitid
        PTR     sys_ni_syscall                  /* available, was setaltroot */
        PTR     sys_add_key                     /* 4280 */
-diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/traps.c
---- linux-3.0.1/arch/mips/kernel/traps.c       2011-05-22 16:17:00.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/mips/kernel/traps.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/mips/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/traps.c
+--- linux-3.0.3/arch/mips/kernel/traps.c       2011-05-22 16:17:00.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/mips/kernel/traps.c 2011-06-10 22:11:24.000000000 +0200
 @@ -343,9 +343,10 @@ void show_registers(struct pt_regs *regs
  
        __show_regs(regs);
@@ -2184,9 +2184,9 @@ diff -NurpP --minimal linux-3.0.1/arch/mips/kernel/traps.c linux-3.0.1-vs2.3.1-p
        if (cpu_has_userlocal) {
                unsigned long tls;
  
-diff -NurpP --minimal linux-3.0.1/arch/parisc/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/parisc/Kconfig
---- linux-3.0.1/arch/parisc/Kconfig    2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/Kconfig       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/parisc/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/parisc/Kconfig
+--- linux-3.0.3/arch/parisc/Kconfig    2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/Kconfig      2011-06-10 22:11:24.000000000 +0200
 @@ -279,6 +279,8 @@ source "fs/Kconfig"
  
  source "arch/parisc/Kconfig.debug"
@@ -2196,9 +2196,9 @@ diff -NurpP --minimal linux-3.0.1/arch/parisc/Kconfig linux-3.0.1-vs2.3.1-pre9/a
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/parisc/kernel/syscall_table.S linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/syscall_table.S
---- linux-3.0.1/arch/parisc/kernel/syscall_table.S     2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/syscall_table.S        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/parisc/kernel/syscall_table.S linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/syscall_table.S
+--- linux-3.0.3/arch/parisc/kernel/syscall_table.S     2011-08-29 03:10:18.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/syscall_table.S       2011-08-29 03:45:07.000000000 +0200
 @@ -361,7 +361,7 @@
        ENTRY_COMP(mbind)               /* 260 */
        ENTRY_COMP(get_mempolicy)
@@ -2208,9 +2208,9 @@ diff -NurpP --minimal linux-3.0.1/arch/parisc/kernel/syscall_table.S linux-3.0.1
        ENTRY_SAME(add_key)
        ENTRY_SAME(request_key)         /* 265 */
        ENTRY_SAME(keyctl)
-diff -NurpP --minimal linux-3.0.1/arch/parisc/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/traps.c
---- linux-3.0.1/arch/parisc/kernel/traps.c     2009-09-10 15:25:40.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/kernel/traps.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/parisc/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/traps.c
+--- linux-3.0.3/arch/parisc/kernel/traps.c     2009-09-10 15:25:40.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/kernel/traps.c       2011-06-10 22:11:24.000000000 +0200
 @@ -236,8 +236,9 @@ void die_if_kernel(char *str, struct pt_
                if (err == 0)
                        return; /* STFU */
@@ -2234,9 +2234,9 @@ diff -NurpP --minimal linux-3.0.1/arch/parisc/kernel/traps.c linux-3.0.1-vs2.3.1
  
        /* Wot's wrong wif bein' racy? */
        if (current->thread.flags & PARISC_KERNEL_DEATH) {
-diff -NurpP --minimal linux-3.0.1/arch/parisc/mm/fault.c linux-3.0.1-vs2.3.1-pre9/arch/parisc/mm/fault.c
---- linux-3.0.1/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/parisc/mm/fault.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/parisc/mm/fault.c linux-3.0.3-vs2.3.1-pre10/arch/parisc/mm/fault.c
+--- linux-3.0.3/arch/parisc/mm/fault.c 2010-08-02 16:52:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/parisc/mm/fault.c   2011-06-10 22:11:24.000000000 +0200
 @@ -237,8 +237,9 @@ bad_area:
  
  #ifdef PRINT_USER_FAULTS
@@ -2249,9 +2249,9 @@ diff -NurpP --minimal linux-3.0.1/arch/parisc/mm/fault.c linux-3.0.1-vs2.3.1-pre
                if (vma) {
                        printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n",
                                        vma->vm_start, vma->vm_end);
-diff -NurpP --minimal linux-3.0.1/arch/powerpc/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/powerpc/Kconfig
---- linux-3.0.1/arch/powerpc/Kconfig   2011-07-22 11:17:36.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/Kconfig      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/powerpc/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/powerpc/Kconfig
+--- linux-3.0.3/arch/powerpc/Kconfig   2011-07-22 11:17:36.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/Kconfig     2011-06-10 22:11:24.000000000 +0200
 @@ -978,6 +978,8 @@ source "lib/Kconfig"
  
  source "arch/powerpc/Kconfig.debug"
@@ -2261,9 +2261,9 @@ diff -NurpP --minimal linux-3.0.1/arch/powerpc/Kconfig linux-3.0.1-vs2.3.1-pre9/
  source "security/Kconfig"
  
  config KEYS_COMPAT
-diff -NurpP --minimal linux-3.0.1/arch/powerpc/include/asm/unistd.h linux-3.0.1-vs2.3.1-pre9/arch/powerpc/include/asm/unistd.h
---- linux-3.0.1/arch/powerpc/include/asm/unistd.h      2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/include/asm/unistd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/powerpc/include/asm/unistd.h linux-3.0.3-vs2.3.1-pre10/arch/powerpc/include/asm/unistd.h
+--- linux-3.0.3/arch/powerpc/include/asm/unistd.h      2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/include/asm/unistd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -275,7 +275,7 @@
  #endif
  #define __NR_rtas             255
@@ -2273,9 +2273,9 @@ diff -NurpP --minimal linux-3.0.1/arch/powerpc/include/asm/unistd.h linux-3.0.1-
  #define __NR_migrate_pages    258
  #define __NR_mbind            259
  #define __NR_get_mempolicy    260
-diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/process.c linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/process.c
---- linux-3.0.1/arch/powerpc/kernel/process.c  2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/process.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/process.c linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/process.c
+--- linux-3.0.3/arch/powerpc/kernel/process.c  2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/process.c    2011-06-10 22:11:24.000000000 +0200
 @@ -656,8 +656,9 @@ void show_regs(struct pt_regs * regs)
  #else
                printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr);
@@ -2288,9 +2288,9 @@ diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/process.c linux-3.0.1-vs2.
  
  #ifdef CONFIG_SMP
        printk(" CPU: %d", raw_smp_processor_id());
-diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/traps.c linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/traps.c
---- linux-3.0.1/arch/powerpc/kernel/traps.c    2011-07-22 11:17:40.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/traps.c       2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/traps.c linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/traps.c
+--- linux-3.0.3/arch/powerpc/kernel/traps.c    2011-07-22 11:17:40.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/traps.c      2011-07-19 00:44:39.000000000 +0200
 @@ -1075,8 +1075,9 @@ void nonrecoverable_exception(struct pt_
  
  void trace_syscall(struct pt_regs *regs)
@@ -2303,9 +2303,9 @@ diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/traps.c linux-3.0.1-vs2.3.
               regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted());
  }
  
-diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/vdso.c linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/vdso.c
---- linux-3.0.1/arch/powerpc/kernel/vdso.c     2011-05-22 16:17:02.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/powerpc/kernel/vdso.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/powerpc/kernel/vdso.c linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/vdso.c
+--- linux-3.0.3/arch/powerpc/kernel/vdso.c     2011-05-22 16:17:02.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/powerpc/kernel/vdso.c       2011-06-10 22:11:24.000000000 +0200
 @@ -23,6 +23,7 @@
  #include <linux/security.h>
  #include <linux/bootmem.h>
@@ -2314,9 +2314,9 @@ diff -NurpP --minimal linux-3.0.1/arch/powerpc/kernel/vdso.c linux-3.0.1-vs2.3.1
  
  #include <asm/pgtable.h>
  #include <asm/system.h>
-diff -NurpP --minimal linux-3.0.1/arch/s390/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/s390/Kconfig
---- linux-3.0.1/arch/s390/Kconfig      2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/s390/Kconfig 2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/s390/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/s390/Kconfig
+--- linux-3.0.3/arch/s390/Kconfig      2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/s390/Kconfig        2011-07-01 11:35:34.000000000 +0200
 @@ -628,6 +628,8 @@ source "fs/Kconfig"
  
  source "arch/s390/Kconfig.debug"
@@ -2326,9 +2326,9 @@ diff -NurpP --minimal linux-3.0.1/arch/s390/Kconfig linux-3.0.1-vs2.3.1-pre9/arc
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/s390/include/asm/tlb.h linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/tlb.h
---- linux-3.0.1/arch/s390/include/asm/tlb.h    2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/tlb.h       2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/s390/include/asm/tlb.h linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/tlb.h
+--- linux-3.0.3/arch/s390/include/asm/tlb.h    2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/tlb.h      2011-06-15 02:40:14.000000000 +0200
 @@ -24,6 +24,8 @@
  #include <linux/mm.h>
  #include <linux/pagemap.h>
@@ -2338,9 +2338,9 @@ diff -NurpP --minimal linux-3.0.1/arch/s390/include/asm/tlb.h linux-3.0.1-vs2.3.
  #include <asm/processor.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.1/arch/s390/include/asm/unistd.h linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/unistd.h
---- linux-3.0.1/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/s390/include/asm/unistd.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/s390/include/asm/unistd.h linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/unistd.h
+--- linux-3.0.3/arch/s390/include/asm/unistd.h 2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/s390/include/asm/unistd.h   2011-06-10 22:11:24.000000000 +0200
 @@ -202,7 +202,7 @@
  #define __NR_clock_gettime    (__NR_timer_create+6)
  #define __NR_clock_getres     (__NR_timer_create+7)
@@ -2350,9 +2350,9 @@ diff -NurpP --minimal linux-3.0.1/arch/s390/include/asm/unistd.h linux-3.0.1-vs2
  #define __NR_statfs64         265
  #define __NR_fstatfs64                266
  #define __NR_remap_file_pages 267
-diff -NurpP --minimal linux-3.0.1/arch/s390/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/ptrace.c
---- linux-3.0.1/arch/s390/kernel/ptrace.c      2011-03-15 18:06:45.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/ptrace.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/s390/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/ptrace.c
+--- linux-3.0.3/arch/s390/kernel/ptrace.c      2011-03-15 18:06:45.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/ptrace.c        2011-06-10 22:11:24.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/regset.h>
  #include <linux/tracehook.h>
@@ -2361,9 +2361,9 @@ diff -NurpP --minimal linux-3.0.1/arch/s390/kernel/ptrace.c linux-3.0.1-vs2.3.1-
  #include <trace/syscall.h>
  #include <asm/compat.h>
  #include <asm/segment.h>
-diff -NurpP --minimal linux-3.0.1/arch/s390/kernel/syscalls.S linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/syscalls.S
---- linux-3.0.1/arch/s390/kernel/syscalls.S    2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/s390/kernel/syscalls.S       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/s390/kernel/syscalls.S linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/syscalls.S
+--- linux-3.0.3/arch/s390/kernel/syscalls.S    2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/s390/kernel/syscalls.S      2011-06-10 22:11:24.000000000 +0200
 @@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett
  SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper)      /* 260 */
  SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper)
@@ -2373,9 +2373,9 @@ diff -NurpP --minimal linux-3.0.1/arch/s390/kernel/syscalls.S linux-3.0.1-vs2.3.
  SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper)
  SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper)
  SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper)
-diff -NurpP --minimal linux-3.0.1/arch/sh/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/sh/Kconfig
---- linux-3.0.1/arch/sh/Kconfig        2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sh/Kconfig   2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sh/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/sh/Kconfig
+--- linux-3.0.3/arch/sh/Kconfig        2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sh/Kconfig  2011-07-19 00:44:39.000000000 +0200
 @@ -893,6 +893,8 @@ source "fs/Kconfig"
  
  source "arch/sh/Kconfig.debug"
@@ -2385,9 +2385,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sh/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/sh/kernel/irq.c linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/irq.c
---- linux-3.0.1/arch/sh/kernel/irq.c   2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/irq.c      2011-07-19 00:45:06.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sh/kernel/irq.c linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/irq.c
+--- linux-3.0.3/arch/sh/kernel/irq.c   2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/irq.c     2011-07-19 00:45:06.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/ftrace.h>
  #include <linux/delay.h>
@@ -2396,9 +2396,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sh/kernel/irq.c linux-3.0.1-vs2.3.1-pre9/
  #include <asm/processor.h>
  #include <asm/machvec.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.1/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/vsyscall/vsyscall.c
---- linux-3.0.1/arch/sh/kernel/vsyscall/vsyscall.c     2011-05-22 16:17:07.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sh/kernel/vsyscall/vsyscall.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/vsyscall/vsyscall.c
+--- linux-3.0.3/arch/sh/kernel/vsyscall/vsyscall.c     2011-05-22 16:17:07.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sh/kernel/vsyscall/vsyscall.c       2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/elf.h>
  #include <linux/sched.h>
@@ -2407,9 +2407,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sh/kernel/vsyscall/vsyscall.c linux-3.0.1
  
  /*
   * Should the kernel map a VDSO page into processes and pass its
-diff -NurpP --minimal linux-3.0.1/arch/sparc/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/sparc/Kconfig
---- linux-3.0.1/arch/sparc/Kconfig     2011-07-22 11:17:41.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/Kconfig        2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sparc/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/sparc/Kconfig
+--- linux-3.0.3/arch/sparc/Kconfig     2011-07-22 11:17:41.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/Kconfig       2011-06-15 02:40:14.000000000 +0200
 @@ -601,6 +601,8 @@ source "fs/Kconfig"
  
  source "arch/sparc/Kconfig.debug"
@@ -2419,9 +2419,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sparc/Kconfig linux-3.0.1-vs2.3.1-pre9/ar
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/sparc/include/asm/tlb_64.h linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/tlb_64.h
---- linux-3.0.1/arch/sparc/include/asm/tlb_64.h        2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/tlb_64.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sparc/include/asm/tlb_64.h linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/tlb_64.h
+--- linux-3.0.3/arch/sparc/include/asm/tlb_64.h        2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/tlb_64.h  2011-06-10 22:11:24.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/swap.h>
@@ -2430,9 +2430,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sparc/include/asm/tlb_64.h linux-3.0.1-vs
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
  #include <asm/mmu_context.h>
-diff -NurpP --minimal linux-3.0.1/arch/sparc/include/asm/unistd.h linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/unistd.h
---- linux-3.0.1/arch/sparc/include/asm/unistd.h        2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/include/asm/unistd.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sparc/include/asm/unistd.h linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/unistd.h
+--- linux-3.0.3/arch/sparc/include/asm/unistd.h        2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/include/asm/unistd.h  2011-06-10 22:11:24.000000000 +0200
 @@ -335,7 +335,7 @@
  #define __NR_timer_getoverrun 264
  #define __NR_timer_delete     265
@@ -2442,9 +2442,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sparc/include/asm/unistd.h linux-3.0.1-vs
  #define __NR_io_setup         268
  #define __NR_io_destroy               269
  #define __NR_io_submit                270
-diff -NurpP --minimal linux-3.0.1/arch/sparc/kernel/systbls_32.S linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_32.S
---- linux-3.0.1/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_32.S    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sparc/kernel/systbls_32.S linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_32.S
+--- linux-3.0.3/arch/sparc/kernel/systbls_32.S 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_32.S   2011-06-10 22:11:24.000000000 +0200
 @@ -70,7 +70,7 @@ sys_call_table:
  /*250*/       .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nfsservctl
  /*255*/       .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep
@@ -2454,9 +2454,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sparc/kernel/systbls_32.S linux-3.0.1-vs2
  /*270*/       .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
  /*275*/       .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
  /*280*/       .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.1/arch/sparc/kernel/systbls_64.S linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_64.S
---- linux-3.0.1/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/sparc/kernel/systbls_64.S    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/sparc/kernel/systbls_64.S linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_64.S
+--- linux-3.0.3/arch/sparc/kernel/systbls_64.S 2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/sparc/kernel/systbls_64.S   2011-06-10 22:11:24.000000000 +0200
 @@ -71,7 +71,7 @@ sys_call_table32:
  /*250*/       .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl
        .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep
@@ -2475,9 +2475,9 @@ diff -NurpP --minimal linux-3.0.1/arch/sparc/kernel/systbls_64.S linux-3.0.1-vs2
  /*270*/       .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink
        .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid
  /*280*/       .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat
-diff -NurpP --minimal linux-3.0.1/arch/um/Kconfig.rest linux-3.0.1-vs2.3.1-pre9/arch/um/Kconfig.rest
---- linux-3.0.1/arch/um/Kconfig.rest   2009-06-11 17:12:19.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/um/Kconfig.rest      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/um/Kconfig.rest linux-3.0.3-vs2.3.1-pre10/arch/um/Kconfig.rest
+--- linux-3.0.3/arch/um/Kconfig.rest   2009-06-11 17:12:19.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/um/Kconfig.rest     2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
  
  source "fs/Kconfig"
@@ -2487,9 +2487,9 @@ diff -NurpP --minimal linux-3.0.1/arch/um/Kconfig.rest linux-3.0.1-vs2.3.1-pre9/
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/um/include/asm/tlb.h linux-3.0.1-vs2.3.1-pre9/arch/um/include/asm/tlb.h
---- linux-3.0.1/arch/um/include/asm/tlb.h      2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/um/include/asm/tlb.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/um/include/asm/tlb.h linux-3.0.3-vs2.3.1-pre10/arch/um/include/asm/tlb.h
+--- linux-3.0.3/arch/um/include/asm/tlb.h      2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/um/include/asm/tlb.h        2011-06-10 22:11:24.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/pagemap.h>
@@ -2498,14 +2498,14 @@ diff -NurpP --minimal linux-3.0.1/arch/um/include/asm/tlb.h linux-3.0.1-vs2.3.1-
  #include <asm/percpu.h>
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
-diff -NurpP --minimal linux-3.0.1/arch/um/include/shared/kern_constants.h linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/kern_constants.h
---- linux-3.0.1/arch/um/include/shared/kern_constants.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/kern_constants.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/um/include/shared/kern_constants.h linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/kern_constants.h
+--- linux-3.0.3/arch/um/include/shared/kern_constants.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/kern_constants.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1 @@
 +#include "../../../../include/generated/asm-offsets.h"
-diff -NurpP --minimal linux-3.0.1/arch/um/include/shared/user_constants.h linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/user_constants.h
---- linux-3.0.1/arch/um/include/shared/user_constants.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/arch/um/include/shared/user_constants.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/um/include/shared/user_constants.h linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/user_constants.h
+--- linux-3.0.3/arch/um/include/shared/user_constants.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/arch/um/include/shared/user_constants.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,40 @@
 +/*
 + * DO NOT MODIFY.
@@ -2547,9 +2547,9 @@ diff -NurpP --minimal linux-3.0.1/arch/um/include/shared/user_constants.h linux-
 +#define UM_PROT_WRITE 2 /* PROT_WRITE # */
 +#define UM_PROT_EXEC 4 /* PROT_EXEC   # */
 +
-diff -NurpP --minimal linux-3.0.1/arch/x86/Kconfig linux-3.0.1-vs2.3.1-pre9/arch/x86/Kconfig
---- linux-3.0.1/arch/x86/Kconfig       2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/x86/Kconfig  2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/x86/Kconfig linux-3.0.3-vs2.3.1-pre10/arch/x86/Kconfig
+--- linux-3.0.3/arch/x86/Kconfig       2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/x86/Kconfig 2011-07-22 11:20:39.000000000 +0200
 @@ -2159,6 +2159,8 @@ source "fs/Kconfig"
  
  source "arch/x86/Kconfig.debug"
@@ -2559,9 +2559,9 @@ diff -NurpP --minimal linux-3.0.1/arch/x86/Kconfig linux-3.0.1-vs2.3.1-pre9/arch
  source "security/Kconfig"
  
  source "crypto/Kconfig"
-diff -NurpP --minimal linux-3.0.1/arch/x86/ia32/ia32entry.S linux-3.0.1-vs2.3.1-pre9/arch/x86/ia32/ia32entry.S
---- linux-3.0.1/arch/x86/ia32/ia32entry.S      2011-07-22 11:17:42.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/x86/ia32/ia32entry.S 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/x86/ia32/ia32entry.S linux-3.0.3-vs2.3.1-pre10/arch/x86/ia32/ia32entry.S
+--- linux-3.0.3/arch/x86/ia32/ia32entry.S      2011-07-22 11:17:42.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/x86/ia32/ia32entry.S        2011-06-10 22:11:24.000000000 +0200
 @@ -776,7 +776,7 @@ ia32_sys_call_table:
        .quad sys_tgkill                /* 270 */
        .quad compat_sys_utimes
@@ -2571,9 +2571,9 @@ diff -NurpP --minimal linux-3.0.1/arch/x86/ia32/ia32entry.S linux-3.0.1-vs2.3.1-
        .quad sys_mbind
        .quad compat_sys_get_mempolicy  /* 275 */
        .quad sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.1/arch/x86/include/asm/unistd_64.h linux-3.0.1-vs2.3.1-pre9/arch/x86/include/asm/unistd_64.h
---- linux-3.0.1/arch/x86/include/asm/unistd_64.h       2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/x86/include/asm/unistd_64.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/x86/include/asm/unistd_64.h linux-3.0.3-vs2.3.1-pre10/arch/x86/include/asm/unistd_64.h
+--- linux-3.0.3/arch/x86/include/asm/unistd_64.h       2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/x86/include/asm/unistd_64.h 2011-06-10 22:11:24.000000000 +0200
 @@ -535,7 +535,7 @@ __SYSCALL(__NR_tgkill, sys_tgkill)
  #define __NR_utimes                           235
  __SYSCALL(__NR_utimes, sys_utimes)
@@ -2583,9 +2583,9 @@ diff -NurpP --minimal linux-3.0.1/arch/x86/include/asm/unistd_64.h linux-3.0.1-v
  #define __NR_mbind                            237
  __SYSCALL(__NR_mbind, sys_mbind)
  #define __NR_set_mempolicy                    238
-diff -NurpP --minimal linux-3.0.1/arch/x86/kernel/syscall_table_32.S linux-3.0.1-vs2.3.1-pre9/arch/x86/kernel/syscall_table_32.S
---- linux-3.0.1/arch/x86/kernel/syscall_table_32.S     2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/arch/x86/kernel/syscall_table_32.S        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/arch/x86/kernel/syscall_table_32.S linux-3.0.3-vs2.3.1-pre10/arch/x86/kernel/syscall_table_32.S
+--- linux-3.0.3/arch/x86/kernel/syscall_table_32.S     2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/arch/x86/kernel/syscall_table_32.S       2011-06-10 22:11:24.000000000 +0200
 @@ -272,7 +272,7 @@ ENTRY(sys_call_table)
        .long sys_tgkill        /* 270 */
        .long sys_utimes
@@ -2595,9 +2595,9 @@ diff -NurpP --minimal linux-3.0.1/arch/x86/kernel/syscall_table_32.S linux-3.0.1
        .long sys_mbind
        .long sys_get_mempolicy
        .long sys_set_mempolicy
-diff -NurpP --minimal linux-3.0.1/block/genhd.c linux-3.0.1-vs2.3.1-pre9/block/genhd.c
---- linux-3.0.1/block/genhd.c  2011-07-22 11:17:43.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/block/genhd.c     2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/block/genhd.c linux-3.0.3-vs2.3.1-pre10/block/genhd.c
+--- linux-3.0.3/block/genhd.c  2011-07-22 11:17:43.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/block/genhd.c    2011-07-01 11:35:34.000000000 +0200
 @@ -1154,17 +1154,17 @@ static int diskstats_show(struct seq_fil
                cpu = part_stat_lock();
                part_round_stats(cpu, hd);
@@ -2620,9 +2620,9 @@ diff -NurpP --minimal linux-3.0.1/block/genhd.c linux-3.0.1-vs2.3.1-pre9/block/g
                           jiffies_to_msecs(part_stat_read(hd, ticks[WRITE])),
                           part_in_flight(hd),
                           jiffies_to_msecs(part_stat_read(hd, io_ticks)),
-diff -NurpP --minimal linux-3.0.1/drivers/block/Kconfig linux-3.0.1-vs2.3.1-pre9/drivers/block/Kconfig
---- linux-3.0.1/drivers/block/Kconfig  2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/block/Kconfig     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/block/Kconfig linux-3.0.3-vs2.3.1-pre10/drivers/block/Kconfig
+--- linux-3.0.3/drivers/block/Kconfig  2011-07-22 11:17:44.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/block/Kconfig    2011-06-10 22:11:24.000000000 +0200
 @@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP
  
  source "drivers/block/drbd/Kconfig"
@@ -2637,9 +2637,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/block/Kconfig linux-3.0.1-vs2.3.1-pre9
  config BLK_DEV_NBD
        tristate "Network block device support"
        depends on NET
-diff -NurpP --minimal linux-3.0.1/drivers/block/Makefile linux-3.0.1-vs2.3.1-pre9/drivers/block/Makefile
---- linux-3.0.1/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/block/Makefile    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/block/Makefile linux-3.0.3-vs2.3.1-pre10/drivers/block/Makefile
+--- linux-3.0.3/drivers/block/Makefile 2011-07-22 11:17:44.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/block/Makefile   2011-06-10 22:11:24.000000000 +0200
 @@ -34,6 +34,7 @@ obj-$(CONFIG_VIODASD)                += viodasd.o
  obj-$(CONFIG_BLK_DEV_SX8)     += sx8.o
  obj-$(CONFIG_BLK_DEV_UB)      += ub.o
@@ -2648,9 +2648,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/block/Makefile linux-3.0.1-vs2.3.1-pre
  
  obj-$(CONFIG_XEN_BLKDEV_FRONTEND)     += xen-blkfront.o
  obj-$(CONFIG_XEN_BLKDEV_BACKEND)      += xen-blkback/
-diff -NurpP --minimal linux-3.0.1/drivers/block/loop.c linux-3.0.1-vs2.3.1-pre9/drivers/block/loop.c
---- linux-3.0.1/drivers/block/loop.c   2011-07-22 11:17:44.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/block/loop.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/block/loop.c linux-3.0.3-vs2.3.1-pre10/drivers/block/loop.c
+--- linux-3.0.3/drivers/block/loop.c   2011-07-22 11:17:44.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/block/loop.c     2011-06-10 22:11:24.000000000 +0200
 @@ -75,6 +75,7 @@
  #include <linux/kthread.h>
  #include <linux/splice.h>
@@ -2704,9 +2704,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/block/loop.c linux-3.0.1-vs2.3.1-pre9/
        mutex_lock(&lo->lo_ctl_mutex);
        lo->lo_refcnt++;
        mutex_unlock(&lo->lo_ctl_mutex);
-diff -NurpP --minimal linux-3.0.1/drivers/block/vroot.c linux-3.0.1-vs2.3.1-pre9/drivers/block/vroot.c
---- linux-3.0.1/drivers/block/vroot.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/block/vroot.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/block/vroot.c linux-3.0.3-vs2.3.1-pre10/drivers/block/vroot.c
+--- linux-3.0.3/drivers/block/vroot.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/block/vroot.c    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,292 @@
 +/*
 + *  linux/drivers/block/vroot.c
@@ -3000,9 +3000,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/block/vroot.c linux-3.0.1-vs2.3.1-pre9
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r100_reg_safe.h
---- linux-3.0.1/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r100_reg_safe.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r100_reg_safe.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/r100_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r100_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,28 @@
 +static const unsigned r100_reg_safe_bm[102] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3032,9 +3032,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r100_reg_safe.h linux-3
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFEF,
 +};
-diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r200_reg_safe.h
---- linux-3.0.1/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r200_reg_safe.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r200_reg_safe.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/r200_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r200_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,28 @@
 +static const unsigned r200_reg_safe_bm[102] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3064,9 +3064,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r200_reg_safe.h linux-3
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFE3F, 0xFFFFFFEF,
 +};
-diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r300_reg_safe.h
---- linux-3.0.1/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r300_reg_safe.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r300_reg_safe.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/r300_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r300_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,42 @@
 +static const unsigned r300_reg_safe_bm[159] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3110,9 +3110,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r300_reg_safe.h linux-3
 +      0x00000000, 0x00000000, 0x00000000, 0x00000000,
 +      0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
 +};
-diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r420_reg_safe.h
---- linux-3.0.1/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/r420_reg_safe.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r420_reg_safe.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/r420_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/r420_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,42 @@
 +static const unsigned r420_reg_safe_bm[159] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3156,9 +3156,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/r420_reg_safe.h linux-3
 +      0x00000000, 0x00000000, 0x00000000, 0x00000000,
 +      0x0003FC01, 0xFFFFFCF8, 0xFF800B19,
 +};
-diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rn50_reg_safe.h
---- linux-3.0.1/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rn50_reg_safe.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rn50_reg_safe.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/rn50_reg_safe.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rn50_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,28 @@
 +static const unsigned rn50_reg_safe_bm[102] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3188,9 +3188,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rn50_reg_safe.h linux-3
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFFF,
 +};
-diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rs600_reg_safe.h
---- linux-3.0.1/drivers/gpu/drm/radeon/rs600_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rs600_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rs600_reg_safe.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/rs600_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rs600_reg_safe.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,57 @@
 +static const unsigned rs600_reg_safe_bm[219] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3249,9 +3249,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rs600_reg_safe.h linux-
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +};
-diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rv515_reg_safe.h
---- linux-3.0.1/drivers/gpu/drm/radeon/rv515_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/gpu/drm/radeon/rv515_reg_safe.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rv515_reg_safe.h
+--- linux-3.0.3/drivers/gpu/drm/radeon/rv515_reg_safe.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/drivers/gpu/drm/radeon/rv515_reg_safe.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,57 @@
 +static const unsigned rv515_reg_safe_bm[219] = {
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
@@ -3310,9 +3310,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/gpu/drm/radeon/rv515_reg_safe.h linux-
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +      0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
 +};
-diff -NurpP --minimal linux-3.0.1/drivers/infiniband/core/addr.c linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/core/addr.c
---- linux-3.0.1/drivers/infiniband/core/addr.c 2011-07-22 11:17:45.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/core/addr.c    2011-06-16 14:16:51.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/infiniband/core/addr.c linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/core/addr.c
+--- linux-3.0.3/drivers/infiniband/core/addr.c 2011-07-22 11:17:45.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/core/addr.c   2011-06-16 14:16:51.000000000 +0200
 @@ -252,7 +252,7 @@ static int addr6_resolve(struct sockaddr
  
        if (ipv6_addr_any(&fl6.saddr)) {
@@ -3322,9 +3322,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/infiniband/core/addr.c linux-3.0.1-vs2
                if (ret)
                        goto put;
  
-diff -NurpP --minimal linux-3.0.1/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/hw/ipath/ipath_user_pages.c
---- linux-3.0.1/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/infiniband/hw/ipath/ipath_user_pages.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/infiniband/hw/ipath/ipath_user_pages.c linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/hw/ipath/ipath_user_pages.c
+--- linux-3.0.3/drivers/infiniband/hw/ipath/ipath_user_pages.c 2011-05-22 16:17:16.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/infiniband/hw/ipath/ipath_user_pages.c   2011-06-10 22:11:24.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <linux/device.h>
  #include <linux/slab.h>
@@ -3333,9 +3333,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/infiniband/hw/ipath/ipath_user_pages.c
  
  #include "ipath_kernel.h"
  
-diff -NurpP --minimal linux-3.0.1/drivers/md/dm-ioctl.c linux-3.0.1-vs2.3.1-pre9/drivers/md/dm-ioctl.c
---- linux-3.0.1/drivers/md/dm-ioctl.c  2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/md/dm-ioctl.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/md/dm-ioctl.c linux-3.0.3-vs2.3.1-pre10/drivers/md/dm-ioctl.c
+--- linux-3.0.3/drivers/md/dm-ioctl.c  2011-05-22 16:17:18.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/md/dm-ioctl.c    2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/dm-ioctl.h>
  #include <linux/hdreg.h>
@@ -3417,9 +3417,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/md/dm-ioctl.c linux-3.0.1-vs2.3.1-pre9
                return -EACCES;
  
        if (_IOC_TYPE(command) != DM_IOCTL)
-diff -NurpP --minimal linux-3.0.1/drivers/md/dm.c linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.c
---- linux-3.0.1/drivers/md/dm.c        2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.c   2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/md/dm.c linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.c
+--- linux-3.0.3/drivers/md/dm.c        2011-08-29 03:10:21.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.c  2011-08-08 23:04:47.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/idr.h>
  #include <linux/hdreg.h>
@@ -3493,9 +3493,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/md/dm.c linux-3.0.1-vs2.3.1-pre9/drive
        md->queue = blk_alloc_queue(GFP_KERNEL);
        if (!md->queue)
                goto bad_queue;
-diff -NurpP --minimal linux-3.0.1/drivers/md/dm.h linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.h
---- linux-3.0.1/drivers/md/dm.h        2011-05-22 16:17:18.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/md/dm.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/md/dm.h linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.h
+--- linux-3.0.3/drivers/md/dm.h        2011-05-22 16:17:18.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/md/dm.h  2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,8 @@ struct dm_dev_internal {
  struct dm_table;
  struct dm_md_mempools;
@@ -3505,9 +3505,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/md/dm.h linux-3.0.1-vs2.3.1-pre9/drive
  /*-----------------------------------------------------------------
   * Internal table functions.
   *---------------------------------------------------------------*/
-diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/drivers/net/tun.c
---- linux-3.0.1/drivers/net/tun.c      2011-07-22 11:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/net/tun.c 2011-06-22 12:39:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/net/tun.c linux-3.0.3-vs2.3.1-pre10/drivers/net/tun.c
+--- linux-3.0.3/drivers/net/tun.c      2011-08-29 03:10:21.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/net/tun.c        2011-08-29 03:45:08.000000000 +0200
 @@ -64,6 +64,7 @@
  #include <linux/nsproxy.h>
  #include <linux/virtio_net.h>
@@ -3524,7 +3524,7 @@ diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/dri
  
        struct net_device       *dev;
        u32                     set_features;
-@@ -904,6 +906,7 @@ static void tun_setup(struct net_device 
+@@ -905,6 +907,7 @@ static void tun_setup(struct net_device 
  
        tun->owner = -1;
        tun->group = -1;
@@ -3532,7 +3532,7 @@ diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/dri
  
        dev->ethtool_ops = &tun_ethtool_ops;
        dev->destructor = tun_free_netdev;
-@@ -1054,7 +1057,7 @@ static int tun_set_iff(struct net *net, 
+@@ -1055,7 +1058,7 @@ static int tun_set_iff(struct net *net, 
  
                if (((tun->owner != -1 && cred->euid != tun->owner) ||
                     (tun->group != -1 && !in_egroup_p(tun->group))) &&
@@ -3541,7 +3541,7 @@ diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/dri
                        return -EPERM;
                err = security_tun_dev_attach(tun->socket.sk);
                if (err < 0)
-@@ -1068,7 +1071,7 @@ static int tun_set_iff(struct net *net, 
+@@ -1069,7 +1072,7 @@ static int tun_set_iff(struct net *net, 
                char *name;
                unsigned long flags = 0;
  
@@ -3550,7 +3550,7 @@ diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/dri
                        return -EPERM;
                err = security_tun_dev_create();
                if (err < 0)
-@@ -1136,6 +1139,9 @@ static int tun_set_iff(struct net *net, 
+@@ -1137,6 +1140,9 @@ static int tun_set_iff(struct net *net, 
  
                sk->sk_destruct = tun_sock_destruct;
  
@@ -3560,7 +3560,7 @@ diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/dri
                err = tun_attach(tun, file);
                if (err < 0)
                        goto failed;
-@@ -1317,6 +1323,16 @@ static long __tun_chr_ioctl(struct file 
+@@ -1318,6 +1324,16 @@ static long __tun_chr_ioctl(struct file 
                tun_debug(KERN_INFO, tun, "group set to %d\n", tun->group);
                break;
  
@@ -3577,9 +3577,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/net/tun.c linux-3.0.1-vs2.3.1-pre9/dri
        case TUNSETLINK:
                /* Only allow setting the type when the interface is down */
                if (tun->dev->flags & IFF_UP) {
-diff -NurpP --minimal linux-3.0.1/drivers/tty/sysrq.c linux-3.0.1-vs2.3.1-pre9/drivers/tty/sysrq.c
---- linux-3.0.1/drivers/tty/sysrq.c    2011-05-22 16:17:44.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/tty/sysrq.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/tty/sysrq.c linux-3.0.3-vs2.3.1-pre10/drivers/tty/sysrq.c
+--- linux-3.0.3/drivers/tty/sysrq.c    2011-05-22 16:17:44.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/tty/sysrq.c      2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/oom.h>
  #include <linux/slab.h>
@@ -3631,9 +3631,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/tty/sysrq.c linux-3.0.1-vs2.3.1-pre9/d
        else
                retval = -1;
        return retval;
-diff -NurpP --minimal linux-3.0.1/drivers/tty/tty_io.c linux-3.0.1-vs2.3.1-pre9/drivers/tty/tty_io.c
---- linux-3.0.1/drivers/tty/tty_io.c   2011-07-22 11:18:03.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/drivers/tty/tty_io.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/drivers/tty/tty_io.c linux-3.0.3-vs2.3.1-pre10/drivers/tty/tty_io.c
+--- linux-3.0.3/drivers/tty/tty_io.c   2011-07-22 11:18:03.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/drivers/tty/tty_io.c     2011-06-10 22:11:24.000000000 +0200
 @@ -104,6 +104,7 @@
  
  #include <linux/kmod.h>
@@ -3660,9 +3660,9 @@ diff -NurpP --minimal linux-3.0.1/drivers/tty/tty_io.c linux-3.0.1-vs2.3.1-pre9/
        if (pgrp_nr < 0)
                return -EINVAL;
        rcu_read_lock();
-diff -NurpP --minimal linux-3.0.1/fs/attr.c linux-3.0.1-vs2.3.1-pre9/fs/attr.c
---- linux-3.0.1/fs/attr.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/attr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/attr.c linux-3.0.3-vs2.3.1-pre10/fs/attr.c
+--- linux-3.0.3/fs/attr.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/attr.c        2011-06-10 22:11:24.000000000 +0200
 @@ -13,6 +13,9 @@
  #include <linux/fsnotify.h>
  #include <linux/fcntl.h>
@@ -3703,9 +3703,9 @@ diff -NurpP --minimal linux-3.0.1/fs/attr.c linux-3.0.1-vs2.3.1-pre9/fs/attr.c
                if (IS_IMMUTABLE(inode) || IS_APPEND(inode))
                        return -EPERM;
        }
-diff -NurpP --minimal linux-3.0.1/fs/binfmt_aout.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_aout.c
---- linux-3.0.1/fs/binfmt_aout.c       2010-10-21 13:07:47.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_aout.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/binfmt_aout.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_aout.c
+--- linux-3.0.3/fs/binfmt_aout.c       2010-10-21 13:07:47.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_aout.c 2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/init.h>
  #include <linux/coredump.h>
@@ -3714,9 +3714,9 @@ diff -NurpP --minimal linux-3.0.1/fs/binfmt_aout.c linux-3.0.1-vs2.3.1-pre9/fs/b
  
  #include <asm/system.h>
  #include <asm/uaccess.h>
-diff -NurpP --minimal linux-3.0.1/fs/binfmt_elf.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_elf.c
---- linux-3.0.1/fs/binfmt_elf.c        2011-05-22 16:17:48.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_elf.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/binfmt_elf.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_elf.c
+--- linux-3.0.3/fs/binfmt_elf.c        2011-05-22 16:17:48.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_elf.c  2011-06-10 22:11:24.000000000 +0200
 @@ -32,6 +32,7 @@
  #include <linux/elf.h>
  #include <linux/utsname.h>
@@ -3725,9 +3725,9 @@ diff -NurpP --minimal linux-3.0.1/fs/binfmt_elf.c linux-3.0.1-vs2.3.1-pre9/fs/bi
  #include <asm/uaccess.h>
  #include <asm/param.h>
  #include <asm/page.h>
-diff -NurpP --minimal linux-3.0.1/fs/binfmt_flat.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_flat.c
---- linux-3.0.1/fs/binfmt_flat.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_flat.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/binfmt_flat.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_flat.c
+--- linux-3.0.3/fs/binfmt_flat.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_flat.c 2011-06-10 22:11:24.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <linux/init.h>
  #include <linux/flat.h>
@@ -3736,9 +3736,9 @@ diff -NurpP --minimal linux-3.0.1/fs/binfmt_flat.c linux-3.0.1-vs2.3.1-pre9/fs/b
  
  #include <asm/byteorder.h>
  #include <asm/system.h>
-diff -NurpP --minimal linux-3.0.1/fs/binfmt_som.c linux-3.0.1-vs2.3.1-pre9/fs/binfmt_som.c
---- linux-3.0.1/fs/binfmt_som.c        2010-02-25 11:52:04.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/binfmt_som.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/binfmt_som.c linux-3.0.3-vs2.3.1-pre10/fs/binfmt_som.c
+--- linux-3.0.3/fs/binfmt_som.c        2010-02-25 11:52:04.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/binfmt_som.c  2011-06-10 22:11:24.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/shm.h>
  #include <linux/personality.h>
@@ -3747,9 +3747,9 @@ diff -NurpP --minimal linux-3.0.1/fs/binfmt_som.c linux-3.0.1-vs2.3.1-pre9/fs/bi
  
  #include <asm/uaccess.h>
  #include <asm/pgtable.h>
-diff -NurpP --minimal linux-3.0.1/fs/block_dev.c linux-3.0.1-vs2.3.1-pre9/fs/block_dev.c
---- linux-3.0.1/fs/block_dev.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/block_dev.c    2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/block_dev.c linux-3.0.3-vs2.3.1-pre10/fs/block_dev.c
+--- linux-3.0.3/fs/block_dev.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/block_dev.c   2011-07-01 11:35:34.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/namei.h>
  #include <linux/log2.h>
@@ -3787,9 +3787,9 @@ diff -NurpP --minimal linux-3.0.1/fs/block_dev.c linux-3.0.1-vs2.3.1-pre9/fs/blo
        if (bdev) {
                spin_lock(&bdev_lock);
                if (!inode->i_bdev) {
-diff -NurpP --minimal linux-3.0.1/fs/btrfs/ctree.h linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ctree.h
---- linux-3.0.1/fs/btrfs/ctree.h       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ctree.h  2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/btrfs/ctree.h linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ctree.h
+--- linux-3.0.3/fs/btrfs/ctree.h       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ctree.h 2011-07-19 00:44:39.000000000 +0200
 @@ -600,11 +600,14 @@ struct btrfs_inode_item {
        /* modification sequence number for NFS */
        __le64 sequence;
@@ -3842,9 +3842,9 @@ diff -NurpP --minimal linux-3.0.1/fs/btrfs/ctree.h linux-3.0.1-vs2.3.1-pre9/fs/b
  int btrfs_defrag_file(struct inode *inode, struct file *file,
                      struct btrfs_ioctl_defrag_range_args *range,
                      u64 newer_than, unsigned long max_pages);
-diff -NurpP --minimal linux-3.0.1/fs/btrfs/disk-io.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/disk-io.c
---- linux-3.0.1/fs/btrfs/disk-io.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/disk-io.c        2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/btrfs/disk-io.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/disk-io.c
+--- linux-3.0.3/fs/btrfs/disk-io.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/disk-io.c       2011-06-22 12:39:15.000000000 +0200
 @@ -1765,6 +1765,9 @@ struct btrfs_root *open_ctree(struct sup
                goto fail_alloc;
        }
@@ -3855,9 +3855,9 @@ diff -NurpP --minimal linux-3.0.1/fs/btrfs/disk-io.c linux-3.0.1-vs2.3.1-pre9/fs
        features = btrfs_super_incompat_flags(disk_super) &
                ~BTRFS_FEATURE_INCOMPAT_SUPP;
        if (features) {
-diff -NurpP --minimal linux-3.0.1/fs/btrfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/inode.c
---- linux-3.0.1/fs/btrfs/inode.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/inode.c  2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/btrfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/inode.c
+--- linux-3.0.3/fs/btrfs/inode.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/inode.c 2011-07-19 00:44:39.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <linux/falloc.h>
  #include <linux/slab.h>
@@ -3931,9 +3931,9 @@ diff -NurpP --minimal linux-3.0.1/fs/btrfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/b
  };
  static const struct inode_operations btrfs_special_inode_operations = {
        .getattr        = btrfs_getattr,
-diff -NurpP --minimal linux-3.0.1/fs/btrfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ioctl.c
---- linux-3.0.1/fs/btrfs/ioctl.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/ioctl.c  2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/btrfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ioctl.c
+--- linux-3.0.3/fs/btrfs/ioctl.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/ioctl.c 2011-06-22 12:39:15.000000000 +0200
 @@ -70,10 +70,13 @@ static unsigned int btrfs_flags_to_ioctl
  {
        unsigned int iflags = 0;
@@ -4107,9 +4107,9 @@ diff -NurpP --minimal linux-3.0.1/fs/btrfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/b
        if (flags & FS_APPEND_FL)
                ip->flags |= BTRFS_INODE_APPEND;
        else
-diff -NurpP --minimal linux-3.0.1/fs/btrfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/btrfs/super.c
---- linux-3.0.1/fs/btrfs/super.c       2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/btrfs/super.c  2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/btrfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/btrfs/super.c
+--- linux-3.0.3/fs/btrfs/super.c       2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/btrfs/super.c 2011-07-19 00:44:39.000000000 +0200
 @@ -162,7 +162,7 @@ enum {
        Opt_notreelog, Opt_ratio, Opt_flushoncommit, Opt_discard,
        Opt_space_cache, Opt_clear_cache, Opt_user_subvol_rm_allowed,
@@ -4165,9 +4165,9 @@ diff -NurpP --minimal linux-3.0.1/fs/btrfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/b
        if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY))
                return 0;
  
-diff -NurpP --minimal linux-3.0.1/fs/char_dev.c linux-3.0.1-vs2.3.1-pre9/fs/char_dev.c
---- linux-3.0.1/fs/char_dev.c  2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/char_dev.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/char_dev.c linux-3.0.3-vs2.3.1-pre10/fs/char_dev.c
+--- linux-3.0.3/fs/char_dev.c  2011-03-15 18:07:31.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/char_dev.c    2011-06-10 22:11:24.000000000 +0200
 @@ -21,6 +21,8 @@
  #include <linux/mutex.h>
  #include <linux/backing-dev.h>
@@ -4200,9 +4200,9 @@ diff -NurpP --minimal linux-3.0.1/fs/char_dev.c linux-3.0.1-vs2.3.1-pre9/fs/char
                if (!kobj)
                        return -ENXIO;
                new = container_of(kobj, struct cdev, kobj);
-diff -NurpP --minimal linux-3.0.1/fs/dcache.c linux-3.0.1-vs2.3.1-pre9/fs/dcache.c
---- linux-3.0.1/fs/dcache.c    2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/dcache.c       2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/dcache.c linux-3.0.3-vs2.3.1-pre10/fs/dcache.c
+--- linux-3.0.3/fs/dcache.c    2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/dcache.c      2011-07-22 11:20:39.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/bit_spinlock.h>
  #include <linux/rculist_bl.h>
@@ -4254,9 +4254,9 @@ diff -NurpP --minimal linux-3.0.1/fs/dcache.c linux-3.0.1-vs2.3.1-pre9/fs/dcache
                found = dentry;
                spin_unlock(&dentry->d_lock);
                break;
-diff -NurpP --minimal linux-3.0.1/fs/devpts/inode.c linux-3.0.1-vs2.3.1-pre9/fs/devpts/inode.c
---- linux-3.0.1/fs/devpts/inode.c      2011-05-22 16:17:50.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/devpts/inode.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/devpts/inode.c linux-3.0.3-vs2.3.1-pre10/fs/devpts/inode.c
+--- linux-3.0.3/fs/devpts/inode.c      2011-05-22 16:17:50.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/devpts/inode.c        2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  #include <linux/parser.h>
  #include <linux/fsnotify.h>
@@ -4348,9 +4348,9 @@ diff -NurpP --minimal linux-3.0.1/fs/devpts/inode.c linux-3.0.1-vs2.3.1-pre9/fs/
        inode->i_private = tty;
        tty->driver_data = inode;
  
-diff -NurpP --minimal linux-3.0.1/fs/ext2/balloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/balloc.c
---- linux-3.0.1/fs/ext2/balloc.c       2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/balloc.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/balloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/balloc.c
+--- linux-3.0.3/fs/ext2/balloc.c       2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/balloc.c 2011-06-10 22:11:24.000000000 +0200
 @@ -701,7 +701,6 @@ ext2_try_to_allocate(struct super_block 
                        start = 0;
                end = EXT2_BLOCKS_PER_GROUP(sb);
@@ -4359,9 +4359,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext2/balloc.c linux-3.0.1-vs2.3.1-pre9/fs/e
        BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb));
  
  repeat:
-diff -NurpP --minimal linux-3.0.1/fs/ext2/ext2.h linux-3.0.1-vs2.3.1-pre9/fs/ext2/ext2.h
---- linux-3.0.1/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/ext2.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/ext2.h linux-3.0.3-vs2.3.1-pre10/fs/ext2/ext2.h
+--- linux-3.0.3/fs/ext2/ext2.h 2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/ext2.h   2011-06-10 22:11:24.000000000 +0200
 @@ -126,6 +126,7 @@ extern void ext2_set_inode_flags(struct 
  extern void ext2_get_inode_flags(struct ext2_inode_info *);
  extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,
@@ -4370,18 +4370,18 @@ diff -NurpP --minimal linux-3.0.1/fs/ext2/ext2.h linux-3.0.1-vs2.3.1-pre9/fs/ext
  
  /* ioctl.c */
  extern long ext2_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.1/fs/ext2/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/file.c
---- linux-3.0.1/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/file.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/file.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/file.c
+--- linux-3.0.3/fs/ext2/file.c 2010-08-02 16:52:48.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/file.c   2011-06-10 22:11:24.000000000 +0200
 @@ -104,4 +104,5 @@ const struct inode_operations ext2_file_
        .setattr        = ext2_setattr,
        .check_acl      = ext2_check_acl,
        .fiemap         = ext2_fiemap,
 +      .sync_flags     = ext2_sync_flags,
  };
-diff -NurpP --minimal linux-3.0.1/fs/ext2/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/ialloc.c
---- linux-3.0.1/fs/ext2/ialloc.c       2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/ialloc.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/ialloc.c
+--- linux-3.0.3/fs/ext2/ialloc.c       2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/ialloc.c 2011-06-10 22:11:24.000000000 +0200
 @@ -17,6 +17,7 @@
  #include <linux/backing-dev.h>
  #include <linux/buffer_head.h>
@@ -4398,9 +4398,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext2/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/e
        } else
                inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.0.1/fs/ext2/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/inode.c
---- linux-3.0.1/fs/ext2/inode.c        2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/inode.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/inode.c
+--- linux-3.0.3/fs/ext2/inode.c        2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/inode.c  2011-06-10 22:11:24.000000000 +0200
 @@ -32,6 +32,7 @@
  #include <linux/mpage.h>
  #include <linux/fiemap.h>
@@ -4549,9 +4549,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext2/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                error = dquot_transfer(inode, iattr);
                if (error)
                        return error;
-diff -NurpP --minimal linux-3.0.1/fs/ext2/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/ioctl.c
---- linux-3.0.1/fs/ext2/ioctl.c        2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/ioctl.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/ioctl.c
+--- linux-3.0.3/fs/ext2/ioctl.c        2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/ioctl.c  2011-06-10 22:11:24.000000000 +0200
 @@ -17,6 +17,16 @@
  #include <asm/uaccess.h>
  
@@ -4601,9 +4601,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext2/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE;
                ei->i_flags = flags;
                mutex_unlock(&inode->i_mutex);
-diff -NurpP --minimal linux-3.0.1/fs/ext2/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/namei.c
---- linux-3.0.1/fs/ext2/namei.c        2011-05-22 16:17:51.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/namei.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/namei.c
+--- linux-3.0.3/fs/ext2/namei.c        2011-05-22 16:17:51.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/namei.c  2011-06-10 22:11:24.000000000 +0200
 @@ -32,6 +32,7 @@
  
  #include <linux/pagemap.h>
@@ -4628,9 +4628,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext2/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ex
  };
  
  const struct inode_operations ext2_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.1/fs/ext2/super.c linux-3.0.1-vs2.3.1-pre9/fs/ext2/super.c
---- linux-3.0.1/fs/ext2/super.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext2/super.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext2/super.c linux-3.0.3-vs2.3.1-pre10/fs/ext2/super.c
+--- linux-3.0.3/fs/ext2/super.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext2/super.c  2011-06-10 22:11:24.000000000 +0200
 @@ -394,7 +394,8 @@ enum {
        Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug,
        Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr,
@@ -4696,9 +4696,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext2/super.c linux-3.0.1-vs2.3.1-pre9/fs/ex
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.0.1/fs/ext3/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/file.c
---- linux-3.0.1/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/file.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext3/file.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/file.c
+--- linux-3.0.3/fs/ext3/file.c 2010-07-07 18:31:51.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/file.c   2011-06-10 22:11:24.000000000 +0200
 @@ -81,5 +81,6 @@ const struct inode_operations ext3_file_
  #endif
        .check_acl      = ext3_check_acl,
@@ -4706,9 +4706,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext3/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext
 +      .sync_flags     = ext3_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.0.1/fs/ext3/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/ialloc.c
---- linux-3.0.1/fs/ext3/ialloc.c       2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/ialloc.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext3/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/ialloc.c
+--- linux-3.0.3/fs/ext3/ialloc.c       2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/ialloc.c 2011-06-10 22:11:24.000000000 +0200
 @@ -23,6 +23,7 @@
  #include <linux/buffer_head.h>
  #include <linux/random.h>
@@ -4725,9 +4725,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext3/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/e
        } else
                inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.0.1/fs/ext3/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/inode.c
---- linux-3.0.1/fs/ext3/inode.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/inode.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext3/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/inode.c
+--- linux-3.0.3/fs/ext3/inode.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/inode.c  2011-06-10 22:11:24.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <linux/bio.h>
  #include <linux/fiemap.h>
@@ -4911,9 +4911,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext3/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                error = ext3_mark_inode_dirty(handle, inode);
                ext3_journal_stop(handle);
        }
-diff -NurpP --minimal linux-3.0.1/fs/ext3/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/ioctl.c
---- linux-3.0.1/fs/ext3/ioctl.c        2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/ioctl.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext3/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/ioctl.c
+--- linux-3.0.3/fs/ext3/ioctl.c        2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/ioctl.c  2011-06-10 22:11:24.000000000 +0200
 @@ -8,6 +8,7 @@
   */
  
@@ -4989,9 +4989,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext3/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE;
                ei->i_flags = flags;
  
-diff -NurpP --minimal linux-3.0.1/fs/ext3/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/namei.c
---- linux-3.0.1/fs/ext3/namei.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/namei.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext3/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/namei.c
+--- linux-3.0.3/fs/ext3/namei.c        2011-08-29 03:10:24.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/namei.c  2011-08-29 03:45:09.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/quotaops.h>
  #include <linux/buffer_head.h>
@@ -5008,7 +5008,7 @@ diff -NurpP --minimal linux-3.0.1/fs/ext3/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                }
                if ((bh = bh_use[ra_ptr++]) == NULL)
                        goto next;
-@@ -2534,6 +2536,7 @@ const struct inode_operations ext3_dir_i
+@@ -2536,6 +2538,7 @@ const struct inode_operations ext3_dir_i
        .removexattr    = generic_removexattr,
  #endif
        .check_acl      = ext3_check_acl,
@@ -5016,9 +5016,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext3/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ex
  };
  
  const struct inode_operations ext3_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.1/fs/ext3/super.c linux-3.0.1-vs2.3.1-pre9/fs/ext3/super.c
---- linux-3.0.1/fs/ext3/super.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext3/super.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext3/super.c linux-3.0.3-vs2.3.1-pre10/fs/ext3/super.c
+--- linux-3.0.3/fs/ext3/super.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext3/super.c  2011-06-10 22:11:24.000000000 +0200
 @@ -821,7 +821,8 @@ enum {
        Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota,
        Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota,
@@ -5085,9 +5085,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext3/super.c linux-3.0.1-vs2.3.1-pre9/fs/ex
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.0.1/fs/ext4/ext4.h linux-3.0.1-vs2.3.1-pre9/fs/ext4/ext4.h
---- linux-3.0.1/fs/ext4/ext4.h 2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/ext4.h    2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext4/ext4.h linux-3.0.3-vs2.3.1-pre10/fs/ext4/ext4.h
+--- linux-3.0.3/fs/ext4/ext4.h 2011-08-29 03:10:24.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/ext4.h   2011-08-08 23:04:47.000000000 +0200
 @@ -350,8 +350,12 @@ struct flex_groups {
  #define EXT4_EXTENTS_FL                       0x00080000 /* Inode uses extents */
  #define EXT4_EA_INODE_FL              0x00200000 /* Inode used for large EA */
@@ -5135,9 +5135,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/ext4.h linux-3.0.1-vs2.3.1-pre9/fs/ext
  /* move_extent.c */
  extern int ext4_move_extents(struct file *o_filp, struct file *d_filp,
                             __u64 start_orig, __u64 start_donor,
-diff -NurpP --minimal linux-3.0.1/fs/ext4/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/file.c
---- linux-3.0.1/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/file.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext4/file.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/file.c
+--- linux-3.0.3/fs/ext4/file.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/file.c   2011-06-10 22:11:24.000000000 +0200
 @@ -282,5 +282,6 @@ const struct inode_operations ext4_file_
  #endif
        .check_acl      = ext4_check_acl,
@@ -5145,9 +5145,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/file.c linux-3.0.1-vs2.3.1-pre9/fs/ext
 +      .sync_flags     = ext4_sync_flags,
  };
  
-diff -NurpP --minimal linux-3.0.1/fs/ext4/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/ialloc.c
---- linux-3.0.1/fs/ext4/ialloc.c       2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/ialloc.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext4/ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/ialloc.c
+--- linux-3.0.3/fs/ext4/ialloc.c       2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/ialloc.c 2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/random.h>
  #include <linux/bitops.h>
@@ -5164,9 +5164,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/e
        } else
                inode_init_owner(inode, dir, mode);
  
-diff -NurpP --minimal linux-3.0.1/fs/ext4/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/inode.c
---- linux-3.0.1/fs/ext4/inode.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/inode.c   2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext4/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/inode.c
+--- linux-3.0.3/fs/ext4/inode.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/inode.c  2011-07-01 11:35:34.000000000 +0200
 @@ -42,6 +42,7 @@
  #include <linux/printk.h>
  #include <linux/slab.h>
@@ -5344,9 +5344,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                error = ext4_mark_inode_dirty(handle, inode);
                ext4_journal_stop(handle);
        }
-diff -NurpP --minimal linux-3.0.1/fs/ext4/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/ioctl.c
---- linux-3.0.1/fs/ext4/ioctl.c        2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/ioctl.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext4/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/ioctl.c
+--- linux-3.0.3/fs/ext4/ioctl.c        2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/ioctl.c  2011-06-10 22:11:24.000000000 +0200
 @@ -14,10 +14,39 @@
  #include <linux/compat.h>
  #include <linux/mount.h>
@@ -5410,9 +5410,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                        if (!capable(CAP_LINUX_IMMUTABLE))
                                goto flags_out;
                }
-diff -NurpP --minimal linux-3.0.1/fs/ext4/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/namei.c
---- linux-3.0.1/fs/ext4/namei.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/namei.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext4/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/namei.c
+--- linux-3.0.3/fs/ext4/namei.c        2011-08-29 03:10:24.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/namei.c  2011-08-29 03:45:09.000000000 +0200
 @@ -34,6 +34,7 @@
  #include <linux/quotaops.h>
  #include <linux/buffer_head.h>
@@ -5429,7 +5429,7 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ex
                }
                if ((bh = bh_use[ra_ptr++]) == NULL)
                        goto next;
-@@ -2596,6 +2598,7 @@ const struct inode_operations ext4_dir_i
+@@ -2598,6 +2600,7 @@ const struct inode_operations ext4_dir_i
  #endif
        .check_acl      = ext4_check_acl,
        .fiemap         = ext4_fiemap,
@@ -5437,9 +5437,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ex
  };
  
  const struct inode_operations ext4_special_inode_operations = {
-diff -NurpP --minimal linux-3.0.1/fs/ext4/super.c linux-3.0.1-vs2.3.1-pre9/fs/ext4/super.c
---- linux-3.0.1/fs/ext4/super.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ext4/super.c   2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ext4/super.c linux-3.0.3-vs2.3.1-pre10/fs/ext4/super.c
+--- linux-3.0.3/fs/ext4/super.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ext4/super.c  2011-07-01 11:35:34.000000000 +0200
 @@ -1294,6 +1294,7 @@ enum {
        Opt_dioread_nolock, Opt_dioread_lock,
        Opt_discard, Opt_nodiscard,
@@ -5504,9 +5504,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ext4/super.c linux-3.0.1-vs2.3.1-pre9/fs/ex
        sb->s_flags = (sb->s_flags & ~MS_POSIXACL) |
                (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0);
  
-diff -NurpP --minimal linux-3.0.1/fs/fcntl.c linux-3.0.1-vs2.3.1-pre9/fs/fcntl.c
---- linux-3.0.1/fs/fcntl.c     2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/fcntl.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/fcntl.c linux-3.0.3-vs2.3.1-pre10/fs/fcntl.c
+--- linux-3.0.3/fs/fcntl.c     2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/fcntl.c       2011-06-10 22:11:24.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/signal.h>
  #include <linux/rcupdate.h>
@@ -5533,9 +5533,9 @@ diff -NurpP --minimal linux-3.0.1/fs/fcntl.c linux-3.0.1-vs2.3.1-pre9/fs/fcntl.c
  
        if (unlikely(filp->f_mode & FMODE_PATH)) {
                if (!check_fcntl_cmd(cmd)) {
-diff -NurpP --minimal linux-3.0.1/fs/file.c linux-3.0.1-vs2.3.1-pre9/fs/file.c
---- linux-3.0.1/fs/file.c      2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/file.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/file.c linux-3.0.3-vs2.3.1-pre10/fs/file.c
+--- linux-3.0.3/fs/file.c      2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/file.c        2011-06-10 22:11:24.000000000 +0200
 @@ -21,6 +21,7 @@
  #include <linux/spinlock.h>
  #include <linux/rcupdate.h>
@@ -5561,9 +5561,9 @@ diff -NurpP --minimal linux-3.0.1/fs/file.c linux-3.0.1-vs2.3.1-pre9/fs/file.c
  #if 1
        /* Sanity check */
        if (rcu_dereference_raw(fdt->fd[fd]) != NULL) {
-diff -NurpP --minimal linux-3.0.1/fs/file_table.c linux-3.0.1-vs2.3.1-pre9/fs/file_table.c
---- linux-3.0.1/fs/file_table.c        2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/file_table.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/file_table.c linux-3.0.3-vs2.3.1-pre10/fs/file_table.c
+--- linux-3.0.3/fs/file_table.c        2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/file_table.c  2011-06-10 22:11:24.000000000 +0200
 @@ -24,6 +24,8 @@
  #include <linux/percpu_counter.h>
  #include <linux/percpu.h>
@@ -5600,9 +5600,9 @@ diff -NurpP --minimal linux-3.0.1/fs/file_table.c linux-3.0.1-vs2.3.1-pre9/fs/fi
                file_sb_list_del(file);
                file_free(file);
        }
-diff -NurpP --minimal linux-3.0.1/fs/fs_struct.c linux-3.0.1-vs2.3.1-pre9/fs/fs_struct.c
---- linux-3.0.1/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/fs_struct.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/fs_struct.c linux-3.0.3-vs2.3.1-pre10/fs/fs_struct.c
+--- linux-3.0.3/fs/fs_struct.c 2011-03-15 18:07:31.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/fs_struct.c   2011-06-10 22:11:24.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/path.h>
  #include <linux/slab.h>
@@ -5627,9 +5627,9 @@ diff -NurpP --minimal linux-3.0.1/fs/fs_struct.c linux-3.0.1-vs2.3.1-pre9/fs/fs_
        }
        return fs;
  }
-diff -NurpP --minimal linux-3.0.1/fs/gfs2/file.c linux-3.0.1-vs2.3.1-pre9/fs/gfs2/file.c
---- linux-3.0.1/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/gfs2/file.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/gfs2/file.c linux-3.0.3-vs2.3.1-pre10/fs/gfs2/file.c
+--- linux-3.0.3/fs/gfs2/file.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/gfs2/file.c   2011-06-10 22:11:24.000000000 +0200
 @@ -134,6 +134,9 @@ static const u32 fsflags_to_gfs2[32] = {
        [7] = GFS2_DIF_NOATIME,
        [12] = GFS2_DIF_EXHASH,
@@ -5750,9 +5750,9 @@ diff -NurpP --minimal linux-3.0.1/fs/gfs2/file.c linux-3.0.1-vs2.3.1-pre9/fs/gfs
  static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
        switch(cmd) {
-diff -NurpP --minimal linux-3.0.1/fs/gfs2/inode.h linux-3.0.1-vs2.3.1-pre9/fs/gfs2/inode.h
---- linux-3.0.1/fs/gfs2/inode.h        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/gfs2/inode.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/gfs2/inode.h linux-3.0.3-vs2.3.1-pre10/fs/gfs2/inode.h
+--- linux-3.0.3/fs/gfs2/inode.h        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/gfs2/inode.h  2011-06-10 22:11:24.000000000 +0200
 @@ -120,6 +120,7 @@ extern const struct file_operations gfs2
  extern const struct file_operations gfs2_dir_fops_nolock;
  
@@ -5761,9 +5761,9 @@ diff -NurpP --minimal linux-3.0.1/fs/gfs2/inode.h linux-3.0.1-vs2.3.1-pre9/fs/gf
   
  #ifdef CONFIG_GFS2_FS_LOCKING_DLM
  extern const struct file_operations gfs2_file_fops;
-diff -NurpP --minimal linux-3.0.1/fs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/inode.c
---- linux-3.0.1/fs/inode.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/inode.c        2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/inode.c
+--- linux-3.0.3/fs/inode.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/inode.c       2011-07-01 11:35:34.000000000 +0200
 @@ -26,6 +26,7 @@
  #include <linux/ima.h>
  #include <linux/cred.h>
@@ -5819,9 +5819,9 @@ diff -NurpP --minimal linux-3.0.1/fs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/inode.c
  }
  EXPORT_SYMBOL(inode_init_owner);
  
-diff -NurpP --minimal linux-3.0.1/fs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ioctl.c
---- linux-3.0.1/fs/ioctl.c     2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ioctl.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ioctl.c
+--- linux-3.0.3/fs/ioctl.c     2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ioctl.c       2011-06-10 22:11:24.000000000 +0200
 @@ -15,6 +15,9 @@
  #include <linux/writeback.h>
  #include <linux/buffer_head.h>
@@ -5832,9 +5832,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ioctl.c
  
  #include <asm/ioctls.h>
  
-diff -NurpP --minimal linux-3.0.1/fs/ioprio.c linux-3.0.1-vs2.3.1-pre9/fs/ioprio.c
---- linux-3.0.1/fs/ioprio.c    2011-01-05 21:50:24.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ioprio.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ioprio.c linux-3.0.3-vs2.3.1-pre10/fs/ioprio.c
+--- linux-3.0.3/fs/ioprio.c    2011-01-05 21:50:24.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/ioprio.c      2011-06-10 22:11:24.000000000 +0200
 @@ -27,6 +27,7 @@
  #include <linux/syscalls.h>
  #include <linux/security.h>
@@ -5861,9 +5861,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ioprio.c linux-3.0.1-vs2.3.1-pre9/fs/ioprio
                                tmpio = get_task_ioprio(p);
                                if (tmpio < 0)
                                        continue;
-diff -NurpP --minimal linux-3.0.1/fs/jfs/file.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/file.c
---- linux-3.0.1/fs/jfs/file.c  2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/file.c     2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/file.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/file.c
+--- linux-3.0.3/fs/jfs/file.c  2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/file.c    2011-07-01 11:35:34.000000000 +0200
 @@ -102,7 +102,8 @@ int jfs_setattr(struct dentry *dentry, s
        if (is_quota_modification(inode, iattr))
                dquot_initialize(inode);
@@ -5882,9 +5882,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/file.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/
  };
  
  const struct file_operations jfs_file_operations = {
-diff -NurpP --minimal linux-3.0.1/fs/jfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/ioctl.c
---- linux-3.0.1/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/ioctl.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/ioctl.c
+--- linux-3.0.3/fs/jfs/ioctl.c 2011-05-22 16:17:52.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/ioctl.c   2011-06-10 22:11:24.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/mount.h>
  #include <linux/time.h>
@@ -5942,9 +5942,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/jfs
                flags |= oldflags & ~JFS_FL_USER_MODIFIABLE;
                jfs_inode->mode2 = flags;
  
-diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_dinode.h linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_dinode.h
---- linux-3.0.1/fs/jfs/jfs_dinode.h    2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_dinode.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_dinode.h linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_dinode.h
+--- linux-3.0.3/fs/jfs/jfs_dinode.h    2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_dinode.h      2011-06-10 22:11:24.000000000 +0200
 @@ -161,9 +161,13 @@ struct dinode {
  
  #define JFS_APPEND_FL         0x01000000 /* writes to file may only append */
@@ -5961,9 +5961,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_dinode.h linux-3.0.1-vs2.3.1-pre9/f
  #define JFS_FL_INHERIT                0x03C80000
  
  /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */
-diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_filsys.h linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_filsys.h
---- linux-3.0.1/fs/jfs/jfs_filsys.h    2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_filsys.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_filsys.h linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_filsys.h
+--- linux-3.0.3/fs/jfs/jfs_filsys.h    2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_filsys.h      2011-06-10 22:11:24.000000000 +0200
 @@ -263,6 +263,7 @@
  #define JFS_NAME_MAX  255
  #define JFS_PATH_MAX  BPSIZE
@@ -5972,9 +5972,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_filsys.h linux-3.0.1-vs2.3.1-pre9/f
  
  /*
   *    file system state (superblock state)
-diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_imap.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_imap.c
---- linux-3.0.1/fs/jfs/jfs_imap.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_imap.c 2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_imap.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_imap.c
+--- linux-3.0.3/fs/jfs/jfs_imap.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_imap.c        2011-07-01 11:35:34.000000000 +0200
 @@ -46,6 +46,7 @@
  #include <linux/pagemap.h>
  #include <linux/quotaops.h>
@@ -6034,9 +6034,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_imap.c linux-3.0.1-vs2.3.1-pre9/fs/
        jfs_get_inode_flags(jfs_ip);
        /*
         * mode2 is only needed for storing the higher order bits.
-diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_inode.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.c
---- linux-3.0.1/fs/jfs/jfs_inode.c     2010-08-02 16:52:49.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_inode.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.c
+--- linux-3.0.3/fs/jfs/jfs_inode.c     2010-08-02 16:52:49.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.c       2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  
  #include <linux/fs.h>
@@ -6110,9 +6110,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_inode.c linux-3.0.1-vs2.3.1-pre9/fs
  }
  
  /*
-diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_inode.h linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.h
---- linux-3.0.1/fs/jfs/jfs_inode.h     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/jfs_inode.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/jfs_inode.h linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.h
+--- linux-3.0.3/fs/jfs/jfs_inode.h     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/jfs_inode.h       2011-06-10 22:11:24.000000000 +0200
 @@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s
  extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid,
        int fh_len, int fh_type);
@@ -6121,9 +6121,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/jfs_inode.h linux-3.0.1-vs2.3.1-pre9/fs
  extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int);
  extern int jfs_setattr(struct dentry *, struct iattr *);
  
-diff -NurpP --minimal linux-3.0.1/fs/jfs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/namei.c
---- linux-3.0.1/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/namei.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/namei.c
+--- linux-3.0.3/fs/jfs/namei.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/namei.c   2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/ctype.h>
  #include <linux/quotaops.h>
@@ -6148,9 +6148,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/jfs
  };
  
  const struct file_operations jfs_dir_operations = {
-diff -NurpP --minimal linux-3.0.1/fs/jfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/jfs/super.c
---- linux-3.0.1/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/jfs/super.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/jfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/jfs/super.c
+--- linux-3.0.3/fs/jfs/super.c 2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/jfs/super.c   2011-06-10 22:11:24.000000000 +0200
 @@ -198,7 +198,8 @@ static void jfs_put_super(struct super_b
  enum {
        Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize,
@@ -6216,9 +6216,9 @@ diff -NurpP --minimal linux-3.0.1/fs/jfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/jfs
  
        if (newLVSize) {
                printk(KERN_ERR "resize option for remount only\n");
-diff -NurpP --minimal linux-3.0.1/fs/libfs.c linux-3.0.1-vs2.3.1-pre9/fs/libfs.c
---- linux-3.0.1/fs/libfs.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/libfs.c        2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/libfs.c linux-3.0.3-vs2.3.1-pre10/fs/libfs.c
+--- linux-3.0.3/fs/libfs.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/libfs.c       2011-07-22 11:20:39.000000000 +0200
 @@ -133,7 +133,8 @@ static inline unsigned char dt_type(stru
   * both impossible due to the lock on directory.
   */
@@ -6264,9 +6264,9 @@ diff -NurpP --minimal linux-3.0.1/fs/libfs.c linux-3.0.1-vs2.3.1-pre9/fs/libfs.c
  EXPORT_SYMBOL(generic_read_dir);
  EXPORT_SYMBOL(mount_pseudo);
  EXPORT_SYMBOL(simple_write_begin);
-diff -NurpP --minimal linux-3.0.1/fs/locks.c linux-3.0.1-vs2.3.1-pre9/fs/locks.c
---- linux-3.0.1/fs/locks.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/locks.c        2011-07-19 00:51:58.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/locks.c linux-3.0.3-vs2.3.1-pre10/fs/locks.c
+--- linux-3.0.3/fs/locks.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/locks.c       2011-07-19 00:51:58.000000000 +0200
 @@ -126,6 +126,8 @@
  #include <linux/time.h>
  #include <linux/rcupdate.h>
@@ -6456,9 +6456,9 @@ diff -NurpP --minimal linux-3.0.1/fs/locks.c linux-3.0.1-vs2.3.1-pre9/fs/locks.c
  
        return 0;
  }
-diff -NurpP --minimal linux-3.0.1/fs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/namei.c
---- linux-3.0.1/fs/namei.c     2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/namei.c        2011-08-01 18:18:05.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/namei.c
+--- linux-3.0.3/fs/namei.c     2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/namei.c       2011-08-01 18:18:05.000000000 +0200
 @@ -32,6 +32,14 @@
  #include <linux/fcntl.h>
  #include <linux/device_cgroup.h>
@@ -6871,9 +6871,9 @@ diff -NurpP --minimal linux-3.0.1/fs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/namei.c
  /* get the link contents into pagecache */
  static char *page_getlink(struct dentry * dentry, struct page **ppage)
  {
-diff -NurpP --minimal linux-3.0.1/fs/namespace.c linux-3.0.1-vs2.3.1-pre9/fs/namespace.c
---- linux-3.0.1/fs/namespace.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/namespace.c    2011-07-23 16:43:31.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/namespace.c linux-3.0.3-vs2.3.1-pre10/fs/namespace.c
+--- linux-3.0.3/fs/namespace.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/namespace.c   2011-07-23 16:43:31.000000000 +0200
 @@ -31,6 +31,11 @@
  #include <linux/idr.h>
  #include <linux/fs_struct.h>
@@ -7193,9 +7193,9 @@ diff -NurpP --minimal linux-3.0.1/fs/namespace.c linux-3.0.1-vs2.3.1-pre9/fs/nam
        kfree(ns);
  }
  EXPORT_SYMBOL(put_mnt_ns);
-diff -NurpP --minimal linux-3.0.1/fs/nfs/client.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/client.c
---- linux-3.0.1/fs/nfs/client.c        2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/client.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfs/client.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/client.c
+--- linux-3.0.3/fs/nfs/client.c        2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/client.c  2011-06-10 22:11:24.000000000 +0200
 @@ -780,6 +780,9 @@ static int nfs_init_server_rpcclient(str
        if (server->flags & NFS_MOUNT_SOFT)
                server->client->cl_softrtry = 1;
@@ -7217,9 +7217,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfs/client.c linux-3.0.1-vs2.3.1-pre9/fs/nf
        server->maxfilesize = fsinfo->maxfilesize;
  
        server->time_delta = fsinfo->time_delta;
-diff -NurpP --minimal linux-3.0.1/fs/nfs/dir.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/dir.c
---- linux-3.0.1/fs/nfs/dir.c   2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/dir.c      2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfs/dir.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/dir.c
+--- linux-3.0.3/fs/nfs/dir.c   2011-08-29 03:10:24.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/dir.c     2011-08-08 23:04:47.000000000 +0200
 @@ -35,6 +35,7 @@
  #include <linux/sched.h>
  #include <linux/kmemleak.h>
@@ -7236,9 +7236,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfs/dir.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/d
  no_entry:
        res = d_materialise_unique(dentry, inode);
        if (res != NULL) {
-diff -NurpP --minimal linux-3.0.1/fs/nfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/inode.c
---- linux-3.0.1/fs/nfs/inode.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/inode.c    2011-07-01 11:35:34.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/inode.c
+--- linux-3.0.3/fs/nfs/inode.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/inode.c   2011-07-01 11:35:34.000000000 +0200
 @@ -38,6 +38,7 @@
  #include <linux/nfs_xdr.h>
  #include <linux/slab.h>
@@ -7390,9 +7390,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/nfs
        if (fattr->valid & NFS_ATTR_FATTR_NLINK) {
                if (inode->i_nlink != fattr->nlink) {
                        invalid |= NFS_INO_INVALID_ATTR;
-diff -NurpP --minimal linux-3.0.1/fs/nfs/nfs3xdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/nfs3xdr.c
---- linux-3.0.1/fs/nfs/nfs3xdr.c       2011-03-15 18:07:32.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/nfs3xdr.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfs/nfs3xdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/nfs3xdr.c
+--- linux-3.0.3/fs/nfs/nfs3xdr.c       2011-03-15 18:07:32.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <linux/nfs3.h>
  #include <linux/nfs_fs.h>
@@ -7538,9 +7538,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfs/nfs3xdr.c linux-3.0.1-vs2.3.1-pre9/fs/n
  }
  
  /*
-diff -NurpP --minimal linux-3.0.1/fs/nfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/nfs/super.c
---- linux-3.0.1/fs/nfs/super.c 2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfs/super.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/nfs/super.c
+--- linux-3.0.3/fs/nfs/super.c 2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfs/super.c   2011-06-10 22:11:24.000000000 +0200
 @@ -53,6 +53,7 @@
  #include <linux/nfs_xdr.h>
  #include <linux/magic.h>
@@ -7612,9 +7612,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/nfs
  
                /*
                 * options that take text values
-diff -NurpP --minimal linux-3.0.1/fs/nfsd/auth.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/auth.c
---- linux-3.0.1/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/auth.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfsd/auth.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/auth.c
+--- linux-3.0.3/fs/nfsd/auth.c 2010-02-25 11:52:05.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/auth.c   2011-06-10 22:11:24.000000000 +0200
 @@ -1,6 +1,7 @@
  /* Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de> */
  
@@ -7633,9 +7633,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfsd/auth.c linux-3.0.1-vs2.3.1-pre9/fs/nfs
  
        rqgi = rqstp->rq_cred.cr_group_info;
  
-diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfs3xdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs3xdr.c
---- linux-3.0.1/fs/nfsd/nfs3xdr.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs3xdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfs3xdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs3xdr.c
+--- linux-3.0.3/fs/nfsd/nfs3xdr.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs3xdr.c        2011-06-10 22:11:24.000000000 +0200
 @@ -7,6 +7,7 @@
   */
  
@@ -7686,9 +7686,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfs3xdr.c linux-3.0.1-vs2.3.1-pre9/fs/
        if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) {
                p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN);
        } else {
-diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfs4xdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs4xdr.c
---- linux-3.0.1/fs/nfsd/nfs4xdr.c      2011-07-22 11:18:05.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfs4xdr.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfs4xdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs4xdr.c
+--- linux-3.0.3/fs/nfsd/nfs4xdr.c      2011-07-22 11:18:05.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfs4xdr.c        2011-06-10 22:11:24.000000000 +0200
 @@ -45,6 +45,7 @@
  #include <linux/statfs.h>
  #include <linux/utsname.h>
@@ -7718,9 +7718,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfs4xdr.c linux-3.0.1-vs2.3.1-pre9/fs/
                if (status == nfserr_resource)
                        goto out_resource;
                if (status)
-diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfsxdr.c linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfsxdr.c
---- linux-3.0.1/fs/nfsd/nfsxdr.c       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/nfsd/nfsxdr.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/nfsd/nfsxdr.c linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfsxdr.c
+--- linux-3.0.3/fs/nfsd/nfsxdr.c       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/nfsd/nfsxdr.c 2011-06-10 22:11:24.000000000 +0200
 @@ -6,6 +6,7 @@
  
  #include "xdr.h"
@@ -7769,9 +7769,9 @@ diff -NurpP --minimal linux-3.0.1/fs/nfsd/nfsxdr.c linux-3.0.1-vs2.3.1-pre9/fs/n
  
        if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) {
                *p++ = htonl(NFS_MAXPATHLEN);
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/dlmglue.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.c
---- linux-3.0.1/fs/ocfs2/dlmglue.c     2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/dlmglue.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.c
+--- linux-3.0.3/fs/ocfs2/dlmglue.c     2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.c       2011-06-10 22:11:24.000000000 +0200
 @@ -2041,6 +2041,7 @@ static void __ocfs2_stuff_meta_lvb(struc
        lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters);
        lvb->lvb_iuid      = cpu_to_be32(inode->i_uid);
@@ -7788,9 +7788,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/dlmglue.c linux-3.0.1-vs2.3.1-pre9/fs
        inode->i_mode    = be16_to_cpu(lvb->lvb_imode);
        inode->i_nlink   = be16_to_cpu(lvb->lvb_inlink);
        ocfs2_unpack_timespec(&inode->i_atime,
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/dlmglue.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.h
---- linux-3.0.1/fs/ocfs2/dlmglue.h     2010-10-21 13:07:50.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/dlmglue.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/dlmglue.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.h
+--- linux-3.0.3/fs/ocfs2/dlmglue.h     2010-10-21 13:07:50.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/dlmglue.h       2011-06-10 22:11:24.000000000 +0200
 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb {
        __be16       lvb_inlink;
        __be32       lvb_iattr;
@@ -7801,9 +7801,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/dlmglue.h linux-3.0.1-vs2.3.1-pre9/fs
  };
  
  #define OCFS2_QINFO_LVB_VERSION 1
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/file.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/file.c
---- linux-3.0.1/fs/ocfs2/file.c        2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/file.c   2011-06-10 22:43:33.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/file.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/file.c
+--- linux-3.0.3/fs/ocfs2/file.c        2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/file.c  2011-06-10 22:43:33.000000000 +0200
 @@ -1111,7 +1111,7 @@ int ocfs2_setattr(struct dentry *dentry,
                attr->ia_valid &= ~ATTR_SIZE;
  
@@ -7813,9 +7813,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/file.c linux-3.0.1-vs2.3.1-pre9/fs/oc
        if (!(attr->ia_valid & OCFS2_VALID_ATTRS))
                return 0;
  
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/inode.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.c
---- linux-3.0.1/fs/ocfs2/inode.c       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/inode.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.c
+--- linux-3.0.3/fs/ocfs2/inode.c       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.c 2011-06-10 22:11:24.000000000 +0200
 @@ -28,6 +28,7 @@
  #include <linux/highmem.h>
  #include <linux/pagemap.h>
@@ -7912,9 +7912,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/inode.c linux-3.0.1-vs2.3.1-pre9/fs/o
  
        /* Fast symlinks will have i_size but no allocated clusters. */
        if (S_ISLNK(inode->i_mode) && !fe->i_clusters)
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/inode.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.h
---- linux-3.0.1/fs/ocfs2/inode.h       2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/inode.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/inode.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.h
+--- linux-3.0.3/fs/ocfs2/inode.h       2011-01-05 21:50:26.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/inode.h 2011-06-10 22:11:24.000000000 +0200
 @@ -151,6 +151,7 @@ struct buffer_head *ocfs2_bread(struct i
  
  void ocfs2_set_inode_flags(struct inode *inode);
@@ -7923,9 +7923,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/inode.h linux-3.0.1-vs2.3.1-pre9/fs/o
  
  static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode)
  {
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ioctl.c
---- linux-3.0.1/fs/ocfs2/ioctl.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ioctl.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ioctl.c
+--- linux-3.0.3/fs/ocfs2/ioctl.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ioctl.c 2011-06-10 22:11:24.000000000 +0200
 @@ -78,7 +78,41 @@ static int ocfs2_get_inode_attr(struct i
        return status;
  }
@@ -7989,9 +7989,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/o
  long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
  {
        struct inode *inode = filp->f_path.dentry->d_inode;
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/namei.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/namei.c
---- linux-3.0.1/fs/ocfs2/namei.c       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/namei.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/namei.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/namei.c
+--- linux-3.0.3/fs/ocfs2/namei.c       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/namei.c 2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/slab.h>
  #include <linux/highmem.h>
@@ -8022,9 +8022,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/namei.c linux-3.0.1-vs2.3.1-pre9/fs/o
        fe->i_mode = cpu_to_le16(inode->i_mode);
        if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode))
                fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev));
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ocfs2.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2.h
---- linux-3.0.1/fs/ocfs2/ocfs2.h       2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ocfs2.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2.h
+--- linux-3.0.3/fs/ocfs2/ocfs2.h       2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2.h 2011-06-10 22:11:24.000000000 +0200
 @@ -272,6 +272,7 @@ enum ocfs2_mount_options
                                                     writes */
        OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */
@@ -8033,9 +8033,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ocfs2.h linux-3.0.1-vs2.3.1-pre9/fs/o
  };
  
  #define OCFS2_OSB_SOFT_RO                     0x0001
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ocfs2_fs.h linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2_fs.h
---- linux-3.0.1/fs/ocfs2/ocfs2_fs.h    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/ocfs2_fs.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/ocfs2_fs.h linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2_fs.h
+--- linux-3.0.3/fs/ocfs2/ocfs2_fs.h    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/ocfs2_fs.h      2011-06-10 22:11:24.000000000 +0200
 @@ -266,6 +266,11 @@
  #define OCFS2_TOPDIR_FL                       FS_TOPDIR_FL    /* Top of directory hierarchies*/
  #define OCFS2_RESERVED_FL             FS_RESERVED_FL  /* reserved for ext2 lib */
@@ -8048,9 +8048,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/ocfs2_fs.h linux-3.0.1-vs2.3.1-pre9/f
  #define OCFS2_FL_VISIBLE              FS_FL_USER_VISIBLE      /* User visible flags */
  #define OCFS2_FL_MODIFIABLE           FS_FL_USER_MODIFIABLE   /* User modifiable flags */
  
-diff -NurpP --minimal linux-3.0.1/fs/ocfs2/super.c linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/super.c
---- linux-3.0.1/fs/ocfs2/super.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/ocfs2/super.c  2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/ocfs2/super.c linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/super.c
+--- linux-3.0.3/fs/ocfs2/super.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/ocfs2/super.c 2011-06-15 02:40:14.000000000 +0200
 @@ -184,6 +184,7 @@ enum {
        Opt_coherency_full,
        Opt_resv_level,
@@ -8114,9 +8114,9 @@ diff -NurpP --minimal linux-3.0.1/fs/ocfs2/super.c linux-3.0.1-vs2.3.1-pre9/fs/o
                default:
                        mlog(ML_ERROR,
                             "Unrecognized mount option \"%s\" "
-diff -NurpP --minimal linux-3.0.1/fs/open.c linux-3.0.1-vs2.3.1-pre9/fs/open.c
---- linux-3.0.1/fs/open.c      2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/open.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/open.c linux-3.0.3-vs2.3.1-pre10/fs/open.c
+--- linux-3.0.3/fs/open.c      2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/open.c        2011-06-10 22:11:24.000000000 +0200
 @@ -30,6 +30,11 @@
  #include <linux/fs_struct.h>
  #include <linux/ima.h>
@@ -8197,9 +8197,9 @@ diff -NurpP --minimal linux-3.0.1/fs/open.c linux-3.0.1-vs2.3.1-pre9/fs/open.c
  }
  
  void put_unused_fd(unsigned int fd)
-diff -NurpP --minimal linux-3.0.1/fs/proc/array.c linux-3.0.1-vs2.3.1-pre9/fs/proc/array.c
---- linux-3.0.1/fs/proc/array.c        2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/array.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/array.c linux-3.0.3-vs2.3.1-pre10/fs/proc/array.c
+--- linux-3.0.3/fs/proc/array.c        2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/array.c  2011-06-10 22:11:24.000000000 +0200
 @@ -81,6 +81,8 @@
  #include <linux/pid_namespace.h>
  #include <linux/ptrace.h>
@@ -8313,9 +8313,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/array.c linux-3.0.1-vs2.3.1-pre9/fs/pr
        seq_printf(m, "%d (%s) %c %d %d %d %d %d %u %lu \
  %lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
  %lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu %lu %ld\n",
-diff -NurpP --minimal linux-3.0.1/fs/proc/base.c linux-3.0.1-vs2.3.1-pre9/fs/proc/base.c
---- linux-3.0.1/fs/proc/base.c 2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/base.c    2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/base.c linux-3.0.3-vs2.3.1-pre10/fs/proc/base.c
+--- linux-3.0.3/fs/proc/base.c 2011-08-29 03:10:25.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/base.c   2011-08-08 23:04:47.000000000 +0200
 @@ -83,6 +83,8 @@
  #include <linux/pid_namespace.h>
  #include <linux/fs_struct.h>
@@ -8486,9 +8486,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/base.c linux-3.0.1-vs2.3.1-pre9/fs/pro
  
        ns = dentry->d_sb->s_fs_info;
        rcu_read_lock();
-diff -NurpP --minimal linux-3.0.1/fs/proc/generic.c linux-3.0.1-vs2.3.1-pre9/fs/proc/generic.c
---- linux-3.0.1/fs/proc/generic.c      2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/generic.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/generic.c linux-3.0.3-vs2.3.1-pre10/fs/proc/generic.c
+--- linux-3.0.3/fs/proc/generic.c      2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/generic.c        2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/bitops.h>
  #include <linux/spinlock.h>
@@ -8548,9 +8548,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/generic.c linux-3.0.1-vs2.3.1-pre9/fs/
                } else {
                        kfree(ent);
                        ent = NULL;
-diff -NurpP --minimal linux-3.0.1/fs/proc/inode.c linux-3.0.1-vs2.3.1-pre9/fs/proc/inode.c
---- linux-3.0.1/fs/proc/inode.c        2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/inode.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/inode.c linux-3.0.3-vs2.3.1-pre10/fs/proc/inode.c
+--- linux-3.0.3/fs/proc/inode.c        2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/inode.c  2011-06-10 22:11:24.000000000 +0200
 @@ -442,6 +442,8 @@ struct inode *proc_get_inode(struct supe
                        inode->i_uid = de->uid;
                        inode->i_gid = de->gid;
@@ -8560,9 +8560,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/inode.c linux-3.0.1-vs2.3.1-pre9/fs/pr
                if (de->size)
                        inode->i_size = de->size;
                if (de->nlink)
-diff -NurpP --minimal linux-3.0.1/fs/proc/internal.h linux-3.0.1-vs2.3.1-pre9/fs/proc/internal.h
---- linux-3.0.1/fs/proc/internal.h     2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/internal.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/internal.h linux-3.0.3-vs2.3.1-pre10/fs/proc/internal.h
+--- linux-3.0.3/fs/proc/internal.h     2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/internal.h       2011-06-10 22:11:24.000000000 +0200
 @@ -10,6 +10,7 @@
   */
  
@@ -8599,9 +8599,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/internal.h linux-3.0.1-vs2.3.1-pre9/fs
  static inline int proc_fd(struct inode *inode)
  {
        return PROC_I(inode)->fd;
-diff -NurpP --minimal linux-3.0.1/fs/proc/loadavg.c linux-3.0.1-vs2.3.1-pre9/fs/proc/loadavg.c
---- linux-3.0.1/fs/proc/loadavg.c      2009-09-10 15:26:23.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/loadavg.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/loadavg.c linux-3.0.3-vs2.3.1-pre10/fs/proc/loadavg.c
+--- linux-3.0.3/fs/proc/loadavg.c      2009-09-10 15:26:23.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/loadavg.c        2011-06-10 22:11:24.000000000 +0200
 @@ -12,15 +12,27 @@
  
  static int loadavg_proc_show(struct seq_file *m, void *v)
@@ -8631,9 +8631,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/loadavg.c linux-3.0.1-vs2.3.1-pre9/fs/
                task_active_pid_ns(current)->last_pid);
        return 0;
  }
-diff -NurpP --minimal linux-3.0.1/fs/proc/meminfo.c linux-3.0.1-vs2.3.1-pre9/fs/proc/meminfo.c
---- linux-3.0.1/fs/proc/meminfo.c      2011-03-15 18:07:33.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/meminfo.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/meminfo.c linux-3.0.3-vs2.3.1-pre10/fs/proc/meminfo.c
+--- linux-3.0.3/fs/proc/meminfo.c      2011-03-15 18:07:33.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/meminfo.c        2011-06-10 22:11:24.000000000 +0200
 @@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_
        allowed = ((totalram_pages - hugetlb_total_pages())
                * sysctl_overcommit_ratio / 100) + total_swap_pages;
@@ -8644,9 +8644,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/meminfo.c linux-3.0.1-vs2.3.1-pre9/fs/
                        total_swapcache_pages - i.bufferram;
        if (cached < 0)
                cached = 0;
-diff -NurpP --minimal linux-3.0.1/fs/proc/root.c linux-3.0.1-vs2.3.1-pre9/fs/proc/root.c
---- linux-3.0.1/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/root.c    2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/root.c linux-3.0.3-vs2.3.1-pre10/fs/proc/root.c
+--- linux-3.0.3/fs/proc/root.c 2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/root.c   2011-06-22 12:39:15.000000000 +0200
 @@ -18,9 +18,14 @@
  #include <linux/bitops.h>
  #include <linux/mount.h>
@@ -8678,9 +8678,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/root.c linux-3.0.1-vs2.3.1-pre9/fs/pro
  };
  
  int pid_ns_prepare_proc(struct pid_namespace *ns)
-diff -NurpP --minimal linux-3.0.1/fs/proc/uptime.c linux-3.0.1-vs2.3.1-pre9/fs/proc/uptime.c
---- linux-3.0.1/fs/proc/uptime.c       2009-12-03 20:02:53.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/proc/uptime.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/proc/uptime.c linux-3.0.3-vs2.3.1-pre10/fs/proc/uptime.c
+--- linux-3.0.3/fs/proc/uptime.c       2009-12-03 20:02:53.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/proc/uptime.c 2011-06-10 22:11:24.000000000 +0200
 @@ -4,22 +4,22 @@
  #include <linux/sched.h>
  #include <linux/seq_file.h>
@@ -8710,9 +8710,9 @@ diff -NurpP --minimal linux-3.0.1/fs/proc/uptime.c linux-3.0.1-vs2.3.1-pre9/fs/p
        seq_printf(m, "%lu.%02lu %lu.%02lu\n",
                        (unsigned long) uptime.tv_sec,
                        (uptime.tv_nsec / (NSEC_PER_SEC / 100)),
-diff -NurpP --minimal linux-3.0.1/fs/quota/dquot.c linux-3.0.1-vs2.3.1-pre9/fs/quota/dquot.c
---- linux-3.0.1/fs/quota/dquot.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/quota/dquot.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/quota/dquot.c linux-3.0.3-vs2.3.1-pre10/fs/quota/dquot.c
+--- linux-3.0.3/fs/quota/dquot.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/quota/dquot.c 2011-06-10 22:11:24.000000000 +0200
 @@ -1548,6 +1548,9 @@ int __dquot_alloc_space(struct inode *in
        int reserve = flags & DQUOT_SPACE_RESERVE;
        int nofail = flags & DQUOT_SPACE_NOFAIL;
@@ -8751,9 +8751,9 @@ diff -NurpP --minimal linux-3.0.1/fs/quota/dquot.c linux-3.0.1-vs2.3.1-pre9/fs/q
        /* First test before acquiring mutex - solves deadlocks when we
           * re-enter the quota code and are already holding the mutex */
        if (!dquot_active(inode))
-diff -NurpP --minimal linux-3.0.1/fs/quota/quota.c linux-3.0.1-vs2.3.1-pre9/fs/quota/quota.c
---- linux-3.0.1/fs/quota/quota.c       2011-03-15 18:07:34.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/quota/quota.c  2011-06-13 18:19:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/quota/quota.c linux-3.0.3-vs2.3.1-pre10/fs/quota/quota.c
+--- linux-3.0.3/fs/quota/quota.c       2011-03-15 18:07:34.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/quota/quota.c 2011-06-13 18:19:47.000000000 +0200
 @@ -8,6 +8,7 @@
  #include <linux/fs.h>
  #include <linux/namei.h>
@@ -8841,18 +8841,18 @@ diff -NurpP --minimal linux-3.0.1/fs/quota/quota.c linux-3.0.1-vs2.3.1-pre9/fs/q
        sb = get_super(bdev);
        bdput(bdev);
        if (!sb)
-diff -NurpP --minimal linux-3.0.1/fs/reiserfs/file.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/file.c
---- linux-3.0.1/fs/reiserfs/file.c     2011-01-05 21:50:26.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/file.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/reiserfs/file.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/file.c
+--- linux-3.0.3/fs/reiserfs/file.c     2011-01-05 21:50:26.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/file.c       2011-06-10 22:11:24.000000000 +0200
 @@ -312,4 +312,5 @@ const struct inode_operations reiserfs_f
        .listxattr = reiserfs_listxattr,
        .removexattr = reiserfs_removexattr,
        .permission = reiserfs_permission,
 +      .sync_flags = reiserfs_sync_flags,
  };
-diff -NurpP --minimal linux-3.0.1/fs/reiserfs/inode.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/inode.c
---- linux-3.0.1/fs/reiserfs/inode.c    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/inode.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/reiserfs/inode.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/inode.c
+--- linux-3.0.3/fs/reiserfs/inode.c    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/inode.c      2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/writeback.h>
  #include <linux/quotaops.h>
@@ -9018,9 +9018,9 @@ diff -NurpP --minimal linux-3.0.1/fs/reiserfs/inode.c linux-3.0.1-vs2.3.1-pre9/f
                mark_inode_dirty(inode);
                error = journal_end(&th, inode->i_sb, jbegin_count);
                if (error)
-diff -NurpP --minimal linux-3.0.1/fs/reiserfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/ioctl.c
---- linux-3.0.1/fs/reiserfs/ioctl.c    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/ioctl.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/reiserfs/ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/ioctl.c
+--- linux-3.0.3/fs/reiserfs/ioctl.c    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/ioctl.c      2011-06-10 22:11:24.000000000 +0200
 @@ -11,6 +11,21 @@
  #include <linux/pagemap.h>
  #include <linux/compat.h>
@@ -9082,9 +9082,9 @@ diff -NurpP --minimal linux-3.0.1/fs/reiserfs/ioctl.c linux-3.0.1-vs2.3.1-pre9/f
                        sd_attrs_to_i_attrs(flags, inode);
                        REISERFS_I(inode)->i_attrs = flags;
                        inode->i_ctime = CURRENT_TIME_SEC;
-diff -NurpP --minimal linux-3.0.1/fs/reiserfs/namei.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/namei.c
---- linux-3.0.1/fs/reiserfs/namei.c    2011-05-22 16:17:53.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/namei.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/reiserfs/namei.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/namei.c
+--- linux-3.0.3/fs/reiserfs/namei.c    2011-05-22 16:17:53.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/namei.c      2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/reiserfs_acl.h>
  #include <linux/reiserfs_xattr.h>
@@ -9109,9 +9109,9 @@ diff -NurpP --minimal linux-3.0.1/fs/reiserfs/namei.c linux-3.0.1-vs2.3.1-pre9/f
  };
  
  /*
-diff -NurpP --minimal linux-3.0.1/fs/reiserfs/super.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/super.c
---- linux-3.0.1/fs/reiserfs/super.c    2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/super.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/reiserfs/super.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/super.c
+--- linux-3.0.3/fs/reiserfs/super.c    2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/super.c      2011-06-10 22:11:24.000000000 +0200
 @@ -899,6 +899,14 @@ static int reiserfs_parse_options(struct
                {"user_xattr",.setmask = 1 << REISERFS_UNSUPPORTED_OPT},
                {"nouser_xattr",.clrmask = 1 << REISERFS_UNSUPPORTED_OPT},
@@ -9153,9 +9153,9 @@ diff -NurpP --minimal linux-3.0.1/fs/reiserfs/super.c linux-3.0.1-vs2.3.1-pre9/f
        rs = SB_DISK_SUPER_BLOCK(s);
        /* Let's do basic sanity check to verify that underlying device is not
           smaller than the filesystem. If the check fails then abort and scream,
-diff -NurpP --minimal linux-3.0.1/fs/reiserfs/xattr.c linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/xattr.c
---- linux-3.0.1/fs/reiserfs/xattr.c    2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/reiserfs/xattr.c       2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/reiserfs/xattr.c linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/xattr.c
+--- linux-3.0.3/fs/reiserfs/xattr.c    2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/reiserfs/xattr.c      2011-06-22 12:39:15.000000000 +0200
 @@ -40,6 +40,7 @@
  #include <linux/errno.h>
  #include <linux/gfp.h>
@@ -9164,9 +9164,9 @@ diff -NurpP --minimal linux-3.0.1/fs/reiserfs/xattr.c linux-3.0.1-vs2.3.1-pre9/f
  #include <linux/file.h>
  #include <linux/pagemap.h>
  #include <linux/xattr.h>
-diff -NurpP --minimal linux-3.0.1/fs/stat.c linux-3.0.1-vs2.3.1-pre9/fs/stat.c
---- linux-3.0.1/fs/stat.c      2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/stat.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/stat.c linux-3.0.3-vs2.3.1-pre10/fs/stat.c
+--- linux-3.0.3/fs/stat.c      2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/stat.c        2011-06-10 22:11:24.000000000 +0200
 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod
        stat->nlink = inode->i_nlink;
        stat->uid = inode->i_uid;
@@ -9175,9 +9175,9 @@ diff -NurpP --minimal linux-3.0.1/fs/stat.c linux-3.0.1-vs2.3.1-pre9/fs/stat.c
        stat->rdev = inode->i_rdev;
        stat->atime = inode->i_atime;
        stat->mtime = inode->i_mtime;
-diff -NurpP --minimal linux-3.0.1/fs/statfs.c linux-3.0.1-vs2.3.1-pre9/fs/statfs.c
---- linux-3.0.1/fs/statfs.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/statfs.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/statfs.c linux-3.0.3-vs2.3.1-pre10/fs/statfs.c
+--- linux-3.0.3/fs/statfs.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/statfs.c      2011-06-10 22:11:24.000000000 +0200
 @@ -7,6 +7,8 @@
  #include <linux/statfs.h>
  #include <linux/security.h>
@@ -9196,9 +9196,9 @@ diff -NurpP --minimal linux-3.0.1/fs/statfs.c linux-3.0.1-vs2.3.1-pre9/fs/statfs
        return retval;
  }
  
-diff -NurpP --minimal linux-3.0.1/fs/super.c linux-3.0.1-vs2.3.1-pre9/fs/super.c
---- linux-3.0.1/fs/super.c     2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/super.c        2011-07-23 16:49:09.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/super.c linux-3.0.3-vs2.3.1-pre10/fs/super.c
+--- linux-3.0.3/fs/super.c     2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/super.c       2011-07-23 16:49:09.000000000 +0200
 @@ -32,6 +32,9 @@
  #include <linux/backing-dev.h>
  #include <linux/rculist_bl.h>
@@ -9223,9 +9223,9 @@ diff -NurpP --minimal linux-3.0.1/fs/super.c linux-3.0.1-vs2.3.1-pre9/fs/super.c
        error = security_sb_kern_mount(sb, flags, secdata);
        if (error)
                goto out_sb;
-diff -NurpP --minimal linux-3.0.1/fs/sysfs/mount.c linux-3.0.1-vs2.3.1-pre9/fs/sysfs/mount.c
---- linux-3.0.1/fs/sysfs/mount.c       2011-07-22 11:18:06.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/sysfs/mount.c  2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/sysfs/mount.c linux-3.0.3-vs2.3.1-pre10/fs/sysfs/mount.c
+--- linux-3.0.3/fs/sysfs/mount.c       2011-07-22 11:18:06.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/sysfs/mount.c 2011-06-22 12:39:15.000000000 +0200
 @@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super
  
        sb->s_blocksize = PAGE_CACHE_SIZE;
@@ -9235,9 +9235,9 @@ diff -NurpP --minimal linux-3.0.1/fs/sysfs/mount.c linux-3.0.1-vs2.3.1-pre9/fs/s
        sb->s_op = &sysfs_ops;
        sb->s_time_gran = 1;
  
-diff -NurpP --minimal linux-3.0.1/fs/utimes.c linux-3.0.1-vs2.3.1-pre9/fs/utimes.c
---- linux-3.0.1/fs/utimes.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/utimes.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/utimes.c linux-3.0.3-vs2.3.1-pre10/fs/utimes.c
+--- linux-3.0.3/fs/utimes.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/utimes.c      2011-06-10 22:11:24.000000000 +0200
 @@ -8,6 +8,8 @@
  #include <linux/stat.h>
  #include <linux/utime.h>
@@ -9267,9 +9267,9 @@ diff -NurpP --minimal linux-3.0.1/fs/utimes.c linux-3.0.1-vs2.3.1-pre9/fs/utimes
        if (times && times[0].tv_nsec == UTIME_NOW &&
                     times[1].tv_nsec == UTIME_NOW)
                times = NULL;
-diff -NurpP --minimal linux-3.0.1/fs/xattr.c linux-3.0.1-vs2.3.1-pre9/fs/xattr.c
---- linux-3.0.1/fs/xattr.c     2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xattr.c        2011-06-10 23:10:19.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xattr.c linux-3.0.3-vs2.3.1-pre10/fs/xattr.c
+--- linux-3.0.3/fs/xattr.c     2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xattr.c       2011-06-10 23:10:19.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/module.h>
  #include <linux/fsnotify.h>
@@ -9287,9 +9287,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xattr.c linux-3.0.1-vs2.3.1-pre9/fs/xattr.c
                        return (mask & MAY_WRITE) ? -EPERM : -ENODATA;
                return 0;
        }
-diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.c
---- linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.c   2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.c
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.c   2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.c     2011-06-10 22:11:24.000000000 +0200
 @@ -28,7 +28,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
@@ -9358,9 +9358,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.c linux-3.0.1-vs2.3
                return xfs_ioc_setxflags(ip, filp, arg);
  
        case XFS_IOC_FSSETDM: {
-diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.h
---- linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.h   2010-07-07 18:31:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_ioctl.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.h
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_ioctl.h   2010-07-07 18:31:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_ioctl.h     2011-06-10 22:11:24.000000000 +0200
 @@ -70,6 +70,12 @@ xfs_handle_to_dentry(
        void __user             *uhandle,
        u32                     hlen);
@@ -9374,9 +9374,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_ioctl.h linux-3.0.1-vs2.3
  extern long
  xfs_file_ioctl(
        struct file             *filp,
-diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_iops.c
---- linux-3.0.1/fs/xfs/linux-2.6/xfs_iops.c    2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_iops.c       2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_iops.c
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_iops.c    2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_iops.c      2011-06-22 12:39:15.000000000 +0200
 @@ -30,6 +30,7 @@
  #include "xfs_bmap_btree.h"
  #include "xfs_dinode.h"
@@ -9452,9 +9452,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_iops.c linux-3.0.1-vs2.3.
  
        switch (inode->i_mode & S_IFMT) {
        case S_IFBLK:
-diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_linux.h
---- linux-3.0.1/fs/xfs/linux-2.6/xfs_linux.h   2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_linux.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_linux.h
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_linux.h   2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_linux.h     2011-06-10 22:11:24.000000000 +0200
 @@ -115,6 +115,7 @@
  
  #define current_cpu()         (raw_smp_processor_id())
@@ -9463,9 +9463,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_linux.h linux-3.0.1-vs2.3
  #define current_test_flags(f) (current->flags & (f))
  #define current_set_flags_nested(sp, f)               \
                (*(sp) = current->flags, current->flags |= (f))
-diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_super.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_super.c
---- linux-3.0.1/fs/xfs/linux-2.6/xfs_super.c   2011-07-22 11:18:09.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/linux-2.6/xfs_super.c      2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/linux-2.6/xfs_super.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_super.c
+--- linux-3.0.3/fs/xfs/linux-2.6/xfs_super.c   2011-07-22 11:18:09.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/linux-2.6/xfs_super.c     2011-06-22 12:39:15.000000000 +0200
 @@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool;
  #define MNTOPT_NODELAYLOG  "nodelaylog"       /* Delayed logging disabled */
  #define MNTOPT_DISCARD           "discard"    /* Discard unused blocks */
@@ -9538,9 +9538,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/linux-2.6/xfs_super.c linux-3.0.1-vs2.3
        /*
         * we must configure the block size in the superblock before we run the
         * full mount process as the mount process can lookup and cache inodes.
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_dinode.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_dinode.h
---- linux-3.0.1/fs/xfs/xfs_dinode.h    2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_dinode.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_dinode.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_dinode.h
+--- linux-3.0.3/fs/xfs/xfs_dinode.h    2011-01-05 21:50:28.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_dinode.h      2011-06-10 22:11:24.000000000 +0200
 @@ -51,7 +51,9 @@ typedef struct xfs_dinode {
        __be32          di_nlink;       /* number of links to file */
        __be16          di_projid_lo;   /* lower part of owner's project id */
@@ -9581,9 +9581,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_dinode.h linux-3.0.1-vs2.3.1-pre9/f
 +#define XFS_DIVFLAG_COW               0x02
  
  #endif        /* __XFS_DINODE_H__ */
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_fs.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_fs.h
---- linux-3.0.1/fs/xfs/xfs_fs.h        2011-01-05 21:50:28.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_fs.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_fs.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_fs.h
+--- linux-3.0.3/fs/xfs/xfs_fs.h        2011-01-05 21:50:28.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_fs.h  2011-06-10 22:11:24.000000000 +0200
 @@ -67,6 +67,9 @@ struct fsxattr {
  #define XFS_XFLAG_EXTSZINHERIT        0x00001000      /* inherit inode extent size */
  #define XFS_XFLAG_NODEFRAG    0x00002000      /* do not defragment */
@@ -9604,9 +9604,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_fs.h linux-3.0.1-vs2.3.1-pre9/fs/xf
        __u32           bs_dmevmask;    /* DMIG event mask              */
        __u16           bs_dmstate;     /* DMIG state info              */
        __u16           bs_aextents;    /* attribute number of extents  */
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_ialloc.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_ialloc.c
---- linux-3.0.1/fs/xfs/xfs_ialloc.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_ialloc.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_ialloc.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_ialloc.c
+--- linux-3.0.3/fs/xfs/xfs_ialloc.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_ialloc.c      2011-06-10 22:11:24.000000000 +0200
 @@ -37,7 +37,6 @@
  #include "xfs_error.h"
  #include "xfs_bmap.h"
@@ -9615,9 +9615,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_ialloc.c linux-3.0.1-vs2.3.1-pre9/f
  /*
   * Allocation group level functions.
   */
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_inode.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.c
---- linux-3.0.1/fs/xfs/xfs_inode.c     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_inode.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.c
+--- linux-3.0.3/fs/xfs/xfs_inode.c     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.c       2011-06-10 22:11:24.000000000 +0200
 @@ -243,6 +243,7 @@ xfs_inotobp(
        return 0;
  }
@@ -9792,9 +9792,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_inode.c linux-3.0.1-vs2.3.1-pre9/fs
  
        /* Wrap, we never let the log put out DI_MAX_FLUSH */
        if (ip->i_d.di_flushiter == DI_MAX_FLUSH)
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_inode.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.h
---- linux-3.0.1/fs/xfs/xfs_inode.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_inode.h        2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_inode.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.h
+--- linux-3.0.3/fs/xfs/xfs_inode.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_inode.h       2011-07-01 11:35:35.000000000 +0200
 @@ -135,7 +135,9 @@ typedef struct xfs_icdinode {
        __uint32_t      di_nlink;       /* number of links to file */
        __uint16_t      di_projid_lo;   /* lower part of owner's project id */
@@ -9815,9 +9815,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_inode.h linux-3.0.1-vs2.3.1-pre9/fs
  void          xfs_idestroy_fork(struct xfs_inode *, int);
  void          xfs_idata_realloc(struct xfs_inode *, int, int);
  void          xfs_iroot_realloc(struct xfs_inode *, int, int);
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_itable.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_itable.c
---- linux-3.0.1/fs/xfs/xfs_itable.c    2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_itable.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_itable.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_itable.c
+--- linux-3.0.3/fs/xfs/xfs_itable.c    2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_itable.c      2011-06-10 22:11:24.000000000 +0200
 @@ -98,6 +98,7 @@ xfs_bulkstat_one_int(
        buf->bs_mode = dic->di_mode;
        buf->bs_uid = dic->di_uid;
@@ -9826,9 +9826,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_itable.c linux-3.0.1-vs2.3.1-pre9/f
        buf->bs_size = dic->di_size;
  
        /*
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_log_recover.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_log_recover.c
---- linux-3.0.1/fs/xfs/xfs_log_recover.c       2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_log_recover.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_log_recover.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_log_recover.c
+--- linux-3.0.3/fs/xfs/xfs_log_recover.c       2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_log_recover.c 2011-06-10 22:11:24.000000000 +0200
 @@ -2343,7 +2343,8 @@ xlog_recover_inode_pass2(
        }
  
@@ -9839,9 +9839,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_log_recover.c linux-3.0.1-vs2.3.1-p
  
        /* the rest is in on-disk format */
        if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) {
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_mount.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_mount.h
---- linux-3.0.1/fs/xfs/xfs_mount.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_mount.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_mount.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_mount.h
+--- linux-3.0.3/fs/xfs/xfs_mount.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_mount.h       2011-06-10 22:11:24.000000000 +0200
 @@ -249,6 +249,7 @@ typedef struct xfs_mount {
                                                   allocator */
  #define XFS_MOUNT_NOATTR2     (1ULL << 25)    /* disable use of attr2 format */
@@ -9850,9 +9850,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_mount.h linux-3.0.1-vs2.3.1-pre9/fs
  
  /*
   * Default minimum read and write sizes.
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_vnodeops.c linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.c
---- linux-3.0.1/fs/xfs/xfs_vnodeops.c  2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.c     2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_vnodeops.c linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.c
+--- linux-3.0.3/fs/xfs/xfs_vnodeops.c  2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.c    2011-07-01 11:35:35.000000000 +0200
 @@ -50,6 +50,78 @@
  #include "xfs_vnodeops.h"
  #include "xfs_trace.h"
@@ -9990,9 +9990,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_vnodeops.c linux-3.0.1-vs2.3.1-pre9
                if (iuid != uid) {
                        if (XFS_IS_QUOTA_RUNNING(mp) && XFS_IS_UQUOTA_ON(mp)) {
                                ASSERT(mask & ATTR_UID);
-diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_vnodeops.h linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.h
---- linux-3.0.1/fs/xfs/xfs_vnodeops.h  2011-05-22 16:17:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/fs/xfs/xfs_vnodeops.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/fs/xfs/xfs_vnodeops.h linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.h
+--- linux-3.0.3/fs/xfs/xfs_vnodeops.h  2011-05-22 16:17:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/fs/xfs/xfs_vnodeops.h    2011-06-10 22:11:24.000000000 +0200
 @@ -13,6 +13,7 @@ struct xfs_inode;
  struct xfs_iomap;
  
@@ -10001,9 +10001,9 @@ diff -NurpP --minimal linux-3.0.1/fs/xfs/xfs_vnodeops.h linux-3.0.1-vs2.3.1-pre9
  int xfs_setattr(struct xfs_inode *ip, struct iattr *vap, int flags);
  #define       XFS_ATTR_DMI            0x01    /* invocation from a DMI function */
  #define       XFS_ATTR_NONBLOCK       0x02    /* return EAGAIN if operation would block */
-diff -NurpP --minimal linux-3.0.1/include/asm-generic/tlb.h linux-3.0.1-vs2.3.1-pre9/include/asm-generic/tlb.h
---- linux-3.0.1/include/asm-generic/tlb.h      2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/asm-generic/tlb.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/asm-generic/tlb.h linux-3.0.3-vs2.3.1-pre10/include/asm-generic/tlb.h
+--- linux-3.0.3/include/asm-generic/tlb.h      2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/asm-generic/tlb.h        2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #define _ASM_GENERIC__TLB_H
  
@@ -10012,9 +10012,9 @@ diff -NurpP --minimal linux-3.0.1/include/asm-generic/tlb.h linux-3.0.1-vs2.3.1-
  #include <asm/pgalloc.h>
  #include <asm/tlbflush.h>
  
-diff -NurpP --minimal linux-3.0.1/include/linux/Kbuild linux-3.0.1-vs2.3.1-pre9/include/linux/Kbuild
---- linux-3.0.1/include/linux/Kbuild   2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/Kbuild      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/Kbuild linux-3.0.3-vs2.3.1-pre10/include/linux/Kbuild
+--- linux-3.0.3/include/linux/Kbuild   2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/Kbuild     2011-06-10 22:11:24.000000000 +0200
 @@ -17,6 +17,7 @@ header-y += netfilter_bridge/
  header-y += netfilter_ipv4/
  header-y += netfilter_ipv6/
@@ -10023,9 +10023,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/Kbuild linux-3.0.1-vs2.3.1-pre9/
  header-y += wimax/
  
  objhdr-y += version.h
-diff -NurpP --minimal linux-3.0.1/include/linux/capability.h linux-3.0.1-vs2.3.1-pre9/include/linux/capability.h
---- linux-3.0.1/include/linux/capability.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/capability.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/capability.h linux-3.0.3-vs2.3.1-pre10/include/linux/capability.h
+--- linux-3.0.3/include/linux/capability.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/capability.h       2011-06-10 22:11:24.000000000 +0200
 @@ -279,6 +279,7 @@ struct cpu_vfs_cap_data {
     arbitrary SCSI commands */
  /* Allow setting encryption key on loopback filesystem */
@@ -10048,9 +10048,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/capability.h linux-3.0.1-vs2.3.1
  
  /*
   * Bit location of each capability (used by user-space library and kernel)
-diff -NurpP --minimal linux-3.0.1/include/linux/cred.h linux-3.0.1-vs2.3.1-pre9/include/linux/cred.h
---- linux-3.0.1/include/linux/cred.h   2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/cred.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/cred.h linux-3.0.3-vs2.3.1-pre10/include/linux/cred.h
+--- linux-3.0.3/include/linux/cred.h   2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/cred.h     2011-06-10 22:11:24.000000000 +0200
 @@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc
  extern int copy_creds(struct task_struct *, unsigned long);
  extern const struct cred *get_task_cred(struct task_struct *);
@@ -10091,18 +10091,18 @@ diff -NurpP --minimal linux-3.0.1/include/linux/cred.h linux-3.0.1-vs2.3.1-pre9/
  /**
   * get_new_cred - Get a reference on a new set of credentials
   * @cred: The new credentials to reference
-diff -NurpP --minimal linux-3.0.1/include/linux/devpts_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/devpts_fs.h
---- linux-3.0.1/include/linux/devpts_fs.h      2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/devpts_fs.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/devpts_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/devpts_fs.h
+--- linux-3.0.3/include/linux/devpts_fs.h      2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/devpts_fs.h        2011-06-10 22:11:24.000000000 +0200
 @@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc
  
  #endif
  
 -
  #endif /* _LINUX_DEVPTS_FS_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/ext2_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/ext2_fs.h
---- linux-3.0.1/include/linux/ext2_fs.h        2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/ext2_fs.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/ext2_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/ext2_fs.h
+--- linux-3.0.3/include/linux/ext2_fs.h        2010-02-25 11:52:07.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/ext2_fs.h  2011-06-10 22:11:24.000000000 +0200
 @@ -189,8 +189,12 @@ struct ext2_group_desc
  #define EXT2_NOTAIL_FL                        FS_NOTAIL_FL    /* file tail should not be merged */
  #define EXT2_DIRSYNC_FL                       FS_DIRSYNC_FL   /* dirsync behaviour (directories only) */
@@ -10142,9 +10142,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/ext2_fs.h linux-3.0.1-vs2.3.1-pr
  
  
  #define clear_opt(o, opt)             o &= ~EXT2_MOUNT_##opt
-diff -NurpP --minimal linux-3.0.1/include/linux/ext3_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/ext3_fs.h
---- linux-3.0.1/include/linux/ext3_fs.h        2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/ext3_fs.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/ext3_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/ext3_fs.h
+--- linux-3.0.3/include/linux/ext3_fs.h        2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/ext3_fs.h  2011-06-10 22:11:24.000000000 +0200
 @@ -173,10 +173,14 @@ struct ext3_group_desc
  #define EXT3_NOTAIL_FL                        0x00008000 /* file tail should not be merged */
  #define EXT3_DIRSYNC_FL                       0x00010000 /* dirsync behaviour (directories only) */
@@ -10196,9 +10196,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/ext3_fs.h linux-3.0.1-vs2.3.1-pr
  
  /* ioctl.c */
  extern long ext3_ioctl(struct file *, unsigned int, unsigned long);
-diff -NurpP --minimal linux-3.0.1/include/linux/fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/fs.h
---- linux-3.0.1/include/linux/fs.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/fs.h        2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/fs.h
+--- linux-3.0.3/include/linux/fs.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/fs.h       2011-07-01 11:35:35.000000000 +0200
 @@ -208,6 +208,9 @@ struct inodes_stat_t {
  #define MS_KERNMOUNT  (1<<22) /* this is a kern_mount call */
  #define MS_I_VERSION  (1<<23) /* Update inode I_version field */
@@ -10381,9 +10381,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/fs.h linux-3.0.1-vs2.3.1-pre9/in
  extern int simple_setattr(struct dentry *, struct iattr *);
  extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *);
  extern int simple_statfs(struct dentry *, struct kstatfs *);
-diff -NurpP --minimal linux-3.0.1/include/linux/gfs2_ondisk.h linux-3.0.1-vs2.3.1-pre9/include/linux/gfs2_ondisk.h
---- linux-3.0.1/include/linux/gfs2_ondisk.h    2010-07-07 18:31:55.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/gfs2_ondisk.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/gfs2_ondisk.h linux-3.0.3-vs2.3.1-pre10/include/linux/gfs2_ondisk.h
+--- linux-3.0.3/include/linux/gfs2_ondisk.h    2010-07-07 18:31:55.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/gfs2_ondisk.h      2011-06-10 22:11:24.000000000 +0200
 @@ -211,6 +211,9 @@ enum {
        gfs2fl_NoAtime          = 7,
        gfs2fl_Sync             = 8,
@@ -10404,9 +10404,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/gfs2_ondisk.h linux-3.0.1-vs2.3.
  #define GFS2_DIF_TRUNC_IN_PROG                0x20000000 /* New in gfs2 */
  #define GFS2_DIF_INHERIT_DIRECTIO     0x40000000
  #define GFS2_DIF_INHERIT_JDATA                0x80000000
-diff -NurpP --minimal linux-3.0.1/include/linux/if_tun.h linux-3.0.1-vs2.3.1-pre9/include/linux/if_tun.h
---- linux-3.0.1/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/if_tun.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/if_tun.h linux-3.0.3-vs2.3.1-pre10/include/linux/if_tun.h
+--- linux-3.0.3/include/linux/if_tun.h 2010-08-02 16:52:54.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/if_tun.h   2011-06-10 22:11:24.000000000 +0200
 @@ -53,6 +53,7 @@
  #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog)
  #define TUNGETVNETHDRSZ _IOR('T', 215, int)
@@ -10415,9 +10415,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/if_tun.h linux-3.0.1-vs2.3.1-pre
  
  /* TUNSETIFF ifr flags */
  #define IFF_TUN               0x0001
-diff -NurpP --minimal linux-3.0.1/include/linux/init_task.h linux-3.0.1-vs2.3.1-pre9/include/linux/init_task.h
---- linux-3.0.1/include/linux/init_task.h      2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/init_task.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/init_task.h linux-3.0.3-vs2.3.1-pre10/include/linux/init_task.h
+--- linux-3.0.3/include/linux/init_task.h      2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/init_task.h        2011-06-10 22:11:24.000000000 +0200
 @@ -193,6 +193,10 @@ extern struct cred init_cred;
        INIT_FTRACE_GRAPH                                               \
        INIT_TRACE_RECURSION                                            \
@@ -10429,9 +10429,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/init_task.h linux-3.0.1-vs2.3.1-
  }
  
  
-diff -NurpP --minimal linux-3.0.1/include/linux/ipc.h linux-3.0.1-vs2.3.1-pre9/include/linux/ipc.h
---- linux-3.0.1/include/linux/ipc.h    2009-12-03 20:02:55.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/ipc.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/ipc.h linux-3.0.3-vs2.3.1-pre10/include/linux/ipc.h
+--- linux-3.0.3/include/linux/ipc.h    2009-12-03 20:02:55.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/ipc.h      2011-06-10 22:11:24.000000000 +0200
 @@ -91,6 +91,7 @@ struct kern_ipc_perm
        key_t           key;
        uid_t           uid;
@@ -10440,9 +10440,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/ipc.h linux-3.0.1-vs2.3.1-pre9/i
        uid_t           cuid;
        gid_t           cgid;
        mode_t          mode; 
-diff -NurpP --minimal linux-3.0.1/include/linux/ipc_namespace.h linux-3.0.1-vs2.3.1-pre9/include/linux/ipc_namespace.h
---- linux-3.0.1/include/linux/ipc_namespace.h  2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/ipc_namespace.h     2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/ipc_namespace.h linux-3.0.3-vs2.3.1-pre10/include/linux/ipc_namespace.h
+--- linux-3.0.3/include/linux/ipc_namespace.h  2011-05-22 16:17:55.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/ipc_namespace.h    2011-06-13 14:09:44.000000000 +0200
 @@ -94,7 +94,8 @@ static inline int mq_init_ns(struct ipc_
  
  #if defined(CONFIG_IPC_NS)
@@ -10469,9 +10469,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/ipc_namespace.h linux-3.0.1-vs2.
  }
  
  static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns)
-diff -NurpP --minimal linux-3.0.1/include/linux/loop.h linux-3.0.1-vs2.3.1-pre9/include/linux/loop.h
---- linux-3.0.1/include/linux/loop.h   2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/loop.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/loop.h linux-3.0.3-vs2.3.1-pre10/include/linux/loop.h
+--- linux-3.0.3/include/linux/loop.h   2009-09-10 15:26:25.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/loop.h     2011-06-10 22:11:24.000000000 +0200
 @@ -45,6 +45,7 @@ struct loop_device {
        struct loop_func_table *lo_encryption;
        __u32           lo_init[2];
@@ -10480,9 +10480,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/loop.h linux-3.0.1-vs2.3.1-pre9/
        int             (*ioctl)(struct loop_device *, int cmd, 
                                 unsigned long arg); 
  
-diff -NurpP --minimal linux-3.0.1/include/linux/magic.h linux-3.0.1-vs2.3.1-pre9/include/linux/magic.h
---- linux-3.0.1/include/linux/magic.h  2011-05-22 16:17:55.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/magic.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/magic.h linux-3.0.3-vs2.3.1-pre10/include/linux/magic.h
+--- linux-3.0.3/include/linux/magic.h  2011-05-22 16:17:55.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/magic.h    2011-06-10 22:11:24.000000000 +0200
 @@ -3,7 +3,7 @@
  
  #define ADFS_SUPER_MAGIC      0xadf5
@@ -10500,9 +10500,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/magic.h linux-3.0.1-vs2.3.1-pre9
  #define QNX4_SUPER_MAGIC      0x002f          /* qnx4 fs detection */
  
  #define REISERFS_SUPER_MAGIC  0x52654973      /* used by gcc */
-diff -NurpP --minimal linux-3.0.1/include/linux/major.h linux-3.0.1-vs2.3.1-pre9/include/linux/major.h
---- linux-3.0.1/include/linux/major.h  2009-09-10 15:26:25.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/major.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/major.h linux-3.0.3-vs2.3.1-pre10/include/linux/major.h
+--- linux-3.0.3/include/linux/major.h  2009-09-10 15:26:25.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/major.h    2011-06-10 22:11:24.000000000 +0200
 @@ -15,6 +15,7 @@
  #define HD_MAJOR              IDE0_MAJOR
  #define PTY_SLAVE_MAJOR               3
@@ -10511,9 +10511,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/major.h linux-3.0.1-vs2.3.1-pre9
  #define TTYAUX_MAJOR          5
  #define LP_MAJOR              6
  #define VCS_MAJOR             7
-diff -NurpP --minimal linux-3.0.1/include/linux/memcontrol.h linux-3.0.1-vs2.3.1-pre9/include/linux/memcontrol.h
---- linux-3.0.1/include/linux/memcontrol.h     2011-07-22 11:18:10.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/memcontrol.h        2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/memcontrol.h linux-3.0.3-vs2.3.1-pre10/include/linux/memcontrol.h
+--- linux-3.0.3/include/linux/memcontrol.h     2011-07-22 11:18:10.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/memcontrol.h       2011-06-22 12:39:15.000000000 +0200
 @@ -86,6 +86,13 @@ extern struct mem_cgroup *try_get_mem_cg
  extern struct mem_cgroup *mem_cgroup_from_task(struct task_struct *p);
  extern struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm);
@@ -10528,9 +10528,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/memcontrol.h linux-3.0.1-vs2.3.1
  static inline
  int mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *cgroup)
  {
-diff -NurpP --minimal linux-3.0.1/include/linux/mm_types.h linux-3.0.1-vs2.3.1-pre9/include/linux/mm_types.h
---- linux-3.0.1/include/linux/mm_types.h       2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/mm_types.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/mm_types.h linux-3.0.3-vs2.3.1-pre10/include/linux/mm_types.h
+--- linux-3.0.3/include/linux/mm_types.h       2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/mm_types.h 2011-06-10 22:11:24.000000000 +0200
 @@ -268,6 +268,7 @@ struct mm_struct {
  
        /* Architecture-specific MM context */
@@ -10539,9 +10539,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/mm_types.h linux-3.0.1-vs2.3.1-p
  
        /* Swap token stuff */
        /*
-diff -NurpP --minimal linux-3.0.1/include/linux/mmzone.h linux-3.0.1-vs2.3.1-pre9/include/linux/mmzone.h
---- linux-3.0.1/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/mmzone.h    2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/mmzone.h linux-3.0.3-vs2.3.1-pre10/include/linux/mmzone.h
+--- linux-3.0.3/include/linux/mmzone.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/mmzone.h   2011-07-01 11:35:35.000000000 +0200
 @@ -654,6 +654,13 @@ typedef struct pglist_data {
        __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\
  })
@@ -10556,9 +10556,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/mmzone.h linux-3.0.1-vs2.3.1-pre
  #include <linux/memory_hotplug.h>
  
  extern struct mutex zonelists_mutex;
-diff -NurpP --minimal linux-3.0.1/include/linux/mount.h linux-3.0.1-vs2.3.1-pre9/include/linux/mount.h
---- linux-3.0.1/include/linux/mount.h  2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/mount.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/mount.h linux-3.0.3-vs2.3.1-pre10/include/linux/mount.h
+--- linux-3.0.3/include/linux/mount.h  2011-03-15 18:07:39.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/mount.h    2011-06-10 22:11:24.000000000 +0200
 @@ -52,6 +52,9 @@ struct mnt_pcp {
        int mnt_writers;
  };
@@ -10577,9 +10577,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/mount.h linux-3.0.1-vs2.3.1-pre9
  };
  
  struct file; /* forward dec */
-diff -NurpP --minimal linux-3.0.1/include/linux/net.h linux-3.0.1-vs2.3.1-pre9/include/linux/net.h
---- linux-3.0.1/include/linux/net.h    2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/net.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/net.h linux-3.0.3-vs2.3.1-pre10/include/linux/net.h
+--- linux-3.0.3/include/linux/net.h    2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/net.h      2011-06-10 22:11:24.000000000 +0200
 @@ -72,6 +72,7 @@ struct net;
  #define SOCK_NOSPACE          2
  #define SOCK_PASSCRED         3
@@ -10588,9 +10588,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/net.h linux-3.0.1-vs2.3.1-pre9/i
  
  #ifndef ARCH_HAS_SOCKET_TYPES
  /**
-diff -NurpP --minimal linux-3.0.1/include/linux/nfs_mount.h linux-3.0.1-vs2.3.1-pre9/include/linux/nfs_mount.h
---- linux-3.0.1/include/linux/nfs_mount.h      2011-01-05 21:50:31.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/nfs_mount.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/nfs_mount.h linux-3.0.3-vs2.3.1-pre10/include/linux/nfs_mount.h
+--- linux-3.0.3/include/linux/nfs_mount.h      2011-01-05 21:50:31.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/nfs_mount.h        2011-06-10 22:11:24.000000000 +0200
 @@ -63,7 +63,8 @@ struct nfs_mount_data {
  #define NFS_MOUNT_SECFLAVOUR  0x2000  /* 5 */
  #define NFS_MOUNT_NORDIRPLUS  0x4000  /* 5 */
@@ -10601,9 +10601,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/nfs_mount.h linux-3.0.1-vs2.3.1-
  
  /* The following are for internal use only */
  #define NFS_MOUNT_LOOKUP_CACHE_NONEG  0x10000
-diff -NurpP --minimal linux-3.0.1/include/linux/nsproxy.h linux-3.0.1-vs2.3.1-pre9/include/linux/nsproxy.h
---- linux-3.0.1/include/linux/nsproxy.h        2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/nsproxy.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/nsproxy.h linux-3.0.3-vs2.3.1-pre10/include/linux/nsproxy.h
+--- linux-3.0.3/include/linux/nsproxy.h        2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/nsproxy.h  2011-06-10 22:11:24.000000000 +0200
 @@ -3,6 +3,7 @@
  
  #include <linux/spinlock.h>
@@ -10652,9 +10652,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/nsproxy.h linux-3.0.1-vs2.3.1-pr
  }
  
  #endif
-diff -NurpP --minimal linux-3.0.1/include/linux/pid.h linux-3.0.1-vs2.3.1-pre9/include/linux/pid.h
---- linux-3.0.1/include/linux/pid.h    2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/pid.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/pid.h linux-3.0.3-vs2.3.1-pre10/include/linux/pid.h
+--- linux-3.0.3/include/linux/pid.h    2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/pid.h      2011-06-10 22:11:24.000000000 +0200
 @@ -8,7 +8,8 @@ enum pid_type
        PIDTYPE_PID,
        PIDTYPE_PGID,
@@ -10673,9 +10673,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/pid.h linux-3.0.1-vs2.3.1-pre9/i
  pid_t pid_vnr(struct pid *pid);
  
  #define do_each_pid_task(pid, type, task)                             \
-diff -NurpP --minimal linux-3.0.1/include/linux/proc_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/proc_fs.h
---- linux-3.0.1/include/linux/proc_fs.h        2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/proc_fs.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/proc_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/proc_fs.h
+--- linux-3.0.3/include/linux/proc_fs.h        2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/proc_fs.h  2011-06-10 22:11:24.000000000 +0200
 @@ -56,6 +56,7 @@ struct proc_dir_entry {
        nlink_t nlink;
        uid_t uid;
@@ -10711,9 +10711,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/proc_fs.h linux-3.0.1-vs2.3.1-pr
        int fd;
        union proc_op op;
        struct proc_dir_entry *pde;
-diff -NurpP --minimal linux-3.0.1/include/linux/quotaops.h linux-3.0.1-vs2.3.1-pre9/include/linux/quotaops.h
---- linux-3.0.1/include/linux/quotaops.h       2011-05-22 16:17:57.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/quotaops.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/quotaops.h linux-3.0.3-vs2.3.1-pre10/include/linux/quotaops.h
+--- linux-3.0.3/include/linux/quotaops.h       2011-05-22 16:17:57.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/quotaops.h 2011-06-10 22:11:24.000000000 +0200
 @@ -8,6 +8,7 @@
  #define _LINUX_QUOTAOPS_
  
@@ -10755,9 +10755,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/quotaops.h linux-3.0.1-vs2.3.1-p
  }
  
  static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number)
-diff -NurpP --minimal linux-3.0.1/include/linux/reboot.h linux-3.0.1-vs2.3.1-pre9/include/linux/reboot.h
---- linux-3.0.1/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/reboot.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/reboot.h linux-3.0.3-vs2.3.1-pre10/include/linux/reboot.h
+--- linux-3.0.3/include/linux/reboot.h 2010-07-07 18:31:56.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/reboot.h   2011-06-10 22:11:24.000000000 +0200
 @@ -33,6 +33,7 @@
  #define       LINUX_REBOOT_CMD_RESTART2       0xA1B2C3D4
  #define       LINUX_REBOOT_CMD_SW_SUSPEND     0xD000FCE2
@@ -10766,9 +10766,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/reboot.h linux-3.0.1-vs2.3.1-pre
  
  
  #ifdef __KERNEL__
-diff -NurpP --minimal linux-3.0.1/include/linux/reiserfs_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs.h
---- linux-3.0.1/include/linux/reiserfs_fs.h    2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/reiserfs_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs.h
+--- linux-3.0.3/include/linux/reiserfs_fs.h    2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs.h      2011-06-10 22:11:24.000000000 +0200
 @@ -976,6 +976,11 @@ struct stat_data_v1 {
  #define REISERFS_COMPR_FL     FS_COMPR_FL
  #define REISERFS_NOTAIL_FL    FS_NOTAIL_FL
@@ -10799,9 +10799,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/reiserfs_fs.h linux-3.0.1-vs2.3.
  
  int __reiserfs_write_begin(struct page *page, unsigned from, unsigned len);
  
-diff -NurpP --minimal linux-3.0.1/include/linux/reiserfs_fs_sb.h linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs_sb.h
---- linux-3.0.1/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/reiserfs_fs_sb.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/reiserfs_fs_sb.h linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs_sb.h
+--- linux-3.0.3/include/linux/reiserfs_fs_sb.h 2010-02-25 11:52:07.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/reiserfs_fs_sb.h   2011-06-10 22:11:24.000000000 +0200
 @@ -476,6 +476,7 @@ enum reiserfs_mount_options {
        REISERFS_EXPOSE_PRIVROOT,
        REISERFS_BARRIER_NONE,
@@ -10810,9 +10810,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/reiserfs_fs_sb.h linux-3.0.1-vs2
  
        /* Actions on error */
        REISERFS_ERROR_PANIC,
-diff -NurpP --minimal linux-3.0.1/include/linux/sched.h linux-3.0.1-vs2.3.1-pre9/include/linux/sched.h
---- linux-3.0.1/include/linux/sched.h  2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/sched.h     2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/sched.h linux-3.0.3-vs2.3.1-pre10/include/linux/sched.h
+--- linux-3.0.3/include/linux/sched.h  2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/sched.h    2011-07-22 11:20:39.000000000 +0200
 @@ -1406,6 +1406,14 @@ struct task_struct {
  #endif
        seccomp_t seccomp;
@@ -10859,9 +10859,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/sched.h linux-3.0.1-vs2.3.1-pre9
  }
  
  
-diff -NurpP --minimal linux-3.0.1/include/linux/shmem_fs.h linux-3.0.1-vs2.3.1-pre9/include/linux/shmem_fs.h
---- linux-3.0.1/include/linux/shmem_fs.h       2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/shmem_fs.h  2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/shmem_fs.h linux-3.0.3-vs2.3.1-pre10/include/linux/shmem_fs.h
+--- linux-3.0.3/include/linux/shmem_fs.h       2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/shmem_fs.h 2011-07-01 11:35:35.000000000 +0200
 @@ -12,6 +12,9 @@
  
  #define SHMEM_SYMLINK_INLINE_LEN (SHMEM_NR_DIRECT * sizeof(swp_entry_t))
@@ -10872,9 +10872,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/shmem_fs.h linux-3.0.1-vs2.3.1-p
  struct shmem_inode_info {
        spinlock_t              lock;
        unsigned long           flags;
-diff -NurpP --minimal linux-3.0.1/include/linux/stat.h linux-3.0.1-vs2.3.1-pre9/include/linux/stat.h
---- linux-3.0.1/include/linux/stat.h   2008-12-25 00:26:37.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/stat.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/stat.h linux-3.0.3-vs2.3.1-pre10/include/linux/stat.h
+--- linux-3.0.3/include/linux/stat.h   2008-12-25 00:26:37.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/stat.h     2011-06-10 22:11:24.000000000 +0200
 @@ -66,6 +66,7 @@ struct kstat {
        unsigned int    nlink;
        uid_t           uid;
@@ -10883,9 +10883,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/stat.h linux-3.0.1-vs2.3.1-pre9/
        dev_t           rdev;
        loff_t          size;
        struct timespec  atime;
-diff -NurpP --minimal linux-3.0.1/include/linux/sunrpc/auth.h linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/auth.h
---- linux-3.0.1/include/linux/sunrpc/auth.h    2011-03-15 18:07:39.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/auth.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/sunrpc/auth.h linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/auth.h
+--- linux-3.0.3/include/linux/sunrpc/auth.h    2011-03-15 18:07:39.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/auth.h      2011-06-10 22:11:24.000000000 +0200
 @@ -25,6 +25,7 @@
  struct auth_cred {
        uid_t   uid;
@@ -10894,9 +10894,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/sunrpc/auth.h linux-3.0.1-vs2.3.
        struct group_info *group_info;
        unsigned char machine_cred : 1;
  };
-diff -NurpP --minimal linux-3.0.1/include/linux/sunrpc/clnt.h linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/clnt.h
---- linux-3.0.1/include/linux/sunrpc/clnt.h    2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/sunrpc/clnt.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/sunrpc/clnt.h linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/clnt.h
+--- linux-3.0.3/include/linux/sunrpc/clnt.h    2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/sunrpc/clnt.h      2011-06-10 22:11:24.000000000 +0200
 @@ -49,7 +49,8 @@ struct rpc_clnt {
        unsigned int            cl_softrtry : 1,/* soft timeouts */
                                cl_discrtry : 1,/* disconnect before retry */
@@ -10907,9 +10907,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/sunrpc/clnt.h linux-3.0.1-vs2.3.
  
        struct rpc_rtt *        cl_rtt;         /* RTO estimator data */
        const struct rpc_timeout *cl_timeout;   /* Timeout strategy */
-diff -NurpP --minimal linux-3.0.1/include/linux/syscalls.h linux-3.0.1-vs2.3.1-pre9/include/linux/syscalls.h
---- linux-3.0.1/include/linux/syscalls.h       2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/syscalls.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/syscalls.h linux-3.0.3-vs2.3.1-pre10/include/linux/syscalls.h
+--- linux-3.0.3/include/linux/syscalls.h       2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/syscalls.h 2011-06-10 22:11:24.000000000 +0200
 @@ -483,6 +483,8 @@ asmlinkage long sys_symlink(const char _
  asmlinkage long sys_unlink(const char __user *pathname);
  asmlinkage long sys_rename(const char __user *oldname,
@@ -10919,9 +10919,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/syscalls.h linux-3.0.1-vs2.3.1-p
  asmlinkage long sys_chmod(const char __user *filename, mode_t mode);
  asmlinkage long sys_fchmod(unsigned int fd, mode_t mode);
  
-diff -NurpP --minimal linux-3.0.1/include/linux/sysctl.h linux-3.0.1-vs2.3.1-pre9/include/linux/sysctl.h
---- linux-3.0.1/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/sysctl.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/sysctl.h linux-3.0.3-vs2.3.1-pre10/include/linux/sysctl.h
+--- linux-3.0.3/include/linux/sysctl.h 2011-03-15 18:07:40.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/sysctl.h   2011-06-10 22:11:24.000000000 +0200
 @@ -60,6 +60,7 @@ enum
        CTL_ABI=9,              /* Binary emulation */
        CTL_CPU=10,             /* CPU stuff (speed scaling, etc) */
@@ -10938,9 +10938,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/sysctl.h linux-3.0.1-vs2.3.1-pre
  
        KERN_SPARC_REBOOT=21,   /* reboot command on Sparc */
        KERN_CTLALTDEL=22,      /* int: allow ctl-alt-del to reboot */
-diff -NurpP --minimal linux-3.0.1/include/linux/sysfs.h linux-3.0.1-vs2.3.1-pre9/include/linux/sysfs.h
---- linux-3.0.1/include/linux/sysfs.h  2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/sysfs.h     2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/sysfs.h linux-3.0.3-vs2.3.1-pre10/include/linux/sysfs.h
+--- linux-3.0.3/include/linux/sysfs.h  2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/sysfs.h    2011-06-22 12:39:15.000000000 +0200
 @@ -19,6 +19,8 @@
  #include <linux/kobject_ns.h>
  #include <asm/atomic.h>
@@ -10950,9 +10950,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/sysfs.h linux-3.0.1-vs2.3.1-pre9
  struct kobject;
  struct module;
  enum kobj_ns_type;
-diff -NurpP --minimal linux-3.0.1/include/linux/time.h linux-3.0.1-vs2.3.1-pre9/include/linux/time.h
---- linux-3.0.1/include/linux/time.h   2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/time.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/time.h linux-3.0.3-vs2.3.1-pre10/include/linux/time.h
+--- linux-3.0.3/include/linux/time.h   2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/time.h     2011-06-10 22:11:24.000000000 +0200
 @@ -256,6 +256,9 @@ static __always_inline void timespec_add
        a->tv_sec += __iter_div_u64_rem(a->tv_nsec + ns, NSEC_PER_SEC, &ns);
        a->tv_nsec = ns;
@@ -10963,9 +10963,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/time.h linux-3.0.1-vs2.3.1-pre9/
  #endif /* __KERNEL__ */
  
  #define NFDBITS                       __NFDBITS
-diff -NurpP --minimal linux-3.0.1/include/linux/types.h linux-3.0.1-vs2.3.1-pre9/include/linux/types.h
---- linux-3.0.1/include/linux/types.h  2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/types.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/types.h linux-3.0.3-vs2.3.1-pre10/include/linux/types.h
+--- linux-3.0.3/include/linux/types.h  2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/types.h    2011-06-10 22:11:24.000000000 +0200
 @@ -40,6 +40,9 @@ typedef __kernel_uid32_t     uid_t;
  typedef __kernel_gid32_t      gid_t;
  typedef __kernel_uid16_t        uid16_t;
@@ -10976,9 +10976,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/types.h linux-3.0.1-vs2.3.1-pre9
  
  typedef unsigned long         uintptr_t;
  
-diff -NurpP --minimal linux-3.0.1/include/linux/utsname.h linux-3.0.1-vs2.3.1-pre9/include/linux/utsname.h
---- linux-3.0.1/include/linux/utsname.h        2011-05-22 16:17:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/utsname.h   2011-06-13 14:36:48.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/utsname.h linux-3.0.3-vs2.3.1-pre10/include/linux/utsname.h
+--- linux-3.0.3/include/linux/utsname.h        2011-05-22 16:17:58.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/utsname.h  2011-06-13 14:36:48.000000000 +0200
 @@ -54,7 +54,8 @@ static inline void get_uts_ns(struct uts
  }
  
@@ -11005,9 +11005,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/utsname.h linux-3.0.1-vs2.3.1-pr
  }
  #endif
  
-diff -NurpP --minimal linux-3.0.1/include/linux/vroot.h linux-3.0.1-vs2.3.1-pre9/include/linux/vroot.h
---- linux-3.0.1/include/linux/vroot.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vroot.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vroot.h linux-3.0.3-vs2.3.1-pre10/include/linux/vroot.h
+--- linux-3.0.3/include/linux/vroot.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vroot.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,51 @@
 +
 +/*
@@ -11060,9 +11060,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vroot.h linux-3.0.1-vs2.3.1-pre9
 +#define VROOT_CLR_DEV         0x5601
 +
 +#endif /* _LINUX_VROOT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_base.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_base.h
---- linux-3.0.1/include/linux/vs_base.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_base.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_base.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_base.h
+--- linux-3.0.3/include/linux/vs_base.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_base.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,10 @@
 +#ifndef _VS_BASE_H
 +#define _VS_BASE_H
@@ -11074,9 +11074,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_base.h linux-3.0.1-vs2.3.1-pr
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_context.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_context.h
---- linux-3.0.1/include/linux/vs_context.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_context.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_context.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_context.h
+--- linux-3.0.3/include/linux/vs_context.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_context.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,242 @@
 +#ifndef _VS_CONTEXT_H
 +#define _VS_CONTEXT_H
@@ -11320,9 +11320,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_context.h linux-3.0.1-vs2.3.1
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_cowbl.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cowbl.h
---- linux-3.0.1/include/linux/vs_cowbl.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cowbl.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_cowbl.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cowbl.h
+--- linux-3.0.3/include/linux/vs_cowbl.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cowbl.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,48 @@
 +#ifndef _VS_COWBL_H
 +#define _VS_COWBL_H
@@ -11372,9 +11372,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_cowbl.h linux-3.0.1-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_cvirt.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cvirt.h
---- linux-3.0.1/include/linux/vs_cvirt.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_cvirt.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_cvirt.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cvirt.h
+--- linux-3.0.3/include/linux/vs_cvirt.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_cvirt.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_CVIRT_H
 +#define _VS_CVIRT_H
@@ -11426,9 +11426,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_cvirt.h linux-3.0.1-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_device.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_device.h
---- linux-3.0.1/include/linux/vs_device.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_device.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_device.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_device.h
+--- linux-3.0.3/include/linux/vs_device.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_device.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,45 @@
 +#ifndef _VS_DEVICE_H
 +#define _VS_DEVICE_H
@@ -11475,9 +11475,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_device.h linux-3.0.1-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_dlimit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_dlimit.h
---- linux-3.0.1/include/linux/vs_dlimit.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_dlimit.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_dlimit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_dlimit.h
+--- linux-3.0.3/include/linux/vs_dlimit.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_dlimit.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,215 @@
 +#ifndef _VS_DLIMIT_H
 +#define _VS_DLIMIT_H
@@ -11694,10 +11694,10 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_dlimit.h linux-3.0.1-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_inet.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet.h
---- linux-3.0.1/include/linux/vs_inet.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet.h   2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,351 @@
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_inet.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet.h
+--- linux-3.0.3/include/linux/vs_inet.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet.h  2011-08-18 17:01:00.000000000 +0200
+@@ -0,0 +1,353 @@
 +#ifndef _VS_INET_H
 +#define _VS_INET_H
 +
@@ -11953,7 +11953,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_inet.h linux-3.0.1-vs2.3.1-pr
 +              } else if (saddr == IPI_LOOPBACK) {
 +                      if (nx_info_flags(nxi, NXF_LBACK_REMAP, 0))
 +                              baddr = nxi->v4_lback.s_addr;
-+              } else {        /* normal address bind */
++              } else if (!ipv4_is_multicast(saddr) ||
++                      !nx_info_ncaps(nxi, NXC_MULTICAST)) {
++                      /* normal address bind */
 +                      if (!v4_addr_in_nx_info(nxi, saddr, NXA_MASK_BIND))
 +                              return -EADDRNOTAVAIL;
 +              }
@@ -12049,9 +12051,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_inet.h linux-3.0.1-vs2.3.1-pr
 +#else
 +// #warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_inet6.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet6.h
---- linux-3.0.1/include/linux/vs_inet6.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_inet6.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_inet6.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet6.h
+--- linux-3.0.3/include/linux/vs_inet6.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_inet6.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,246 @@
 +#ifndef _VS_INET6_H
 +#define _VS_INET6_H
@@ -12299,9 +12301,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_inet6.h linux-3.0.1-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_limit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_limit.h
---- linux-3.0.1/include/linux/vs_limit.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_limit.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_limit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_limit.h
+--- linux-3.0.3/include/linux/vs_limit.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_limit.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,140 @@
 +#ifndef _VS_LIMIT_H
 +#define _VS_LIMIT_H
@@ -12443,9 +12445,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_limit.h linux-3.0.1-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_memory.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_memory.h
---- linux-3.0.1/include/linux/vs_memory.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_memory.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_memory.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_memory.h
+--- linux-3.0.3/include/linux/vs_memory.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_memory.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,58 @@
 +#ifndef _VS_MEMORY_H
 +#define _VS_MEMORY_H
@@ -12505,9 +12507,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_memory.h linux-3.0.1-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_network.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_network.h
---- linux-3.0.1/include/linux/vs_network.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_network.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_network.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_network.h
+--- linux-3.0.3/include/linux/vs_network.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_network.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,169 @@
 +#ifndef _NX_VS_NETWORK_H
 +#define _NX_VS_NETWORK_H
@@ -12678,9 +12680,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_network.h linux-3.0.1-vs2.3.1
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_pid.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_pid.h
---- linux-3.0.1/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_pid.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_pid.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_pid.h
+--- linux-3.0.3/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_pid.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,50 @@
 +#ifndef _VS_PID_H
 +#define _VS_PID_H
@@ -12732,9 +12734,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_pid.h linux-3.0.1-vs2.3.1-pre
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_sched.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_sched.h
---- linux-3.0.1/include/linux/vs_sched.h       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_sched.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_sched.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_sched.h
+--- linux-3.0.3/include/linux/vs_sched.h       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_sched.h 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,40 @@
 +#ifndef _VS_SCHED_H
 +#define _VS_SCHED_H
@@ -12776,9 +12778,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_sched.h linux-3.0.1-vs2.3.1-p
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_socket.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_socket.h
---- linux-3.0.1/include/linux/vs_socket.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_socket.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_socket.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_socket.h
+--- linux-3.0.3/include/linux/vs_socket.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_socket.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,67 @@
 +#ifndef _VS_SOCKET_H
 +#define _VS_SOCKET_H
@@ -12847,9 +12849,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_socket.h linux-3.0.1-vs2.3.1-
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_tag.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_tag.h
---- linux-3.0.1/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_tag.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_tag.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_tag.h
+--- linux-3.0.3/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_tag.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VS_TAG_H
 +#define _VS_TAG_H
@@ -12898,9 +12900,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_tag.h linux-3.0.1-vs2.3.1-pre
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vs_time.h linux-3.0.1-vs2.3.1-pre9/include/linux/vs_time.h
---- linux-3.0.1/include/linux/vs_time.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vs_time.h   2011-06-13 14:57:45.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vs_time.h linux-3.0.3-vs2.3.1-pre10/include/linux/vs_time.h
+--- linux-3.0.3/include/linux/vs_time.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vs_time.h  2011-06-13 14:57:45.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VS_TIME_H
 +#define _VS_TIME_H
@@ -12921,9 +12923,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vs_time.h linux-3.0.1-vs2.3.1-pr
 +#else
 +#warning duplicate inclusion
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/Kbuild linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/Kbuild
---- linux-3.0.1/include/linux/vserver/Kbuild   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/Kbuild      2011-08-08 18:02:46.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/Kbuild linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/Kbuild
+--- linux-3.0.3/include/linux/vserver/Kbuild   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/Kbuild     2011-08-08 18:02:46.000000000 +0200
 @@ -0,0 +1,8 @@
 +
 +header-y += context_cmd.h network_cmd.h space_cmd.h \
@@ -12933,9 +12935,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/Kbuild linux-3.0.1-vs2.3
 +
 +header-y += switch.h network.h monitor.h inode.h device.h
 +
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/base.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/base.h
---- linux-3.0.1/include/linux/vserver/base.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/base.h      2011-08-01 18:26:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/base.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/base.h
+--- linux-3.0.3/include/linux/vserver/base.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/base.h     2011-08-01 18:26:07.000000000 +0200
 @@ -0,0 +1,178 @@
 +#ifndef _VX_BASE_H
 +#define _VX_BASE_H
@@ -13115,9 +13117,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/base.h linux-3.0.1-vs2.3
 +#define nx_info_state(n, m)   (__nx_state(n) & (m))
 +
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct.h
---- linux-3.0.1/include/linux/vserver/cacct.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct.h
+--- linux-3.0.3/include/linux/vserver/cacct.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_CACCT_H
 +#define _VX_CACCT_H
@@ -13134,9 +13136,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct.h linux-3.0.1-vs2.
 +};
 +
 +#endif        /* _VX_CACCT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_cmd.h
---- linux-3.0.1/include/linux/vserver/cacct_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_cmd.h
+--- linux-3.0.3/include/linux/vserver/cacct_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_CACCT_CMD_H
 +#define _VX_CACCT_CMD_H
@@ -13161,9 +13163,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_cmd.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CACCT_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_def.h
---- linux-3.0.1/include/linux/vserver/cacct_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_def.h
+--- linux-3.0.3/include/linux/vserver/cacct_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_def.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_CACCT_DEF_H
 +#define _VX_CACCT_DEF_H
@@ -13208,9 +13210,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_def.h linux-3.0.1-
 +#endif
 +
 +#endif        /* _VX_CACCT_DEF_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_int.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_int.h
---- linux-3.0.1/include/linux/vserver/cacct_int.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cacct_int.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cacct_int.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_int.h
+--- linux-3.0.3/include/linux/vserver/cacct_int.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cacct_int.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_CACCT_INT_H
 +#define _VX_CACCT_INT_H
@@ -13233,9 +13235,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cacct_int.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CACCT_INT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/check.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/check.h
---- linux-3.0.1/include/linux/vserver/check.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/check.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/check.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/check.h
+--- linux-3.0.3/include/linux/vserver/check.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/check.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,89 @@
 +#ifndef _VS_CHECK_H
 +#define _VS_CHECK_H
@@ -13326,9 +13328,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/check.h linux-3.0.1-vs2.
 +#define nx_weak_check(c, m)   ((m) ? nx_check(c, m) : 1)
 +
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/context.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context.h
---- linux-3.0.1/include/linux/vserver/context.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context.h   2011-08-01 18:23:13.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/context.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context.h
+--- linux-3.0.3/include/linux/vserver/context.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context.h  2011-08-01 18:23:13.000000000 +0200
 @@ -0,0 +1,190 @@
 +#ifndef _VX_CONTEXT_H
 +#define _VX_CONTEXT_H
@@ -13520,9 +13522,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/context.h linux-3.0.1-vs
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CONTEXT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/context_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context_cmd.h
---- linux-3.0.1/include/linux/vserver/context_cmd.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/context_cmd.h       2011-08-01 18:25:07.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/context_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context_cmd.h
+--- linux-3.0.3/include/linux/vserver/context_cmd.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/context_cmd.h      2011-08-01 18:25:07.000000000 +0200
 @@ -0,0 +1,162 @@
 +#ifndef _VX_CONTEXT_CMD_H
 +#define _VX_CONTEXT_CMD_H
@@ -13686,9 +13688,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/context_cmd.h linux-3.0.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt.h
---- linux-3.0.1/include/linux/vserver/cvirt.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt.h
+--- linux-3.0.3/include/linux/vserver/cvirt.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,20 @@
 +#ifndef _VX_CVIRT_H
 +#define _VX_CVIRT_H
@@ -13710,9 +13712,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt.h linux-3.0.1-vs2.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CVIRT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_cmd.h
---- linux-3.0.1/include/linux/vserver/cvirt_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_cmd.h
+--- linux-3.0.3/include/linux/vserver/cvirt_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CVIRT_CMD_H
 +#define _VX_CVIRT_CMD_H
@@ -13767,9 +13769,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt_cmd.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CVIRT_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_def.h
---- linux-3.0.1/include/linux/vserver/cvirt_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/cvirt_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/cvirt_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_def.h
+--- linux-3.0.3/include/linux/vserver/cvirt_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/cvirt_def.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,80 @@
 +#ifndef _VX_CVIRT_DEF_H
 +#define _VX_CVIRT_DEF_H
@@ -13851,9 +13853,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/cvirt_def.h linux-3.0.1-
 +#endif
 +
 +#endif        /* _VX_CVIRT_DEF_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/debug.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug.h
---- linux-3.0.1/include/linux/vserver/debug.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/debug.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug.h
+--- linux-3.0.3/include/linux/vserver/debug.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,140 @@
 +#ifndef _VX_DEBUG_H
 +#define _VX_DEBUG_H
@@ -13995,9 +13997,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/debug.h linux-3.0.1-vs2.
 +
 +
 +#endif /* _VX_DEBUG_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/debug_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug_cmd.h
---- linux-3.0.1/include/linux/vserver/debug_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/debug_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/debug_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug_cmd.h
+--- linux-3.0.3/include/linux/vserver/debug_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/debug_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,58 @@
 +#ifndef _VX_DEBUG_CMD_H
 +#define _VX_DEBUG_CMD_H
@@ -14057,9 +14059,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/debug_cmd.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_DEBUG_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device.h
---- linux-3.0.1/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device.h
+--- linux-3.0.3/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,15 @@
 +#ifndef _VX_DEVICE_H
 +#define _VX_DEVICE_H
@@ -14076,9 +14078,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device.h linux-3.0.1-vs2
 +#else /* _VX_DEVICE_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_DEVICE_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_cmd.h
---- linux-3.0.1/include/linux/vserver/device_cmd.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_cmd.h
+--- linux-3.0.3/include/linux/vserver/device_cmd.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_cmd.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,44 @@
 +#ifndef _VX_DEVICE_CMD_H
 +#define _VX_DEVICE_CMD_H
@@ -14124,9 +14126,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device_cmd.h linux-3.0.1
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_DEVICE_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_def.h
---- linux-3.0.1/include/linux/vserver/device_def.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/device_def.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/device_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_def.h
+--- linux-3.0.3/include/linux/vserver/device_def.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/device_def.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,17 @@
 +#ifndef _VX_DEVICE_DEF_H
 +#define _VX_DEVICE_DEF_H
@@ -14145,9 +14147,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/device_def.h linux-3.0.1
 +};
 +
 +#endif        /* _VX_DEVICE_DEF_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/dlimit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit.h
---- linux-3.0.1/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/dlimit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit.h
+--- linux-3.0.3/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,54 @@
 +#ifndef _VX_DLIMIT_H
 +#define _VX_DLIMIT_H
@@ -14203,9 +14205,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/dlimit.h linux-3.0.1-vs2
 +#else /* _VX_DLIMIT_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_DLIMIT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/dlimit_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit_cmd.h
---- linux-3.0.1/include/linux/vserver/dlimit_cmd.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/dlimit_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/dlimit_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit_cmd.h
+--- linux-3.0.3/include/linux/vserver/dlimit_cmd.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/dlimit_cmd.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,109 @@
 +#ifndef _VX_DLIMIT_CMD_H
 +#define _VX_DLIMIT_CMD_H
@@ -14316,9 +14318,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/dlimit_cmd.h linux-3.0.1
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_DLIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/global.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/global.h
---- linux-3.0.1/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/global.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/global.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/global.h
+--- linux-3.0.3/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/global.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,19 @@
 +#ifndef _VX_GLOBAL_H
 +#define _VX_GLOBAL_H
@@ -14339,9 +14341,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/global.h linux-3.0.1-vs2
 +
 +
 +#endif /* _VX_GLOBAL_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/history.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/history.h
---- linux-3.0.1/include/linux/vserver/history.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/history.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/history.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/history.h
+--- linux-3.0.3/include/linux/vserver/history.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/history.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,197 @@
 +#ifndef _VX_HISTORY_H
 +#define _VX_HISTORY_H
@@ -14540,9 +14542,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/history.h linux-3.0.1-vs
 +#endif /* CONFIG_VSERVER_HISTORY */
 +
 +#endif /* _VX_HISTORY_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/inode.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode.h
---- linux-3.0.1/include/linux/vserver/inode.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/inode.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode.h
+--- linux-3.0.3/include/linux/vserver/inode.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,39 @@
 +#ifndef _VX_INODE_H
 +#define _VX_INODE_H
@@ -14583,9 +14585,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/inode.h linux-3.0.1-vs2.
 +#else /* _VX_INODE_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_INODE_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/inode_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode_cmd.h
---- linux-3.0.1/include/linux/vserver/inode_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/inode_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/inode_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode_cmd.h
+--- linux-3.0.3/include/linux/vserver/inode_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/inode_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,59 @@
 +#ifndef _VX_INODE_CMD_H
 +#define _VX_INODE_CMD_H
@@ -14646,9 +14648,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/inode_cmd.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_INODE_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit.h
---- linux-3.0.1/include/linux/vserver/limit.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit.h
+--- linux-3.0.3/include/linux/vserver/limit.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_H
 +#define _VX_LIMIT_H
@@ -14721,9 +14723,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit.h linux-3.0.1-vs2.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_LIMIT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_cmd.h
---- linux-3.0.1/include/linux/vserver/limit_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_cmd.h
+--- linux-3.0.3/include/linux/vserver/limit_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,71 @@
 +#ifndef _VX_LIMIT_CMD_H
 +#define _VX_LIMIT_CMD_H
@@ -14796,9 +14798,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_cmd.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_LIMIT_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_def.h
---- linux-3.0.1/include/linux/vserver/limit_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_def.h
+--- linux-3.0.3/include/linux/vserver/limit_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_def.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,47 @@
 +#ifndef _VX_LIMIT_DEF_H
 +#define _VX_LIMIT_DEF_H
@@ -14847,9 +14849,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_def.h linux-3.0.1-
 +#endif
 +
 +#endif        /* _VX_LIMIT_DEF_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_int.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_int.h
---- linux-3.0.1/include/linux/vserver/limit_int.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/limit_int.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/limit_int.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_int.h
+--- linux-3.0.3/include/linux/vserver/limit_int.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/limit_int.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,198 @@
 +#ifndef _VX_LIMIT_INT_H
 +#define _VX_LIMIT_INT_H
@@ -15049,9 +15051,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/limit_int.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_LIMIT_INT_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/monitor.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/monitor.h
---- linux-3.0.1/include/linux/vserver/monitor.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/monitor.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/monitor.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/monitor.h
+--- linux-3.0.3/include/linux/vserver/monitor.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/monitor.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,96 @@
 +#ifndef _VX_MONITOR_H
 +#define _VX_MONITOR_H
@@ -15149,10 +15151,10 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/monitor.h linux-3.0.1-vs
 +
 +
 +#endif /* _VX_MONITOR_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/network.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network.h
---- linux-3.0.1/include/linux/vserver/network.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network.h   2011-06-10 22:11:24.000000000 +0200
-@@ -0,0 +1,146 @@
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/network.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network.h
+--- linux-3.0.3/include/linux/vserver/network.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network.h  2011-08-18 16:30:48.000000000 +0200
+@@ -0,0 +1,148 @@
 +#ifndef _VX_NETWORK_H
 +#define _VX_NETWORK_H
 +
@@ -15203,6 +15205,8 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/network.h linux-3.0.1-vs
 +
 +#define NXC_RAW_ICMP          0x00000100
 +
++#define NXC_MULTICAST         0x00001000
++
 +
 +/* address types */
 +
@@ -15299,9 +15303,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/network.h linux-3.0.1-vs
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_NETWORK_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/network_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network_cmd.h
---- linux-3.0.1/include/linux/vserver/network_cmd.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/network_cmd.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/network_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network_cmd.h
+--- linux-3.0.3/include/linux/vserver/network_cmd.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/network_cmd.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,164 @@
 +#ifndef _VX_NETWORK_CMD_H
 +#define _VX_NETWORK_CMD_H
@@ -15467,9 +15471,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/network_cmd.h linux-3.0.
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_CONTEXT_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/percpu.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/percpu.h
---- linux-3.0.1/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/percpu.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/percpu.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/percpu.h
+--- linux-3.0.3/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/percpu.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_PERCPU_H
 +#define _VX_PERCPU_H
@@ -15485,9 +15489,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/percpu.h linux-3.0.1-vs2
 +#define       PERCPU_PERCTX   (sizeof(struct _vx_percpu))
 +
 +#endif        /* _VX_PERCPU_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/pid.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/pid.h
---- linux-3.0.1/include/linux/vserver/pid.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/pid.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/pid.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/pid.h
+--- linux-3.0.3/include/linux/vserver/pid.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/pid.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,51 @@
 +#ifndef _VSERVER_PID_H
 +#define _VSERVER_PID_H
@@ -15540,9 +15544,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/pid.h linux-3.0.1-vs2.3.
 +}
 +
 +#endif
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched.h
---- linux-3.0.1/include/linux/vserver/sched.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched.h
+--- linux-3.0.3/include/linux/vserver/sched.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,23 @@
 +#ifndef _VX_SCHED_H
 +#define _VX_SCHED_H
@@ -15567,9 +15571,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched.h linux-3.0.1-vs2.
 +#else /* _VX_SCHED_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_SCHED_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_cmd.h
---- linux-3.0.1/include/linux/vserver/sched_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_cmd.h
+--- linux-3.0.3/include/linux/vserver/sched_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,21 @@
 +#ifndef _VX_SCHED_CMD_H
 +#define _VX_SCHED_CMD_H
@@ -15592,9 +15596,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched_cmd.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_SCHED_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched_def.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_def.h
---- linux-3.0.1/include/linux/vserver/sched_def.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/sched_def.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/sched_def.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_def.h
+--- linux-3.0.3/include/linux/vserver/sched_def.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/sched_def.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SCHED_DEF_H
 +#define _VX_SCHED_DEF_H
@@ -15634,9 +15638,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/sched_def.h linux-3.0.1-
 +#endif
 +
 +#endif        /* _VX_SCHED_DEF_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/signal.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal.h
---- linux-3.0.1/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/signal.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal.h
+--- linux-3.0.3/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,14 @@
 +#ifndef _VX_SIGNAL_H
 +#define _VX_SIGNAL_H
@@ -15652,9 +15656,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/signal.h linux-3.0.1-vs2
 +#else /* _VX_SIGNAL_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_SIGNAL_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/signal_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal_cmd.h
---- linux-3.0.1/include/linux/vserver/signal_cmd.h     1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/signal_cmd.h        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/signal_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal_cmd.h
+--- linux-3.0.3/include/linux/vserver/signal_cmd.h     1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/signal_cmd.h       2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,43 @@
 +#ifndef _VX_SIGNAL_CMD_H
 +#define _VX_SIGNAL_CMD_H
@@ -15699,9 +15703,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/signal_cmd.h linux-3.0.1
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_SIGNAL_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/space.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space.h
---- linux-3.0.1/include/linux/vserver/space.h  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/space.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space.h
+--- linux-3.0.3/include/linux/vserver/space.h  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space.h    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,12 @@
 +#ifndef _VX_SPACE_H
 +#define _VX_SPACE_H
@@ -15715,9 +15719,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/space.h linux-3.0.1-vs2.
 +#else /* _VX_SPACE_H */
 +#warning duplicate inclusion
 +#endif        /* _VX_SPACE_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/space_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space_cmd.h
---- linux-3.0.1/include/linux/vserver/space_cmd.h      1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/space_cmd.h 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/space_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space_cmd.h
+--- linux-3.0.3/include/linux/vserver/space_cmd.h      1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/space_cmd.h        2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,38 @@
 +#ifndef _VX_SPACE_CMD_H
 +#define _VX_SPACE_CMD_H
@@ -15757,9 +15761,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/space_cmd.h linux-3.0.1-
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_SPACE_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/switch.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/switch.h
---- linux-3.0.1/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/switch.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/switch.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/switch.h
+--- linux-3.0.3/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/switch.h   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,98 @@
 +#ifndef _VX_SWITCH_H
 +#define _VX_SWITCH_H
@@ -15859,9 +15863,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/switch.h linux-3.0.1-vs2
 +
 +#endif        /* _VX_SWITCH_H */
 +
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/tag.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag.h
---- linux-3.0.1/include/linux/vserver/tag.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/tag.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag.h
+--- linux-3.0.3/include/linux/vserver/tag.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,143 @@
 +#ifndef _DX_TAG_H
 +#define _DX_TAG_H
@@ -16006,9 +16010,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/tag.h linux-3.0.1-vs2.3.
 +#endif
 +
 +#endif /* _DX_TAG_H */
-diff -NurpP --minimal linux-3.0.1/include/linux/vserver/tag_cmd.h linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag_cmd.h
---- linux-3.0.1/include/linux/vserver/tag_cmd.h        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/linux/vserver/tag_cmd.h   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/linux/vserver/tag_cmd.h linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag_cmd.h
+--- linux-3.0.3/include/linux/vserver/tag_cmd.h        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/linux/vserver/tag_cmd.h  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,22 @@
 +#ifndef _VX_TAG_CMD_H
 +#define _VX_TAG_CMD_H
@@ -16032,9 +16036,9 @@ diff -NurpP --minimal linux-3.0.1/include/linux/vserver/tag_cmd.h linux-3.0.1-vs
 +
 +#endif        /* __KERNEL__ */
 +#endif        /* _VX_TAG_CMD_H */
-diff -NurpP --minimal linux-3.0.1/include/net/addrconf.h linux-3.0.1-vs2.3.1-pre9/include/net/addrconf.h
---- linux-3.0.1/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/net/addrconf.h    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/net/addrconf.h linux-3.0.3-vs2.3.1-pre10/include/net/addrconf.h
+--- linux-3.0.3/include/net/addrconf.h 2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/net/addrconf.h   2011-06-10 22:11:24.000000000 +0200
 @@ -80,7 +80,8 @@ extern int                   ipv6_dev_get_saddr(struct n
                                               struct net_device *dev,
                                               const struct in6_addr *daddr,
@@ -16045,9 +16049,9 @@ diff -NurpP --minimal linux-3.0.1/include/net/addrconf.h linux-3.0.1-vs2.3.1-pre
  extern int                    ipv6_get_lladdr(struct net_device *dev,
                                                struct in6_addr *addr,
                                                unsigned char banned_flags);
-diff -NurpP --minimal linux-3.0.1/include/net/af_unix.h linux-3.0.1-vs2.3.1-pre9/include/net/af_unix.h
---- linux-3.0.1/include/net/af_unix.h  2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/net/af_unix.h     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/net/af_unix.h linux-3.0.3-vs2.3.1-pre10/include/net/af_unix.h
+--- linux-3.0.3/include/net/af_unix.h  2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/net/af_unix.h    2011-06-10 22:11:24.000000000 +0200
 @@ -4,6 +4,7 @@
  #include <linux/socket.h>
  #include <linux/un.h>
@@ -16056,9 +16060,9 @@ diff -NurpP --minimal linux-3.0.1/include/net/af_unix.h linux-3.0.1-vs2.3.1-pre9
  #include <net/sock.h>
  
  extern void unix_inflight(struct file *fp);
-diff -NurpP --minimal linux-3.0.1/include/net/inet_timewait_sock.h linux-3.0.1-vs2.3.1-pre9/include/net/inet_timewait_sock.h
---- linux-3.0.1/include/net/inet_timewait_sock.h       2011-03-15 18:07:40.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/include/net/inet_timewait_sock.h  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/net/inet_timewait_sock.h linux-3.0.3-vs2.3.1-pre10/include/net/inet_timewait_sock.h
+--- linux-3.0.3/include/net/inet_timewait_sock.h       2011-03-15 18:07:40.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/include/net/inet_timewait_sock.h 2011-06-10 22:11:24.000000000 +0200
 @@ -113,6 +113,10 @@ struct inet_timewait_sock {
  #define tw_net                        __tw_common.skc_net
  #define tw_daddr              __tw_common.skc_daddr
@@ -16070,9 +16074,9 @@ diff -NurpP --minimal linux-3.0.1/include/net/inet_timewait_sock.h linux-3.0.1-v
        int                     tw_timeout;
        volatile unsigned char  tw_substate;
        unsigned char           tw_rcv_wscale;
-diff -NurpP --minimal linux-3.0.1/include/net/ip6_route.h linux-3.0.1-vs2.3.1-pre9/include/net/ip6_route.h
---- linux-3.0.1/include/net/ip6_route.h        2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/net/ip6_route.h   2011-06-16 14:16:51.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/net/ip6_route.h linux-3.0.3-vs2.3.1-pre10/include/net/ip6_route.h
+--- linux-3.0.3/include/net/ip6_route.h        2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/net/ip6_route.h  2011-06-16 14:16:51.000000000 +0200
 @@ -86,7 +86,8 @@ extern int                   ip6_route_get_saddr(struct 
                                                    struct rt6_info *rt,
                                                    const struct in6_addr *daddr,
@@ -16083,9 +16087,9 @@ diff -NurpP --minimal linux-3.0.1/include/net/ip6_route.h linux-3.0.1-vs2.3.1-pr
  
  extern struct rt6_info                *rt6_lookup(struct net *net,
                                            const struct in6_addr *daddr,
-diff -NurpP --minimal linux-3.0.1/include/net/route.h linux-3.0.1-vs2.3.1-pre9/include/net/route.h
---- linux-3.0.1/include/net/route.h    2011-07-22 11:18:11.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/net/route.h       2011-07-27 19:42:59.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/net/route.h linux-3.0.3-vs2.3.1-pre10/include/net/route.h
+--- linux-3.0.3/include/net/route.h    2011-07-22 11:18:11.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/net/route.h      2011-07-27 19:42:59.000000000 +0200
 @@ -202,6 +202,9 @@ static inline void ip_rt_put(struct rtab
                dst_release(&rt->dst);
  }
@@ -16133,9 +16137,9 @@ diff -NurpP --minimal linux-3.0.1/include/net/route.h linux-3.0.1-vs2.3.1-pre9/i
                rt = __ip_route_output_key(net, fl4);
                if (IS_ERR(rt))
                        return rt;
-diff -NurpP --minimal linux-3.0.1/include/net/sock.h linux-3.0.1-vs2.3.1-pre9/include/net/sock.h
---- linux-3.0.1/include/net/sock.h     2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/include/net/sock.h        2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/include/net/sock.h linux-3.0.3-vs2.3.1-pre10/include/net/sock.h
+--- linux-3.0.3/include/net/sock.h     2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/include/net/sock.h       2011-07-01 11:35:35.000000000 +0200
 @@ -149,6 +149,10 @@ struct sock_common {
  #ifdef CONFIG_NET_NS
        struct net              *skc_net;
@@ -16158,9 +16162,9 @@ diff -NurpP --minimal linux-3.0.1/include/net/sock.h linux-3.0.1-vs2.3.1-pre9/in
        socket_lock_t           sk_lock;
        struct sk_buff_head     sk_receive_queue;
        /*
-diff -NurpP --minimal linux-3.0.1/init/Kconfig linux-3.0.1-vs2.3.1-pre9/init/Kconfig
---- linux-3.0.1/init/Kconfig   2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/init/Kconfig      2011-08-08 18:08:57.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/init/Kconfig linux-3.0.3-vs2.3.1-pre10/init/Kconfig
+--- linux-3.0.3/init/Kconfig   2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/init/Kconfig     2011-08-08 18:08:57.000000000 +0200
 @@ -574,6 +574,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK
  menuconfig CGROUPS
        boolean "Control Group support"
@@ -16177,9 +16181,9 @@ diff -NurpP --minimal linux-3.0.1/init/Kconfig linux-3.0.1-vs2.3.1-pre9/init/Kco
        default y
        help
          This allows containers, i.e. vservers, to use user namespaces
-diff -NurpP --minimal linux-3.0.1/init/main.c linux-3.0.1-vs2.3.1-pre9/init/main.c
---- linux-3.0.1/init/main.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/init/main.c       2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/init/main.c linux-3.0.3-vs2.3.1-pre10/init/main.c
+--- linux-3.0.3/init/main.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/init/main.c      2011-06-22 12:39:15.000000000 +0200
 @@ -68,6 +68,7 @@
  #include <linux/shmem_fs.h>
  #include <linux/slab.h>
@@ -16188,9 +16192,9 @@ diff -NurpP --minimal linux-3.0.1/init/main.c linux-3.0.1-vs2.3.1-pre9/init/main
  
  #include <asm/io.h>
  #include <asm/bugs.h>
-diff -NurpP --minimal linux-3.0.1/ipc/mqueue.c linux-3.0.1-vs2.3.1-pre9/ipc/mqueue.c
---- linux-3.0.1/ipc/mqueue.c   2011-03-15 18:07:41.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/ipc/mqueue.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/ipc/mqueue.c linux-3.0.3-vs2.3.1-pre10/ipc/mqueue.c
+--- linux-3.0.3/ipc/mqueue.c   2011-03-15 18:07:41.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/ipc/mqueue.c     2011-06-10 22:11:24.000000000 +0200
 @@ -33,6 +33,8 @@
  #include <linux/pid.h>
  #include <linux/ipc_namespace.h>
@@ -16265,9 +16269,9 @@ diff -NurpP --minimal linux-3.0.1/ipc/mqueue.c linux-3.0.1-vs2.3.1-pre9/ipc/mque
                free_uid(user);
        }
        if (ipc_ns)
-diff -NurpP --minimal linux-3.0.1/ipc/msg.c linux-3.0.1-vs2.3.1-pre9/ipc/msg.c
---- linux-3.0.1/ipc/msg.c      2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/ipc/msg.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/ipc/msg.c linux-3.0.3-vs2.3.1-pre10/ipc/msg.c
+--- linux-3.0.3/ipc/msg.c      2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/ipc/msg.c        2011-06-10 22:11:24.000000000 +0200
 @@ -37,6 +37,7 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -16284,9 +16288,9 @@ diff -NurpP --minimal linux-3.0.1/ipc/msg.c linux-3.0.1-vs2.3.1-pre9/ipc/msg.c
  
        msq->q_perm.security = NULL;
        retval = security_msg_queue_alloc(msq);
-diff -NurpP --minimal linux-3.0.1/ipc/namespace.c linux-3.0.1-vs2.3.1-pre9/ipc/namespace.c
---- linux-3.0.1/ipc/namespace.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/ipc/namespace.c   2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/ipc/namespace.c linux-3.0.3-vs2.3.1-pre10/ipc/namespace.c
+--- linux-3.0.3/ipc/namespace.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/ipc/namespace.c  2011-06-13 14:09:44.000000000 +0200
 @@ -13,11 +13,12 @@
  #include <linux/mount.h>
  #include <linux/user_namespace.h>
@@ -16327,9 +16331,9 @@ diff -NurpP --minimal linux-3.0.1/ipc/namespace.c linux-3.0.1-vs2.3.1-pre9/ipc/n
  }
  
  /*
-diff -NurpP --minimal linux-3.0.1/ipc/sem.c linux-3.0.1-vs2.3.1-pre9/ipc/sem.c
---- linux-3.0.1/ipc/sem.c      2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/ipc/sem.c 2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/ipc/sem.c linux-3.0.3-vs2.3.1-pre10/ipc/sem.c
+--- linux-3.0.3/ipc/sem.c      2011-08-29 03:10:25.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/ipc/sem.c        2011-08-08 23:04:47.000000000 +0200
 @@ -86,6 +86,8 @@
  #include <linux/rwsem.h>
  #include <linux/nsproxy.h>
@@ -16367,9 +16371,9 @@ diff -NurpP --minimal linux-3.0.1/ipc/sem.c linux-3.0.1-vs2.3.1-pre9/ipc/sem.c
        security_sem_free(sma);
        ipc_rcu_putref(sma);
  }
-diff -NurpP --minimal linux-3.0.1/ipc/shm.c linux-3.0.1-vs2.3.1-pre9/ipc/shm.c
---- linux-3.0.1/ipc/shm.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/ipc/shm.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/ipc/shm.c linux-3.0.3-vs2.3.1-pre10/ipc/shm.c
+--- linux-3.0.3/ipc/shm.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/ipc/shm.c        2011-06-10 22:11:24.000000000 +0200
 @@ -39,6 +39,8 @@
  #include <linux/nsproxy.h>
  #include <linux/mount.h>
@@ -16425,9 +16429,9 @@ diff -NurpP --minimal linux-3.0.1/ipc/shm.c linux-3.0.1-vs2.3.1-pre9/ipc/shm.c
        return error;
  
  no_id:
-diff -NurpP --minimal linux-3.0.1/kernel/Makefile linux-3.0.1-vs2.3.1-pre9/kernel/Makefile
---- linux-3.0.1/kernel/Makefile        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/Makefile   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/Makefile linux-3.0.3-vs2.3.1-pre10/kernel/Makefile
+--- linux-3.0.3/kernel/Makefile        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/Makefile  2011-06-10 22:11:24.000000000 +0200
 @@ -24,6 +24,7 @@ CFLAGS_REMOVE_sched_clock.o = -pg
  CFLAGS_REMOVE_irq_work.o = -pg
  endif
@@ -16436,9 +16440,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/Makefile linux-3.0.1-vs2.3.1-pre9/kerne
  obj-$(CONFIG_FREEZER) += freezer.o
  obj-$(CONFIG_PROFILING) += profile.o
  obj-$(CONFIG_SYSCTL_SYSCALL_CHECK) += sysctl_check.o
-diff -NurpP --minimal linux-3.0.1/kernel/capability.c linux-3.0.1-vs2.3.1-pre9/kernel/capability.c
---- linux-3.0.1/kernel/capability.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/capability.c       2011-07-19 19:27:53.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/capability.c linux-3.0.3-vs2.3.1-pre10/kernel/capability.c
+--- linux-3.0.3/kernel/capability.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/capability.c      2011-07-19 19:27:53.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <linux/syscalls.h>
  #include <linux/pid_namespace.h>
@@ -16474,9 +16478,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/capability.c linux-3.0.1-vs2.3.1-pre9/k
        if (security_capable(ns, current_cred(), cap) == 0) {
                current->flags |= PF_SUPERPRIV;
                return true;
-diff -NurpP --minimal linux-3.0.1/kernel/compat.c linux-3.0.1-vs2.3.1-pre9/kernel/compat.c
---- linux-3.0.1/kernel/compat.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/compat.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/compat.c linux-3.0.3-vs2.3.1-pre10/kernel/compat.c
+--- linux-3.0.3/kernel/compat.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/compat.c  2011-06-10 22:11:24.000000000 +0200
 @@ -970,7 +970,7 @@ asmlinkage long compat_sys_stime(compat_
        if (err)
                return err;
@@ -16486,9 +16490,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/compat.c linux-3.0.1-vs2.3.1-pre9/kerne
        return 0;
  }
  
-diff -NurpP --minimal linux-3.0.1/kernel/cred.c linux-3.0.1-vs2.3.1-pre9/kernel/cred.c
---- linux-3.0.1/kernel/cred.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/cred.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/cred.c linux-3.0.3-vs2.3.1-pre10/kernel/cred.c
+--- linux-3.0.3/kernel/cred.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/cred.c    2011-06-10 22:11:24.000000000 +0200
 @@ -61,31 +61,6 @@ struct cred init_cred = {
  #endif
  };
@@ -16558,9 +16562,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/cred.c linux-3.0.1-vs2.3.1-pre9/kernel/
  EXPORT_SYMBOL(prepare_creds);
  
  /*
-diff -NurpP --minimal linux-3.0.1/kernel/exit.c linux-3.0.1-vs2.3.1-pre9/kernel/exit.c
---- linux-3.0.1/kernel/exit.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/exit.c     2011-06-22 12:39:15.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/exit.c linux-3.0.3-vs2.3.1-pre10/kernel/exit.c
+--- linux-3.0.3/kernel/exit.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/exit.c    2011-06-22 12:39:15.000000000 +0200
 @@ -48,6 +48,10 @@
  #include <linux/fs_struct.h>
  #include <linux/init_task.h>
@@ -16601,9 +16605,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/exit.c linux-3.0.1-vs2.3.1-pre9/kernel/
        BUG();
        /* Avoid "noreturn function does return".  */
        for (;;)
-diff -NurpP --minimal linux-3.0.1/kernel/fork.c linux-3.0.1-vs2.3.1-pre9/kernel/fork.c
---- linux-3.0.1/kernel/fork.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/fork.c     2011-06-10 22:21:02.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/fork.c linux-3.0.3-vs2.3.1-pre10/kernel/fork.c
+--- linux-3.0.3/kernel/fork.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/fork.c    2011-06-10 22:21:02.000000000 +0200
 @@ -67,6 +67,10 @@
  #include <linux/user-return-notifier.h>
  #include <linux/oom.h>
@@ -16697,9 +16701,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/fork.c linux-3.0.1-vs2.3.1-pre9/kernel/
        write_unlock_irq(&tasklist_lock);
        proc_fork_connector(p);
        cgroup_post_fork(p);
-diff -NurpP --minimal linux-3.0.1/kernel/kthread.c linux-3.0.1-vs2.3.1-pre9/kernel/kthread.c
---- linux-3.0.1/kernel/kthread.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/kthread.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/kthread.c linux-3.0.3-vs2.3.1-pre10/kernel/kthread.c
+--- linux-3.0.3/kernel/kthread.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/kthread.c 2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/mutex.h>
  #include <linux/slab.h>
@@ -16708,9 +16712,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/kthread.c linux-3.0.1-vs2.3.1-pre9/kern
  #include <trace/events/sched.h>
  
  static DEFINE_SPINLOCK(kthread_create_lock);
-diff -NurpP --minimal linux-3.0.1/kernel/nsproxy.c linux-3.0.1-vs2.3.1-pre9/kernel/nsproxy.c
---- linux-3.0.1/kernel/nsproxy.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/nsproxy.c  2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/nsproxy.c linux-3.0.3-vs2.3.1-pre10/kernel/nsproxy.c
+--- linux-3.0.3/kernel/nsproxy.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/nsproxy.c 2011-06-13 14:09:44.000000000 +0200
 @@ -20,6 +20,8 @@
  #include <linux/mnt_namespace.h>
  #include <linux/utsname.h>
@@ -16886,9 +16890,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/nsproxy.c linux-3.0.1-vs2.3.1-pre9/kern
                return -EPERM;
  
        *new_nsp = create_new_namespaces(unshare_flags, current,
-diff -NurpP --minimal linux-3.0.1/kernel/pid.c linux-3.0.1-vs2.3.1-pre9/kernel/pid.c
---- linux-3.0.1/kernel/pid.c   2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/pid.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/pid.c linux-3.0.3-vs2.3.1-pre10/kernel/pid.c
+--- linux-3.0.3/kernel/pid.c   2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/pid.c     2011-06-10 22:11:24.000000000 +0200
 @@ -36,6 +36,7 @@
  #include <linux/pid_namespace.h>
  #include <linux/init_task.h>
@@ -16946,9 +16950,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/pid.c linux-3.0.1-vs2.3.1-pre9/kernel/p
  pid_t pid_vnr(struct pid *pid)
  {
        return pid_nr_ns(pid, current->nsproxy->pid_ns);
-diff -NurpP --minimal linux-3.0.1/kernel/pid_namespace.c linux-3.0.1-vs2.3.1-pre9/kernel/pid_namespace.c
---- linux-3.0.1/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/pid_namespace.c    2011-06-10 22:17:45.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/pid_namespace.c linux-3.0.3-vs2.3.1-pre10/kernel/pid_namespace.c
+--- linux-3.0.3/kernel/pid_namespace.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/pid_namespace.c   2011-06-10 22:17:45.000000000 +0200
 @@ -15,6 +15,7 @@
  #include <linux/acct.h>
  #include <linux/slab.h>
@@ -16973,9 +16977,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/pid_namespace.c linux-3.0.1-vs2.3.1-pre
        kmem_cache_free(pid_ns_cachep, ns);
  }
  
-diff -NurpP --minimal linux-3.0.1/kernel/posix-timers.c linux-3.0.1-vs2.3.1-pre9/kernel/posix-timers.c
---- linux-3.0.1/kernel/posix-timers.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/posix-timers.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/posix-timers.c linux-3.0.3-vs2.3.1-pre10/kernel/posix-timers.c
+--- linux-3.0.3/kernel/posix-timers.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/posix-timers.c    2011-06-10 22:11:24.000000000 +0200
 @@ -47,6 +47,7 @@
  #include <linux/wait.h>
  #include <linux/workqueue.h>
@@ -17011,9 +17015,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/posix-timers.c linux-3.0.1-vs2.3.1-pre9
        /* If we failed to send the signal the timer stops. */
        return ret > 0;
  }
-diff -NurpP --minimal linux-3.0.1/kernel/printk.c linux-3.0.1-vs2.3.1-pre9/kernel/printk.c
---- linux-3.0.1/kernel/printk.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/printk.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/printk.c linux-3.0.3-vs2.3.1-pre10/kernel/printk.c
+--- linux-3.0.3/kernel/printk.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/printk.c  2011-06-10 22:11:24.000000000 +0200
 @@ -41,6 +41,7 @@
  #include <linux/cpu.h>
  #include <linux/notifier.h>
@@ -17081,9 +17085,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/printk.c linux-3.0.1-vs2.3.1-pre9/kerne
                count = len;
                if (count > log_buf_len)
                        count = log_buf_len;
-diff -NurpP --minimal linux-3.0.1/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/kernel/ptrace.c
---- linux-3.0.1/kernel/ptrace.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/ptrace.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/ptrace.c linux-3.0.3-vs2.3.1-pre10/kernel/ptrace.c
+--- linux-3.0.3/kernel/ptrace.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/ptrace.c  2011-06-10 22:11:24.000000000 +0200
 @@ -22,6 +22,7 @@
  #include <linux/syscalls.h>
  #include <linux/uaccess.h>
@@ -17104,9 +17108,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/ptrace.c linux-3.0.1-vs2.3.1-pre9/kerne
  
        return security_ptrace_access_check(task, mode);
  }
-diff -NurpP --minimal linux-3.0.1/kernel/sched.c linux-3.0.1-vs2.3.1-pre9/kernel/sched.c
---- linux-3.0.1/kernel/sched.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/sched.c    2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/sched.c linux-3.0.3-vs2.3.1-pre10/kernel/sched.c
+--- linux-3.0.3/kernel/sched.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/sched.c   2011-07-22 11:20:39.000000000 +0200
 @@ -71,6 +71,8 @@
  #include <linux/ctype.h>
  #include <linux/ftrace.h>
@@ -17180,9 +17184,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/sched.c linux-3.0.1-vs2.3.1-pre9/kernel
  
        retval = security_task_setnice(current, nice);
        if (retval)
-diff -NurpP --minimal linux-3.0.1/kernel/sched_fair.c linux-3.0.1-vs2.3.1-pre9/kernel/sched_fair.c
---- linux-3.0.1/kernel/sched_fair.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/sched_fair.c       2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/sched_fair.c linux-3.0.3-vs2.3.1-pre10/kernel/sched_fair.c
+--- linux-3.0.3/kernel/sched_fair.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/sched_fair.c      2011-07-22 11:20:39.000000000 +0200
 @@ -998,6 +998,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st
                __enqueue_entity(cfs_rq, se);
        se->on_rq = 1;
@@ -17201,9 +17205,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/sched_fair.c linux-3.0.1-vs2.3.1-pre9/k
        update_cfs_load(cfs_rq, 0);
        account_entity_dequeue(cfs_rq, se);
  
-diff -NurpP --minimal linux-3.0.1/kernel/signal.c linux-3.0.1-vs2.3.1-pre9/kernel/signal.c
---- linux-3.0.1/kernel/signal.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/signal.c   2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/signal.c linux-3.0.3-vs2.3.1-pre10/kernel/signal.c
+--- linux-3.0.3/kernel/signal.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/signal.c  2011-07-22 11:20:39.000000000 +0200
 @@ -28,6 +28,8 @@
  #include <linux/freezer.h>
  #include <linux/pid_namespace.h>
@@ -17296,9 +17300,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/signal.c linux-3.0.1-vs2.3.1-pre9/kerne
                if (sig_kernel_stop(signr)) {
                        /*
                         * The default action is to stop all threads in
-diff -NurpP --minimal linux-3.0.1/kernel/softirq.c linux-3.0.1-vs2.3.1-pre9/kernel/softirq.c
---- linux-3.0.1/kernel/softirq.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/softirq.c  2011-07-22 11:20:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/softirq.c linux-3.0.3-vs2.3.1-pre10/kernel/softirq.c
+--- linux-3.0.3/kernel/softirq.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/softirq.c 2011-07-22 11:20:39.000000000 +0200
 @@ -24,6 +24,7 @@
  #include <linux/ftrace.h>
  #include <linux/smp.h>
@@ -17307,9 +17311,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/softirq.c linux-3.0.1-vs2.3.1-pre9/kern
  
  #define CREATE_TRACE_POINTS
  #include <trace/events/irq.h>
-diff -NurpP --minimal linux-3.0.1/kernel/sys.c linux-3.0.1-vs2.3.1-pre9/kernel/sys.c
---- linux-3.0.1/kernel/sys.c   2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/sys.c      2011-07-23 15:55:50.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/sys.c linux-3.0.3-vs2.3.1-pre10/kernel/sys.c
+--- linux-3.0.3/kernel/sys.c   2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/sys.c     2011-07-23 15:55:50.000000000 +0200
 @@ -43,6 +43,7 @@
  #include <linux/syscalls.h>
  #include <linux/kprobes.h>
@@ -17406,9 +17410,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/sys.c linux-3.0.1-vs2.3.1-pre9/kernel/s
                return 0;
  
        return -EPERM;
-diff -NurpP --minimal linux-3.0.1/kernel/sysctl.c linux-3.0.1-vs2.3.1-pre9/kernel/sysctl.c
---- linux-3.0.1/kernel/sysctl.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/sysctl.c   2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/sysctl.c linux-3.0.3-vs2.3.1-pre10/kernel/sysctl.c
+--- linux-3.0.3/kernel/sysctl.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/sysctl.c  2011-06-15 02:40:14.000000000 +0200
 @@ -75,6 +75,7 @@
  #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT)
  #include <linux/lockdep.h>
@@ -17431,9 +17435,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/sysctl.c linux-3.0.1-vs2.3.1-pre9/kerne
  #ifdef CONFIG_CHR_DEV_SG
        {
                .procname       = "sg-big-buff",
-diff -NurpP --minimal linux-3.0.1/kernel/sysctl_binary.c linux-3.0.1-vs2.3.1-pre9/kernel/sysctl_binary.c
---- linux-3.0.1/kernel/sysctl_binary.c 2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/sysctl_binary.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/sysctl_binary.c linux-3.0.3-vs2.3.1-pre10/kernel/sysctl_binary.c
+--- linux-3.0.3/kernel/sysctl_binary.c 2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/sysctl_binary.c   2011-06-10 22:11:24.000000000 +0200
 @@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t
  
        { CTL_INT,      KERN_PANIC,                     "panic" },
@@ -17442,9 +17446,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/sysctl_binary.c linux-3.0.1-vs2.3.1-pre
  
        { CTL_STR,      KERN_SPARC_REBOOT,              "reboot-cmd" },
        { CTL_INT,      KERN_CTLALTDEL,                 "ctrl-alt-del" },
-diff -NurpP --minimal linux-3.0.1/kernel/time/timekeeping.c linux-3.0.1-vs2.3.1-pre9/kernel/time/timekeeping.c
---- linux-3.0.1/kernel/time/timekeeping.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/time/timekeeping.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/time/timekeeping.c linux-3.0.3-vs2.3.1-pre10/kernel/time/timekeeping.c
+--- linux-3.0.3/kernel/time/timekeeping.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/time/timekeeping.c        2011-06-10 22:11:24.000000000 +0200
 @@ -233,6 +233,7 @@ void getnstimeofday(struct timespec *ts)
        } while (read_seqretry(&xtime_lock, seq));
  
@@ -17453,9 +17457,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/time/timekeeping.c linux-3.0.1-vs2.3.1-
  }
  
  EXPORT_SYMBOL(getnstimeofday);
-diff -NurpP --minimal linux-3.0.1/kernel/time.c linux-3.0.1-vs2.3.1-pre9/kernel/time.c
---- linux-3.0.1/kernel/time.c  2011-05-22 16:17:59.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/time.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/time.c linux-3.0.3-vs2.3.1-pre10/kernel/time.c
+--- linux-3.0.3/kernel/time.c  2011-05-22 16:17:59.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/time.c    2011-06-10 22:11:24.000000000 +0200
 @@ -92,7 +92,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, 
        if (err)
                return err;
@@ -17474,9 +17478,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/time.c linux-3.0.1-vs2.3.1-pre9/kernel/
        }
        return 0;
  }
-diff -NurpP --minimal linux-3.0.1/kernel/timer.c linux-3.0.1-vs2.3.1-pre9/kernel/timer.c
---- linux-3.0.1/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/timer.c    2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/timer.c linux-3.0.3-vs2.3.1-pre10/kernel/timer.c
+--- linux-3.0.3/kernel/timer.c 2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/timer.c   2011-06-15 02:40:14.000000000 +0200
 @@ -40,6 +40,10 @@
  #include <linux/irq_work.h>
  #include <linux/sched.h>
@@ -17526,9 +17530,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/timer.c linux-3.0.1-vs2.3.1-pre9/kernel
  SYSCALL_DEFINE0(getuid)
  {
        /* Only we change this so SMP safe */
-diff -NurpP --minimal linux-3.0.1/kernel/user_namespace.c linux-3.0.1-vs2.3.1-pre9/kernel/user_namespace.c
---- linux-3.0.1/kernel/user_namespace.c        2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/user_namespace.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/user_namespace.c linux-3.0.3-vs2.3.1-pre10/kernel/user_namespace.c
+--- linux-3.0.3/kernel/user_namespace.c        2011-03-15 18:07:42.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/user_namespace.c  2011-06-10 22:11:24.000000000 +0200
 @@ -11,6 +11,7 @@
  #include <linux/user_namespace.h>
  #include <linux/highuid.h>
@@ -17554,9 +17558,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/user_namespace.c linux-3.0.1-vs2.3.1-pr
        INIT_WORK(&ns->destroyer, free_user_ns_work);
        schedule_work(&ns->destroyer);
  }
-diff -NurpP --minimal linux-3.0.1/kernel/utsname.c linux-3.0.1-vs2.3.1-pre9/kernel/utsname.c
---- linux-3.0.1/kernel/utsname.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/utsname.c  2011-06-13 14:09:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/utsname.c linux-3.0.3-vs2.3.1-pre10/kernel/utsname.c
+--- linux-3.0.3/kernel/utsname.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/kernel/utsname.c 2011-06-13 14:09:44.000000000 +0200
 @@ -16,14 +16,17 @@
  #include <linux/slab.h>
  #include <linux/user_namespace.h>
@@ -17625,9 +17629,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/utsname.c linux-3.0.1-vs2.3.1-pre9/kern
        kfree(ns);
  }
  
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/Kconfig linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Kconfig
---- linux-3.0.1/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Kconfig    2011-08-08 18:06:22.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/Kconfig linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Kconfig
+--- linux-3.0.3/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Kconfig   2011-08-08 18:06:22.000000000 +0200
 @@ -0,0 +1,232 @@
 +#
 +# Linux VServer configuration
@@ -17861,9 +17865,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/Kconfig linux-3.0.1-vs2.3.1-pre
 +      bool
 +      default n
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/Makefile linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Makefile
---- linux-3.0.1/kernel/vserver/Makefile        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/Makefile   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/Makefile linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Makefile
+--- linux-3.0.3/kernel/vserver/Makefile        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/Makefile  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,18 @@
 +#
 +# Makefile for the Linux vserver routines.
@@ -17883,9 +17887,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/Makefile linux-3.0.1-vs2.3.1-pr
 +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o
 +vserver-$(CONFIG_VSERVER_DEVICE) += device.o
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct.c
---- linux-3.0.1/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct.c
+--- linux-3.0.3/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct.c   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,42 @@
 +/*
 + *  linux/kernel/vserver/cacct.c
@@ -17929,9 +17933,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct.c linux-3.0.1-vs2.3.1-pre
 +      return 0;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_init.h
---- linux-3.0.1/kernel/vserver/cacct_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_init.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_init.h
+--- linux-3.0.3/kernel/vserver/cacct_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_init.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,25 @@
 +
 +
@@ -17958,9 +17962,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct_init.h linux-3.0.1-vs2.3.
 +      return;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_proc.h
---- linux-3.0.1/kernel/vserver/cacct_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cacct_proc.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/cacct_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_proc.h
+--- linux-3.0.3/kernel/vserver/cacct_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cacct_proc.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,53 @@
 +#ifndef _VX_CACCT_PROC_H
 +#define _VX_CACCT_PROC_H
@@ -18015,9 +18019,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/cacct_proc.h linux-3.0.1-vs2.3.
 +}
 +
 +#endif        /* _VX_CACCT_PROC_H */
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/context.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/context.c
---- linux-3.0.1/kernel/vserver/context.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/context.c  2011-08-01 18:28:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/context.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/context.c
+--- linux-3.0.3/kernel/vserver/context.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/context.c 2011-08-01 18:28:12.000000000 +0200
 @@ -0,0 +1,1107 @@
 +/*
 + *  linux/kernel/vserver/context.c
@@ -19126,9 +19130,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/context.c linux-3.0.1-vs2.3.1-p
 +
 +EXPORT_SYMBOL_GPL(free_vx_info);
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt.c
---- linux-3.0.1/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt.c    2011-06-13 14:57:26.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt.c
+--- linux-3.0.3/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt.c   2011-06-13 14:57:26.000000000 +0200
 @@ -0,0 +1,303 @@
 +/*
 + *  linux/kernel/vserver/cvirt.c
@@ -19433,9 +19437,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt.c linux-3.0.1-vs2.3.1-pre
 +
 +#endif
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_init.h
---- linux-3.0.1/kernel/vserver/cvirt_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_init.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_init.h
+--- linux-3.0.3/kernel/vserver/cvirt_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_init.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,70 @@
 +
 +
@@ -19507,9 +19511,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt_init.h linux-3.0.1-vs2.3.
 +      return;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_proc.h
---- linux-3.0.1/kernel/vserver/cvirt_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/cvirt_proc.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/cvirt_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_proc.h
+--- linux-3.0.3/kernel/vserver/cvirt_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/cvirt_proc.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,135 @@
 +#ifndef _VX_CVIRT_PROC_H
 +#define _VX_CVIRT_PROC_H
@@ -19646,9 +19650,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/cvirt_proc.h linux-3.0.1-vs2.3.
 +}
 +
 +#endif        /* _VX_CVIRT_PROC_H */
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/debug.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/debug.c
---- linux-3.0.1/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/debug.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/debug.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/debug.c
+--- linux-3.0.3/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/debug.c   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,32 @@
 +/*
 + *  kernel/vserver/debug.c
@@ -19682,9 +19686,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/debug.c linux-3.0.1-vs2.3.1-pre
 +
 +EXPORT_SYMBOL_GPL(dump_vx_info);
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/device.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/device.c
---- linux-3.0.1/kernel/vserver/device.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/device.c   2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/device.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/device.c
+--- linux-3.0.3/kernel/vserver/device.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/device.c  2011-06-10 23:20:56.000000000 +0200
 @@ -0,0 +1,443 @@
 +/*
 + *  linux/kernel/vserver/device.c
@@ -20129,9 +20133,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/device.c linux-3.0.1-vs2.3.1-pr
 +#endif        /* CONFIG_COMPAT */
 +
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/dlimit.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/dlimit.c
---- linux-3.0.1/kernel/vserver/dlimit.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/dlimit.c   2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/dlimit.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/dlimit.c
+--- linux-3.0.3/kernel/vserver/dlimit.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/dlimit.c  2011-06-10 23:20:56.000000000 +0200
 @@ -0,0 +1,531 @@
 +/*
 + *  linux/kernel/vserver/dlimit.c
@@ -20664,9 +20668,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/dlimit.c linux-3.0.1-vs2.3.1-pr
 +EXPORT_SYMBOL_GPL(locate_dl_info);
 +EXPORT_SYMBOL_GPL(rcu_free_dl_info);
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/helper.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/helper.c
---- linux-3.0.1/kernel/vserver/helper.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/helper.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/helper.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/helper.c
+--- linux-3.0.3/kernel/vserver/helper.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/helper.c  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,223 @@
 +/*
 + *  linux/kernel/vserver/helper.c
@@ -20891,9 +20895,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/helper.c linux-3.0.1-vs2.3.1-pr
 +      return do_vshelper(vshelper_path, argv, envp, 1);
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/history.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/history.c
---- linux-3.0.1/kernel/vserver/history.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/history.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/history.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/history.c
+--- linux-3.0.3/kernel/vserver/history.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/history.c 2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,258 @@
 +/*
 + *  kernel/vserver/history.c
@@ -21153,9 +21157,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/history.c linux-3.0.1-vs2.3.1-p
 +
 +#endif        /* CONFIG_COMPAT */
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/inet.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inet.c
---- linux-3.0.1/kernel/vserver/inet.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inet.c     2011-06-13 18:20:44.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/inet.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inet.c
+--- linux-3.0.3/kernel/vserver/inet.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inet.c    2011-06-13 18:20:44.000000000 +0200
 @@ -0,0 +1,225 @@
 +
 +#include <linux/in.h>
@@ -21382,9 +21386,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/inet.c linux-3.0.1-vs2.3.1-pre9
 +
 +EXPORT_SYMBOL_GPL(ip_v4_find_src);
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/init.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/init.c
---- linux-3.0.1/kernel/vserver/init.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/init.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/init.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/init.c
+--- linux-3.0.3/kernel/vserver/init.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/init.c    2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,45 @@
 +/*
 + *  linux/kernel/init.c
@@ -21431,9 +21435,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/init.c linux-3.0.1-vs2.3.1-pre9
 +module_init(init_vserver);
 +module_exit(exit_vserver);
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/inode.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inode.c
---- linux-3.0.1/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/inode.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/inode.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inode.c
+--- linux-3.0.3/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/inode.c   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,437 @@
 +/*
 + *  linux/kernel/vserver/inode.c
@@ -21872,9 +21876,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/inode.c linux-3.0.1-vs2.3.1-pre
 +
 +#endif        /* CONFIG_PROPAGATE */
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit.c
---- linux-3.0.1/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit.c
+--- linux-3.0.3/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit.c   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,354 @@
 +/*
 + *  linux/kernel/vserver/limit.c
@@ -22230,9 +22234,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit.c linux-3.0.1-vs2.3.1-pre
 +      return points;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_init.h
---- linux-3.0.1/kernel/vserver/limit_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_init.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_init.h
+--- linux-3.0.3/kernel/vserver/limit_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_init.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,31 @@
 +
 +
@@ -22265,9 +22269,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit_init.h linux-3.0.1-vs2.3.
 +      }
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_proc.h
---- linux-3.0.1/kernel/vserver/limit_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/limit_proc.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/limit_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_proc.h
+--- linux-3.0.3/kernel/vserver/limit_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/limit_proc.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,57 @@
 +#ifndef _VX_LIMIT_PROC_H
 +#define _VX_LIMIT_PROC_H
@@ -22326,9 +22330,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/limit_proc.h linux-3.0.1-vs2.3.
 +#endif        /* _VX_LIMIT_PROC_H */
 +
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/network.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/network.c
---- linux-3.0.1/kernel/vserver/network.c       1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/network.c  2011-06-10 23:20:56.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/network.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/network.c
+--- linux-3.0.3/kernel/vserver/network.c       1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/network.c 2011-06-10 23:20:56.000000000 +0200
 @@ -0,0 +1,912 @@
 +/*
 + *  linux/kernel/vserver/network.c
@@ -23242,9 +23246,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/network.c linux-3.0.1-vs2.3.1-p
 +EXPORT_SYMBOL_GPL(free_nx_info);
 +EXPORT_SYMBOL_GPL(unhash_nx_info);
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/proc.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/proc.c
---- linux-3.0.1/kernel/vserver/proc.c  1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/proc.c     2011-08-01 19:57:21.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/proc.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/proc.c
+--- linux-3.0.3/kernel/vserver/proc.c  1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/proc.c    2011-08-01 19:57:21.000000000 +0200
 @@ -0,0 +1,1103 @@
 +/*
 + *  linux/kernel/vserver/proc.c
@@ -24349,9 +24353,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/proc.c linux-3.0.1-vs2.3.1-pre9
 +      return buffer - orig;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched.c
---- linux-3.0.1/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched.c
+--- linux-3.0.3/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched.c   2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,82 @@
 +/*
 + *  linux/kernel/vserver/sched.c
@@ -24435,9 +24439,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched.c linux-3.0.1-vs2.3.1-pre
 +      return 0;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched_init.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_init.h
---- linux-3.0.1/kernel/vserver/sched_init.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_init.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched_init.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_init.h
+--- linux-3.0.3/kernel/vserver/sched_init.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_init.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,27 @@
 +
 +static inline void vx_info_init_sched(struct _vx_sched *sched)
@@ -24466,9 +24470,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched_init.h linux-3.0.1-vs2.3.
 +{
 +      return;
 +}
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched_proc.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_proc.h
---- linux-3.0.1/kernel/vserver/sched_proc.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sched_proc.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/sched_proc.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_proc.h
+--- linux-3.0.3/kernel/vserver/sched_proc.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sched_proc.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,32 @@
 +#ifndef _VX_SCHED_PROC_H
 +#define _VX_SCHED_PROC_H
@@ -24502,9 +24506,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/sched_proc.h linux-3.0.1-vs2.3.
 +}
 +
 +#endif        /* _VX_SCHED_PROC_H */
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/signal.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/signal.c
---- linux-3.0.1/kernel/vserver/signal.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/signal.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/signal.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/signal.c
+--- linux-3.0.3/kernel/vserver/signal.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/signal.c  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,134 @@
 +/*
 + *  linux/kernel/vserver/signal.c
@@ -24640,9 +24644,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/signal.c linux-3.0.1-vs2.3.1-pr
 +      return ret;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/space.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/space.c
---- linux-3.0.1/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/space.c    2011-07-20 02:11:49.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/space.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/space.c
+--- linux-3.0.3/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/space.c   2011-07-20 02:11:49.000000000 +0200
 @@ -0,0 +1,435 @@
 +/*
 + *  linux/kernel/vserver/space.c
@@ -25079,9 +25083,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/space.c linux-3.0.1-vs2.3.1-pre
 +      return 0;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/switch.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/switch.c
---- linux-3.0.1/kernel/vserver/switch.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/switch.c   2011-08-01 18:28:26.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/switch.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/switch.c
+--- linux-3.0.3/kernel/vserver/switch.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/switch.c  2011-08-01 18:28:26.000000000 +0200
 @@ -0,0 +1,556 @@
 +/*
 + *  linux/kernel/vserver/switch.c
@@ -25639,9 +25643,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/switch.c linux-3.0.1-vs2.3.1-pr
 +}
 +
 +#endif        /* CONFIG_COMPAT */
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/sysctl.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sysctl.c
---- linux-3.0.1/kernel/vserver/sysctl.c        1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/sysctl.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/sysctl.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sysctl.c
+--- linux-3.0.3/kernel/vserver/sysctl.c        1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/sysctl.c  2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,241 @@
 +/*
 + *  kernel/vserver/sysctl.c
@@ -25884,9 +25888,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/sysctl.c linux-3.0.1-vs2.3.1-pr
 +EXPORT_SYMBOL_GPL(vx_debug_space);
 +EXPORT_SYMBOL_GPL(vx_debug_misc);
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/tag.c linux-3.0.1-vs2.3.1-pre9/kernel/vserver/tag.c
---- linux-3.0.1/kernel/vserver/tag.c   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/tag.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/tag.c linux-3.0.3-vs2.3.1-pre10/kernel/vserver/tag.c
+--- linux-3.0.3/kernel/vserver/tag.c   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/tag.c     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,63 @@
 +/*
 + *  linux/kernel/vserver/tag.c
@@ -25951,9 +25955,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/tag.c linux-3.0.1-vs2.3.1-pre9/
 +}
 +
 +
-diff -NurpP --minimal linux-3.0.1/kernel/vserver/vci_config.h linux-3.0.1-vs2.3.1-pre9/kernel/vserver/vci_config.h
---- linux-3.0.1/kernel/vserver/vci_config.h    1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/kernel/vserver/vci_config.h       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/kernel/vserver/vci_config.h linux-3.0.3-vs2.3.1-pre10/kernel/vserver/vci_config.h
+--- linux-3.0.3/kernel/vserver/vci_config.h    1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/kernel/vserver/vci_config.h      2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,76 @@
 +
 +/*  interface version */
@@ -26031,9 +26035,9 @@ diff -NurpP --minimal linux-3.0.1/kernel/vserver/vci_config.h linux-3.0.1-vs2.3.
 +      0;
 +}
 +
-diff -NurpP --minimal linux-3.0.1/mm/filemap_xip.c linux-3.0.1-vs2.3.1-pre9/mm/filemap_xip.c
---- linux-3.0.1/mm/filemap_xip.c       2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/filemap_xip.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/filemap_xip.c linux-3.0.3-vs2.3.1-pre10/mm/filemap_xip.c
+--- linux-3.0.3/mm/filemap_xip.c       2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/filemap_xip.c 2011-06-10 22:11:24.000000000 +0200
 @@ -18,6 +18,7 @@
  #include <linux/seqlock.h>
  #include <linux/mutex.h>
@@ -26042,9 +26046,9 @@ diff -NurpP --minimal linux-3.0.1/mm/filemap_xip.c linux-3.0.1-vs2.3.1-pre9/mm/f
  #include <asm/tlbflush.h>
  #include <asm/io.h>
  
-diff -NurpP --minimal linux-3.0.1/mm/fremap.c linux-3.0.1-vs2.3.1-pre9/mm/fremap.c
---- linux-3.0.1/mm/fremap.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/fremap.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/fremap.c linux-3.0.3-vs2.3.1-pre10/mm/fremap.c
+--- linux-3.0.3/mm/fremap.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/fremap.c      2011-06-10 22:11:24.000000000 +0200
 @@ -16,6 +16,7 @@
  #include <linux/module.h>
  #include <linux/syscalls.h>
@@ -26053,9 +26057,9 @@ diff -NurpP --minimal linux-3.0.1/mm/fremap.c linux-3.0.1-vs2.3.1-pre9/mm/fremap
  
  #include <asm/mmu_context.h>
  #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0.1/mm/hugetlb.c linux-3.0.1-vs2.3.1-pre9/mm/hugetlb.c
---- linux-3.0.1/mm/hugetlb.c   2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/hugetlb.c      2011-06-22 12:39:16.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/hugetlb.c linux-3.0.3-vs2.3.1-pre10/mm/hugetlb.c
+--- linux-3.0.3/mm/hugetlb.c   2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/hugetlb.c     2011-06-22 12:39:16.000000000 +0200
 @@ -28,6 +28,7 @@
  
  #include <linux/hugetlb.h>
@@ -26064,9 +26068,9 @@ diff -NurpP --minimal linux-3.0.1/mm/hugetlb.c linux-3.0.1-vs2.3.1-pre9/mm/huget
  #include "internal.h"
  
  const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
-diff -NurpP --minimal linux-3.0.1/mm/memcontrol.c linux-3.0.1-vs2.3.1-pre9/mm/memcontrol.c
---- linux-3.0.1/mm/memcontrol.c        2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/memcontrol.c   2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/memcontrol.c linux-3.0.3-vs2.3.1-pre10/mm/memcontrol.c
+--- linux-3.0.3/mm/memcontrol.c        2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/memcontrol.c  2011-08-08 23:04:47.000000000 +0200
 @@ -741,6 +741,31 @@ struct mem_cgroup *mem_cgroup_from_task(
                                struct mem_cgroup, css);
  }
@@ -26099,9 +26103,9 @@ diff -NurpP --minimal linux-3.0.1/mm/memcontrol.c linux-3.0.1-vs2.3.1-pre9/mm/me
  struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm)
  {
        struct mem_cgroup *mem = NULL;
-diff -NurpP --minimal linux-3.0.1/mm/memory.c linux-3.0.1-vs2.3.1-pre9/mm/memory.c
---- linux-3.0.1/mm/memory.c    2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/memory.c       2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/memory.c linux-3.0.3-vs2.3.1-pre10/mm/memory.c
+--- linux-3.0.3/mm/memory.c    2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/memory.c      2011-08-08 23:04:47.000000000 +0200
 @@ -3388,6 +3388,7 @@ int handle_pte_fault(struct mm_struct *m
  {
        pte_t entry;
@@ -26137,9 +26141,9 @@ diff -NurpP --minimal linux-3.0.1/mm/memory.c linux-3.0.1-vs2.3.1-pre9/mm/memory
  }
  
  /*
-diff -NurpP --minimal linux-3.0.1/mm/mremap.c linux-3.0.1-vs2.3.1-pre9/mm/mremap.c
---- linux-3.0.1/mm/mremap.c    2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/mremap.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/mremap.c linux-3.0.3-vs2.3.1-pre10/mm/mremap.c
+--- linux-3.0.3/mm/mremap.c    2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/mremap.c      2011-06-10 22:11:24.000000000 +0200
 @@ -19,6 +19,7 @@
  #include <linux/security.h>
  #include <linux/syscalls.h>
@@ -26148,9 +26152,9 @@ diff -NurpP --minimal linux-3.0.1/mm/mremap.c linux-3.0.1-vs2.3.1-pre9/mm/mremap
  
  #include <asm/uaccess.h>
  #include <asm/cacheflush.h>
-diff -NurpP --minimal linux-3.0.1/mm/oom_kill.c linux-3.0.1-vs2.3.1-pre9/mm/oom_kill.c
---- linux-3.0.1/mm/oom_kill.c  2011-08-08 22:31:58.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/oom_kill.c     2011-08-08 23:04:47.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/oom_kill.c linux-3.0.3-vs2.3.1-pre10/mm/oom_kill.c
+--- linux-3.0.3/mm/oom_kill.c  2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/oom_kill.c    2011-08-08 23:04:47.000000000 +0200
 @@ -32,6 +32,9 @@
  #include <linux/mempolicy.h>
  #include <linux/security.h>
@@ -26245,9 +26249,9 @@ diff -NurpP --minimal linux-3.0.1/mm/oom_kill.c linux-3.0.1-vs2.3.1-pre9/mm/oom_
        }
  
        if (oom_kill_process(p, gfp_mask, order, points, totalpages, NULL,
-diff -NurpP --minimal linux-3.0.1/mm/page_alloc.c linux-3.0.1-vs2.3.1-pre9/mm/page_alloc.c
---- linux-3.0.1/mm/page_alloc.c        2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/page_alloc.c   2011-06-10 22:24:12.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/page_alloc.c linux-3.0.3-vs2.3.1-pre10/mm/page_alloc.c
+--- linux-3.0.3/mm/page_alloc.c        2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/page_alloc.c  2011-06-10 22:24:12.000000000 +0200
 @@ -57,6 +57,8 @@
  #include <linux/ftrace_event.h>
  #include <linux/memcontrol.h>
@@ -26277,9 +26281,9 @@ diff -NurpP --minimal linux-3.0.1/mm/page_alloc.c linux-3.0.1-vs2.3.1-pre9/mm/pa
  }
  #endif
  
-diff -NurpP --minimal linux-3.0.1/mm/pgtable-generic.c linux-3.0.1-vs2.3.1-pre9/mm/pgtable-generic.c
---- linux-3.0.1/mm/pgtable-generic.c   2011-03-15 18:07:42.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/mm/pgtable-generic.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/pgtable-generic.c linux-3.0.3-vs2.3.1-pre10/mm/pgtable-generic.c
+--- linux-3.0.3/mm/pgtable-generic.c   2011-03-15 18:07:42.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/mm/pgtable-generic.c     2011-06-10 22:11:24.000000000 +0200
 @@ -6,6 +6,8 @@
   *  Copyright (C) 2010  Linus Torvalds
   */
@@ -26289,9 +26293,9 @@ diff -NurpP --minimal linux-3.0.1/mm/pgtable-generic.c linux-3.0.1-vs2.3.1-pre9/
  #include <linux/pagemap.h>
  #include <asm/tlb.h>
  #include <asm-generic/pgtable.h>
-diff -NurpP --minimal linux-3.0.1/mm/rmap.c linux-3.0.1-vs2.3.1-pre9/mm/rmap.c
---- linux-3.0.1/mm/rmap.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/rmap.c 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/rmap.c linux-3.0.3-vs2.3.1-pre10/mm/rmap.c
+--- linux-3.0.3/mm/rmap.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/rmap.c        2011-07-01 11:35:35.000000000 +0200
 @@ -57,6 +57,7 @@
  #include <linux/mmu_notifier.h>
  #include <linux/migrate.h>
@@ -26300,9 +26304,9 @@ diff -NurpP --minimal linux-3.0.1/mm/rmap.c linux-3.0.1-vs2.3.1-pre9/mm/rmap.c
  
  #include <asm/tlbflush.h>
  
-diff -NurpP --minimal linux-3.0.1/mm/shmem.c linux-3.0.1-vs2.3.1-pre9/mm/shmem.c
---- linux-3.0.1/mm/shmem.c     2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/shmem.c        2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/shmem.c linux-3.0.3-vs2.3.1-pre10/mm/shmem.c
+--- linux-3.0.3/mm/shmem.c     2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/shmem.c       2011-07-01 11:35:35.000000000 +0200
 @@ -1850,7 +1850,7 @@ static int shmem_statfs(struct dentry *d
  {
        struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb);
@@ -26321,9 +26325,9 @@ diff -NurpP --minimal linux-3.0.1/mm/shmem.c linux-3.0.1-vs2.3.1-pre9/mm/shmem.c
        sb->s_op = &shmem_ops;
        sb->s_time_gran = 1;
  #ifdef CONFIG_TMPFS_XATTR
-diff -NurpP --minimal linux-3.0.1/mm/slab.c linux-3.0.1-vs2.3.1-pre9/mm/slab.c
---- linux-3.0.1/mm/slab.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/slab.c 2011-06-15 02:41:23.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/slab.c linux-3.0.3-vs2.3.1-pre10/mm/slab.c
+--- linux-3.0.3/mm/slab.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/slab.c        2011-06-15 02:41:23.000000000 +0200
 @@ -411,6 +411,8 @@ static void kmem_list3_init(struct kmem_
  #define STATS_INC_FREEMISS(x) do { } while (0)
  #endif
@@ -26357,9 +26361,9 @@ diff -NurpP --minimal linux-3.0.1/mm/slab.c linux-3.0.1-vs2.3.1-pre9/mm/slab.c
  
        kmemcheck_slab_free(cachep, objp, obj_size(cachep));
  
-diff -NurpP --minimal linux-3.0.1/mm/slab_vs.h linux-3.0.1-vs2.3.1-pre9/mm/slab_vs.h
---- linux-3.0.1/mm/slab_vs.h   1970-01-01 01:00:00.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/mm/slab_vs.h      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/slab_vs.h linux-3.0.3-vs2.3.1-pre10/mm/slab_vs.h
+--- linux-3.0.3/mm/slab_vs.h   1970-01-01 01:00:00.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/mm/slab_vs.h     2011-06-10 22:11:24.000000000 +0200
 @@ -0,0 +1,29 @@
 +
 +#include <linux/vserver/context.h>
@@ -26390,9 +26394,9 @@ diff -NurpP --minimal linux-3.0.1/mm/slab_vs.h linux-3.0.1-vs2.3.1-pre9/mm/slab_
 +      atomic_sub(cachep->buffer_size, &vxi->cacct.slab[what]);
 +}
 +
-diff -NurpP --minimal linux-3.0.1/mm/swapfile.c linux-3.0.1-vs2.3.1-pre9/mm/swapfile.c
---- linux-3.0.1/mm/swapfile.c  2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/mm/swapfile.c     2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/mm/swapfile.c linux-3.0.3-vs2.3.1-pre10/mm/swapfile.c
+--- linux-3.0.3/mm/swapfile.c  2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/mm/swapfile.c    2011-07-01 11:35:35.000000000 +0200
 @@ -37,6 +37,8 @@
  #include <asm/tlbflush.h>
  #include <linux/swapops.h>
@@ -26428,9 +26432,9 @@ diff -NurpP --minimal linux-3.0.1/mm/swapfile.c linux-3.0.1-vs2.3.1-pre9/mm/swap
  }
  
  /*
-diff -NurpP --minimal linux-3.0.1/net/bridge/br_multicast.c linux-3.0.1-vs2.3.1-pre9/net/bridge/br_multicast.c
---- linux-3.0.1/net/bridge/br_multicast.c      2011-07-22 11:18:12.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/bridge/br_multicast.c 2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/bridge/br_multicast.c linux-3.0.3-vs2.3.1-pre10/net/bridge/br_multicast.c
+--- linux-3.0.3/net/bridge/br_multicast.c      2011-07-22 11:18:12.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/bridge/br_multicast.c        2011-07-19 00:44:39.000000000 +0200
 @@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_
        ip6h->hop_limit = 1;
        ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1));
@@ -26440,9 +26444,9 @@ diff -NurpP --minimal linux-3.0.1/net/bridge/br_multicast.c linux-3.0.1-vs2.3.1-
        ipv6_eth_mc_map(&ip6h->daddr, eth->h_dest);
  
        hopopt = (u8 *)(ip6h + 1);
-diff -NurpP --minimal linux-3.0.1/net/core/dev.c linux-3.0.1-vs2.3.1-pre9/net/core/dev.c
---- linux-3.0.1/net/core/dev.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/core/dev.c    2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/core/dev.c linux-3.0.3-vs2.3.1-pre10/net/core/dev.c
+--- linux-3.0.3/net/core/dev.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/core/dev.c   2011-06-15 02:40:14.000000000 +0200
 @@ -127,6 +127,7 @@
  #include <linux/in.h>
  #include <linux/jhash.h>
@@ -26544,9 +26548,9 @@ diff -NurpP --minimal linux-3.0.1/net/core/dev.c linux-3.0.1-vs2.3.1-pre9/net/co
        seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu "
                   "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n",
                   dev->name, stats->rx_bytes, stats->rx_packets,
-diff -NurpP --minimal linux-3.0.1/net/core/rtnetlink.c linux-3.0.1-vs2.3.1-pre9/net/core/rtnetlink.c
---- linux-3.0.1/net/core/rtnetlink.c   2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/core/rtnetlink.c      2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/core/rtnetlink.c linux-3.0.3-vs2.3.1-pre10/net/core/rtnetlink.c
+--- linux-3.0.3/net/core/rtnetlink.c   2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/core/rtnetlink.c     2011-06-10 22:11:24.000000000 +0200
 @@ -1015,6 +1015,8 @@ static int rtnl_dump_ifinfo(struct sk_bu
                hlist_for_each_entry_rcu(dev, node, head, index_hlist) {
                        if (idx < s_idx)
@@ -26566,9 +26570,9 @@ diff -NurpP --minimal linux-3.0.1/net/core/rtnetlink.c linux-3.0.1-vs2.3.1-pre9/
        skb = nlmsg_new(if_nlmsg_size(dev), GFP_KERNEL);
        if (skb == NULL)
                goto errout;
-diff -NurpP --minimal linux-3.0.1/net/core/sock.c linux-3.0.1-vs2.3.1-pre9/net/core/sock.c
---- linux-3.0.1/net/core/sock.c        2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/core/sock.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/core/sock.c linux-3.0.3-vs2.3.1-pre10/net/core/sock.c
+--- linux-3.0.3/net/core/sock.c        2011-05-22 16:18:00.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/core/sock.c  2011-06-10 22:11:24.000000000 +0200
 @@ -127,6 +127,10 @@
  #include <net/cls_cgroup.h>
  
@@ -26636,9 +26640,9 @@ diff -NurpP --minimal linux-3.0.1/net/core/sock.c linux-3.0.1-vs2.3.1-pre9/net/c
        /*
         * Before updating sk_refcnt, we must commit prior changes to memory
         * (Documentation/RCU/rculist_nulls.txt for details)
-diff -NurpP --minimal linux-3.0.1/net/ipv4/af_inet.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/af_inet.c
---- linux-3.0.1/net/ipv4/af_inet.c     2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/af_inet.c        2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/af_inet.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/af_inet.c
+--- linux-3.0.3/net/ipv4/af_inet.c     2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/af_inet.c       2011-07-19 00:44:39.000000000 +0200
 @@ -117,6 +117,7 @@
  #ifdef CONFIG_IP_MROUTE
  #include <linux/mroute.h>
@@ -26716,9 +26720,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/af_inet.c linux-3.0.1-vs2.3.1-pre9/ne
                sin->sin_port = inet->inet_sport;
                sin->sin_addr.s_addr = addr;
        }
-diff -NurpP --minimal linux-3.0.1/net/ipv4/devinet.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/devinet.c
---- linux-3.0.1/net/ipv4/devinet.c     2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/devinet.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/devinet.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/devinet.c
+--- linux-3.0.3/net/ipv4/devinet.c     2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/devinet.c       2011-08-29 03:45:09.000000000 +0200
 @@ -518,6 +518,7 @@ struct in_device *inetdev_by_index(struc
  }
  EXPORT_SYMBOL(inetdev_by_index);
@@ -26785,9 +26789,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/devinet.c linux-3.0.1-vs2.3.1-pre9/ne
                                if (ip_idx < s_ip_idx)
                                        continue;
                                if (inet_fill_ifaddr(skb, ifa,
-diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_connection_sock.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_connection_sock.c
---- linux-3.0.1/net/ipv4/inet_connection_sock.c        2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_connection_sock.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_connection_sock.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_connection_sock.c
+--- linux-3.0.3/net/ipv4/inet_connection_sock.c        2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_connection_sock.c  2011-06-10 22:11:24.000000000 +0200
 @@ -52,6 +52,37 @@ void inet_get_local_port_range(int *low,
  }
  EXPORT_SYMBOL(inet_get_local_port_range);
@@ -26837,9 +26841,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_connection_sock.c linux-3.0.1-vs
                                        break;
                        }
                }
-diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_diag.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_diag.c
---- linux-3.0.1/net/ipv4/inet_diag.c   2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_diag.c      2011-06-22 12:39:16.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_diag.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_diag.c
+--- linux-3.0.3/net/ipv4/inet_diag.c   2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_diag.c     2011-06-22 12:39:16.000000000 +0200
 @@ -33,6 +33,8 @@
  #include <linux/stddef.h>
  
@@ -26943,18 +26947,18 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_diag.c linux-3.0.1-vs2.3.1-pre9/
                                if (num < s_num)
                                        goto next_dying;
                                if (r->id.idiag_sport != tw->tw_sport &&
-diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_hashtables.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_hashtables.c
---- linux-3.0.1/net/ipv4/inet_hashtables.c     2011-01-05 21:50:42.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/inet_hashtables.c        2011-06-10 22:11:24.000000000 +0200
-@@ -21,6 +21,7 @@
- 
+diff -NurpP --minimal linux-3.0.3/net/ipv4/inet_hashtables.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_hashtables.c
+--- linux-3.0.3/net/ipv4/inet_hashtables.c     2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/inet_hashtables.c       2011-08-29 03:45:56.000000000 +0200
+@@ -22,6 +22,7 @@
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
-+#include <net/route.h>
  #include <net/secure_seq.h>
++#include <net/route.h>
  #include <net/ip.h>
  
-@@ -155,6 +156,11 @@ static inline int compute_score(struct s
+ /*
+@@ -156,6 +157,11 @@ static inline int compute_score(struct s
                        if (rcv_saddr != daddr)
                                return -1;
                        score += 2;
@@ -26966,7 +26970,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_hashtables.c linux-3.0.1-vs2.3.1
                }
                if (sk->sk_bound_dev_if) {
                        if (sk->sk_bound_dev_if != dif)
-@@ -172,7 +178,6 @@ static inline int compute_score(struct s
+@@ -173,7 +179,6 @@ static inline int compute_score(struct s
   * wildcarded during the search since they can never be otherwise.
   */
  
@@ -26974,7 +26978,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_hashtables.c linux-3.0.1-vs2.3.1
  struct sock *__inet_lookup_listener(struct net *net,
                                    struct inet_hashinfo *hashinfo,
                                    const __be32 daddr, const unsigned short hnum,
-@@ -195,6 +200,7 @@ begin:
+@@ -196,6 +201,7 @@ begin:
                        hiscore = score;
                }
        }
@@ -26982,9 +26986,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/inet_hashtables.c linux-3.0.1-vs2.3.1
        /*
         * if the nulls value we got at the end of this lookup is
         * not the expected one, we must restart lookup.
-diff -NurpP --minimal linux-3.0.1/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter/nf_nat_helper.c
---- linux-3.0.1/net/ipv4/netfilter/nf_nat_helper.c     2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter/nf_nat_helper.c        2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter/nf_nat_helper.c
+--- linux-3.0.3/net/ipv4/netfilter/nf_nat_helper.c     2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter/nf_nat_helper.c       2011-06-15 02:40:14.000000000 +0200
 @@ -20,6 +20,7 @@
  #include <net/route.h>
  
@@ -26993,9 +26997,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/netfilter/nf_nat_helper.c linux-3.0.1
  #include <net/netfilter/nf_conntrack.h>
  #include <net/netfilter/nf_conntrack_helper.h>
  #include <net/netfilter/nf_conntrack_ecache.h>
-diff -NurpP --minimal linux-3.0.1/net/ipv4/netfilter.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter.c
---- linux-3.0.1/net/ipv4/netfilter.c   2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/netfilter.c      2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/netfilter.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter.c
+--- linux-3.0.3/net/ipv4/netfilter.c   2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/netfilter.c     2011-07-19 00:44:39.000000000 +0200
 @@ -5,7 +5,7 @@
  #include <linux/ip.h>
  #include <linux/skbuff.h>
@@ -27005,9 +27009,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/netfilter.c linux-3.0.1-vs2.3.1-pre9/
  #include <net/xfrm.h>
  #include <net/ip.h>
  #include <net/netfilter/nf_queue.h>
-diff -NurpP --minimal linux-3.0.1/net/ipv4/raw.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/raw.c
---- linux-3.0.1/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/raw.c    2011-07-27 20:26:04.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/raw.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/raw.c
+--- linux-3.0.3/net/ipv4/raw.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/raw.c   2011-07-27 20:26:04.000000000 +0200
 @@ -117,7 +117,7 @@ static struct sock *__raw_v4_lookup(stru
  
                if (net_eq(sock_net(sk), net) && inet->inet_num == num  &&
@@ -27100,9 +27104,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/raw.c linux-3.0.1-vs2.3.1-pre9/net/ip
  
        if (!sk && ++state->bucket < RAW_HTABLE_SIZE) {
                sk = sk_head(&state->h->ht[state->bucket]);
-diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp.c
---- linux-3.0.1/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp.c    2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp.c
+--- linux-3.0.3/net/ipv4/tcp.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp.c   2011-07-19 00:44:39.000000000 +0200
 @@ -266,6 +266,7 @@
  #include <linux/crypto.h>
  #include <linux/time.h>
@@ -27111,10 +27115,10 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp.c linux-3.0.1-vs2.3.1-pre9/net/ip
  
  #include <net/icmp.h>
  #include <net/tcp.h>
-diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_ipv4.c
---- linux-3.0.1/net/ipv4/tcp_ipv4.c    2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_ipv4.c       2011-06-22 12:39:16.000000000 +0200
-@@ -2002,6 +2002,12 @@ static void *listening_get_next(struct s
+diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp_ipv4.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_ipv4.c
+--- linux-3.0.3/net/ipv4/tcp_ipv4.c    2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_ipv4.c      2011-08-29 03:45:10.000000000 +0200
+@@ -2003,6 +2003,12 @@ static void *listening_get_next(struct s
                req = req->dl_next;
                while (1) {
                        while (req) {
@@ -27127,7 +27131,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/n
                                if (req->rsk_ops->family == st->family) {
                                        cur = req;
                                        goto out;
-@@ -2026,6 +2032,10 @@ get_req:
+@@ -2027,6 +2033,10 @@ get_req:
        }
  get_sk:
        sk_nulls_for_each_from(sk, node) {
@@ -27138,7 +27142,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/n
                if (!net_eq(sock_net(sk), net))
                        continue;
                if (sk->sk_family == st->family) {
-@@ -2102,6 +2112,11 @@ static void *established_get_first(struc
+@@ -2103,6 +2113,11 @@ static void *established_get_first(struc
  
                spin_lock_bh(lock);
                sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) {
@@ -27150,7 +27154,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/n
                        if (sk->sk_family != st->family ||
                            !net_eq(sock_net(sk), net)) {
                                continue;
-@@ -2112,6 +2127,11 @@ static void *established_get_first(struc
+@@ -2113,6 +2128,11 @@ static void *established_get_first(struc
                st->state = TCP_SEQ_STATE_TIME_WAIT;
                inet_twsk_for_each(tw, node,
                                   &tcp_hashinfo.ehash[st->bucket].twchain) {
@@ -27162,7 +27166,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/n
                        if (tw->tw_family != st->family ||
                            !net_eq(twsk_net(tw), net)) {
                                continue;
-@@ -2141,7 +2161,9 @@ static void *established_get_next(struct
+@@ -2142,7 +2162,9 @@ static void *established_get_next(struct
                tw = cur;
                tw = tw_next(tw);
  get_tw:
@@ -27173,7 +27177,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/n
                        tw = tw_next(tw);
                }
                if (tw) {
-@@ -2165,6 +2187,11 @@ get_tw:
+@@ -2166,6 +2188,11 @@ get_tw:
                sk = sk_nulls_next(sk);
  
        sk_nulls_for_each_from(sk, node) {
@@ -27185,7 +27189,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/n
                if (sk->sk_family == st->family && net_eq(sock_net(sk), net))
                        goto found;
        }
-@@ -2374,9 +2401,9 @@ static void get_openreq4(struct sock *sk
+@@ -2375,9 +2402,9 @@ static void get_openreq4(struct sock *sk
        seq_printf(f, "%4d: %08X:%04X %08X:%04X"
                " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n",
                i,
@@ -27197,9 +27201,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_ipv4.c linux-3.0.1-vs2.3.1-pre9/n
                ntohs(ireq->rmt_port),
                TCP_SYN_RECV,
                0, 0, /* could print option size, but that is af dependent. */
-diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_minisocks.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_minisocks.c
---- linux-3.0.1/net/ipv4/tcp_minisocks.c       2011-03-15 18:07:45.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/tcp_minisocks.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/tcp_minisocks.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_minisocks.c
+--- linux-3.0.3/net/ipv4/tcp_minisocks.c       2011-03-15 18:07:45.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/tcp_minisocks.c 2011-06-10 22:11:24.000000000 +0200
 @@ -23,6 +23,9 @@
  #include <linux/slab.h>
  #include <linux/sysctl.h>
@@ -27222,9 +27226,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/tcp_minisocks.c linux-3.0.1-vs2.3.1-p
  #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
                if (tw->tw_family == PF_INET6) {
                        struct ipv6_pinfo *np = inet6_sk(sk);
-diff -NurpP --minimal linux-3.0.1/net/ipv4/udp.c linux-3.0.1-vs2.3.1-pre9/net/ipv4/udp.c
---- linux-3.0.1/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv4/udp.c    2011-07-27 20:26:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv4/udp.c linux-3.0.3-vs2.3.1-pre10/net/ipv4/udp.c
+--- linux-3.0.3/net/ipv4/udp.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv4/udp.c   2011-07-27 20:26:14.000000000 +0200
 @@ -296,14 +296,7 @@ fail:
  }
  EXPORT_SYMBOL(udp_lib_get_port);
@@ -27346,9 +27350,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv4/udp.c linux-3.0.1-vs2.3.1-pre9/net/ip
  
        if (!sk) {
                if (state->bucket <= state->udp_table->mask)
-diff -NurpP --minimal linux-3.0.1/net/ipv6/Kconfig linux-3.0.1-vs2.3.1-pre9/net/ipv6/Kconfig
---- linux-3.0.1/net/ipv6/Kconfig       2010-08-02 16:52:59.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/Kconfig  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/Kconfig linux-3.0.3-vs2.3.1-pre10/net/ipv6/Kconfig
+--- linux-3.0.3/net/ipv6/Kconfig       2010-08-02 16:52:59.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/Kconfig 2011-06-10 22:11:24.000000000 +0200
 @@ -4,8 +4,8 @@
  
  #   IPv6 as module will cause a CRASH if you try to unload it
@@ -27360,9 +27364,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/Kconfig linux-3.0.1-vs2.3.1-pre9/net/
        ---help---
          This is complemental support for the IP version 6.
          You will still be able to do traditional IPv4 networking as well.
-diff -NurpP --minimal linux-3.0.1/net/ipv6/addrconf.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/addrconf.c
---- linux-3.0.1/net/ipv6/addrconf.c    2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/addrconf.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/addrconf.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/addrconf.c
+--- linux-3.0.3/net/ipv6/addrconf.c    2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/addrconf.c      2011-06-10 22:11:24.000000000 +0200
 @@ -87,6 +87,8 @@
  
  #include <linux/proc_fs.h>
@@ -27462,9 +27466,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/addrconf.c linux-3.0.1-vs2.3.1-pre9/n
                        idev = __in6_dev_get(dev);
                        if (!idev)
                                goto cont;
-diff -NurpP --minimal linux-3.0.1/net/ipv6/af_inet6.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/af_inet6.c
---- linux-3.0.1/net/ipv6/af_inet6.c    2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/af_inet6.c       2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/af_inet6.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/af_inet6.c
+--- linux-3.0.3/net/ipv6/af_inet6.c    2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/af_inet6.c      2011-08-29 03:45:10.000000000 +0200
 @@ -42,6 +42,8 @@
  #include <linux/netdevice.h>
  #include <linux/icmpv6.h>
@@ -27560,9 +27564,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/af_inet6.c linux-3.0.1-vs2.3.1-pre9/n
                if (ipv6_addr_any(&np->rcv_saddr))
                        ipv6_addr_copy(&sin->sin6_addr, &np->saddr);
                else
-diff -NurpP --minimal linux-3.0.1/net/ipv6/fib6_rules.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/fib6_rules.c
---- linux-3.0.1/net/ipv6/fib6_rules.c  2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/fib6_rules.c     2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/fib6_rules.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/fib6_rules.c
+--- linux-3.0.3/net/ipv6/fib6_rules.c  2011-05-22 16:18:00.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/fib6_rules.c    2011-06-10 22:11:24.000000000 +0200
 @@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r
                                               ip6_dst_idev(&rt->dst)->dev,
                                               &flp6->daddr,
@@ -27572,9 +27576,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/fib6_rules.c linux-3.0.1-vs2.3.1-pre9
                                goto again;
                        if (!ipv6_prefix_equal(&saddr, &r->src.addr,
                                               r->src.plen))
-diff -NurpP --minimal linux-3.0.1/net/ipv6/inet6_hashtables.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/inet6_hashtables.c
---- linux-3.0.1/net/ipv6/inet6_hashtables.c    2011-05-22 16:18:00.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/inet6_hashtables.c       2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/inet6_hashtables.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/inet6_hashtables.c
+--- linux-3.0.3/net/ipv6/inet6_hashtables.c    2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/inet6_hashtables.c      2011-08-29 03:45:10.000000000 +0200
 @@ -16,6 +16,7 @@
  
  #include <linux/module.h>
@@ -27583,7 +27587,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/inet6_hashtables.c linux-3.0.1-vs2.3.
  
  #include <net/inet_connection_sock.h>
  #include <net/inet_hashtables.h>
-@@ -82,7 +83,6 @@ struct sock *__inet6_lookup_established(
+@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established(
        unsigned int slot = hash & hashinfo->ehash_mask;
        struct inet_ehash_bucket *head = &hashinfo->ehash[slot];
  
@@ -27591,7 +27595,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/inet6_hashtables.c linux-3.0.1-vs2.3.
        rcu_read_lock();
  begin:
        sk_nulls_for_each_rcu(sk, node, &head->chain) {
-@@ -94,7 +94,7 @@ begin:
+@@ -95,7 +95,7 @@ begin:
                                sock_put(sk);
                                goto begin;
                        }
@@ -27600,7 +27604,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/inet6_hashtables.c linux-3.0.1-vs2.3.
                }
        }
        if (get_nulls_value(node) != slot)
-@@ -140,6 +140,9 @@ static inline int compute_score(struct s
+@@ -141,6 +141,9 @@ static inline int compute_score(struct s
                        if (!ipv6_addr_equal(&np->rcv_saddr, daddr))
                                return -1;
                        score++;
@@ -27610,10 +27614,10 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/inet6_hashtables.c linux-3.0.1-vs2.3.
                }
                if (sk->sk_bound_dev_if) {
                        if (sk->sk_bound_dev_if != dif)
-diff -NurpP --minimal linux-3.0.1/net/ipv6/ip6_output.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/ip6_output.c
---- linux-3.0.1/net/ipv6/ip6_output.c  2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/ip6_output.c     2011-06-16 14:16:51.000000000 +0200
-@@ -933,7 +933,8 @@ static int ip6_dst_lookup_tail(struct so
+diff -NurpP --minimal linux-3.0.3/net/ipv6/ip6_output.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/ip6_output.c
+--- linux-3.0.3/net/ipv6/ip6_output.c  2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/ip6_output.c    2011-08-29 03:45:10.000000000 +0200
+@@ -962,7 +962,8 @@ static int ip6_dst_lookup_tail(struct so
                struct rt6_info *rt = (struct rt6_info *) *dst;
                err = ip6_route_get_saddr(net, rt, &fl6->daddr,
                                          sk ? inet6_sk(sk)->srcprefs : 0,
@@ -27623,9 +27627,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/ip6_output.c linux-3.0.1-vs2.3.1-pre9
                if (err)
                        goto out_err_release;
        }
-diff -NurpP --minimal linux-3.0.1/net/ipv6/ndisc.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/ndisc.c
---- linux-3.0.1/net/ipv6/ndisc.c       2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/ndisc.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/ndisc.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/ndisc.c
+--- linux-3.0.3/net/ipv6/ndisc.c       2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/ndisc.c 2011-06-10 22:11:24.000000000 +0200
 @@ -597,7 +597,7 @@ static void ndisc_send_na(struct net_dev
        } else {
                if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
@@ -27635,9 +27639,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/ndisc.c linux-3.0.1-vs2.3.1-pre9/net/
                        return;
                src_addr = &tmpaddr;
        }
-diff -NurpP --minimal linux-3.0.1/net/ipv6/raw.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/raw.c
---- linux-3.0.1/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/raw.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/raw.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/raw.c
+--- linux-3.0.3/net/ipv6/raw.c 2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/raw.c   2011-06-10 22:11:24.000000000 +0200
 @@ -30,6 +30,7 @@
  #include <linux/icmpv6.h>
  #include <linux/netfilter.h>
@@ -27660,9 +27664,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/raw.c linux-3.0.1-vs2.3.1-pre9/net/ip
                /* ipv4 addr of the socket is invalid.  Only the
                 * unspecified and mapped address have a v4 equivalent.
                 */
-diff -NurpP --minimal linux-3.0.1/net/ipv6/route.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/route.c
---- linux-3.0.1/net/ipv6/route.c       2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/route.c  2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/route.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/route.c
+--- linux-3.0.3/net/ipv6/route.c       2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/route.c 2011-07-19 00:44:39.000000000 +0200
 @@ -54,6 +54,7 @@
  #include <net/xfrm.h>
  #include <net/netevent.h>
@@ -27702,10 +27706,10 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/route.c linux-3.0.1-vs2.3.1-pre9/net/
                        NLA_PUT(skb, RTA_PREFSRC, 16, &saddr_buf);
        }
  
-diff -NurpP --minimal linux-3.0.1/net/ipv6/tcp_ipv6.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/tcp_ipv6.c
---- linux-3.0.1/net/ipv6/tcp_ipv6.c    2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/tcp_ipv6.c       2011-06-22 12:39:16.000000000 +0200
-@@ -69,6 +69,7 @@
+diff -NurpP --minimal linux-3.0.3/net/ipv6/tcp_ipv6.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/tcp_ipv6.c
+--- linux-3.0.3/net/ipv6/tcp_ipv6.c    2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/tcp_ipv6.c      2011-08-29 03:45:10.000000000 +0200
+@@ -70,6 +70,7 @@
  
  #include <linux/crypto.h>
  #include <linux/scatterlist.h>
@@ -27713,7 +27717,7 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/tcp_ipv6.c linux-3.0.1-vs2.3.1-pre9/n
  
  static void   tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb);
  static void   tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb,
-@@ -161,8 +162,15 @@ static int tcp_v6_connect(struct sock *s
+@@ -162,8 +163,15 @@ static int tcp_v6_connect(struct sock *s
         *      connect() to INADDR_ANY means loopback (BSD'ism).
         */
  
@@ -27731,9 +27735,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/tcp_ipv6.c linux-3.0.1-vs2.3.1-pre9/n
  
        addr_type = ipv6_addr_type(&usin->sin6_addr);
  
-diff -NurpP --minimal linux-3.0.1/net/ipv6/udp.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/udp.c
---- linux-3.0.1/net/ipv6/udp.c 2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/udp.c    2011-07-19 00:44:39.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/udp.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/udp.c
+--- linux-3.0.3/net/ipv6/udp.c 2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/udp.c   2011-08-29 03:45:10.000000000 +0200
 @@ -45,41 +45,67 @@
  #include <net/tcp_states.h>
  #include <net/ip6_checksum.h>
@@ -27826,9 +27830,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/udp.c linux-3.0.1-vs2.3.1-pre9/net/ip
                }
                if (!ipv6_addr_any(&np->daddr)) {
                        if (!ipv6_addr_equal(&np->daddr, saddr))
-diff -NurpP --minimal linux-3.0.1/net/ipv6/xfrm6_policy.c linux-3.0.1-vs2.3.1-pre9/net/ipv6/xfrm6_policy.c
---- linux-3.0.1/net/ipv6/xfrm6_policy.c        2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/ipv6/xfrm6_policy.c   2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/ipv6/xfrm6_policy.c linux-3.0.3-vs2.3.1-pre10/net/ipv6/xfrm6_policy.c
+--- linux-3.0.3/net/ipv6/xfrm6_policy.c        2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/ipv6/xfrm6_policy.c  2011-06-10 22:11:24.000000000 +0200
 @@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n
        dev = ip6_dst_idev(dst)->dev;
        ipv6_dev_get_saddr(dev_net(dev), dev,
@@ -27838,9 +27842,9 @@ diff -NurpP --minimal linux-3.0.1/net/ipv6/xfrm6_policy.c linux-3.0.1-vs2.3.1-pr
        dst_release(dst);
        return 0;
  }
-diff -NurpP --minimal linux-3.0.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.1-vs2.3.1-pre9/net/netfilter/ipvs/ip_vs_xmit.c
---- linux-3.0.1/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/netfilter/ipvs/ip_vs_xmit.c   2011-07-22 15:27:52.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.3-vs2.3.1-pre10/net/netfilter/ipvs/ip_vs_xmit.c
+--- linux-3.0.3/net/netfilter/ipvs/ip_vs_xmit.c        2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/netfilter/ipvs/ip_vs_xmit.c  2011-07-22 15:27:52.000000000 +0200
 @@ -226,7 +226,7 @@ __ip_vs_route_output_v6(struct net *net,
                return dst;
        if (ipv6_addr_any(&fl6.saddr) &&
@@ -27850,9 +27854,9 @@ diff -NurpP --minimal linux-3.0.1/net/netfilter/ipvs/ip_vs_xmit.c linux-3.0.1-vs
                goto out_err;
        if (do_xfrm) {
                dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0);
-diff -NurpP --minimal linux-3.0.1/net/netlink/af_netlink.c linux-3.0.1-vs2.3.1-pre9/net/netlink/af_netlink.c
---- linux-3.0.1/net/netlink/af_netlink.c       2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/netlink/af_netlink.c  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/netlink/af_netlink.c linux-3.0.3-vs2.3.1-pre10/net/netlink/af_netlink.c
+--- linux-3.0.3/net/netlink/af_netlink.c       2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/netlink/af_netlink.c 2011-06-10 22:11:24.000000000 +0200
 @@ -55,6 +55,9 @@
  #include <linux/types.h>
  #include <linux/audit.h>
@@ -27892,9 +27896,9 @@ diff -NurpP --minimal linux-3.0.1/net/netlink/af_netlink.c linux-3.0.1-vs2.3.1-p
                                s = sk_next(s);
                        if (s) {
                                iter->link = i;
-diff -NurpP --minimal linux-3.0.1/net/socket.c linux-3.0.1-vs2.3.1-pre9/net/socket.c
---- linux-3.0.1/net/socket.c   2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/socket.c      2011-08-01 18:47:51.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/socket.c linux-3.0.3-vs2.3.1-pre10/net/socket.c
+--- linux-3.0.3/net/socket.c   2011-08-29 03:10:26.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/socket.c     2011-08-29 03:45:10.000000000 +0200
 @@ -98,6 +98,10 @@
  
  #include <net/sock.h>
@@ -28001,9 +28005,9 @@ diff -NurpP --minimal linux-3.0.1/net/socket.c linux-3.0.1-vs2.3.1-pre9/net/sock
  
        err = sock1->ops->socketpair(sock1, sock2);
        if (err < 0)
-diff -NurpP --minimal linux-3.0.1/net/sunrpc/auth.c linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth.c
---- linux-3.0.1/net/sunrpc/auth.c      2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth.c 2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/sunrpc/auth.c linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth.c
+--- linux-3.0.3/net/sunrpc/auth.c      2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth.c        2011-06-10 22:11:24.000000000 +0200
 @@ -14,6 +14,7 @@
  #include <linux/hash.h>
  #include <linux/sunrpc/clnt.h>
@@ -28028,9 +28032,9 @@ diff -NurpP --minimal linux-3.0.1/net/sunrpc/auth.c linux-3.0.1-vs2.3.1-pre9/net
        };
  
        dprintk("RPC: %5u looking up %s cred\n",
-diff -NurpP --minimal linux-3.0.1/net/sunrpc/auth_unix.c linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth_unix.c
---- linux-3.0.1/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/sunrpc/auth_unix.c    2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/sunrpc/auth_unix.c linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth_unix.c
+--- linux-3.0.3/net/sunrpc/auth_unix.c 2010-10-21 13:08:01.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/sunrpc/auth_unix.c   2011-06-10 22:11:24.000000000 +0200
 @@ -12,12 +12,14 @@
  #include <linux/module.h>
  #include <linux/sunrpc/clnt.h>
@@ -28089,9 +28093,9 @@ diff -NurpP --minimal linux-3.0.1/net/sunrpc/auth_unix.c linux-3.0.1-vs2.3.1-pre
        hold = p++;
        for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++)
                *p++ = htonl((u32) cred->uc_gids[i]);
-diff -NurpP --minimal linux-3.0.1/net/sunrpc/clnt.c linux-3.0.1-vs2.3.1-pre9/net/sunrpc/clnt.c
---- linux-3.0.1/net/sunrpc/clnt.c      2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/sunrpc/clnt.c 2011-07-01 11:35:35.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/sunrpc/clnt.c linux-3.0.3-vs2.3.1-pre10/net/sunrpc/clnt.c
+--- linux-3.0.3/net/sunrpc/clnt.c      2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/sunrpc/clnt.c        2011-07-01 11:35:35.000000000 +0200
 @@ -31,6 +31,7 @@
  #include <linux/in.h>
  #include <linux/in6.h>
@@ -28110,9 +28114,9 @@ diff -NurpP --minimal linux-3.0.1/net/sunrpc/clnt.c linux-3.0.1-vs2.3.1-pre9/net
        return clnt;
  }
  EXPORT_SYMBOL_GPL(rpc_create);
-diff -NurpP --minimal linux-3.0.1/net/unix/af_unix.c linux-3.0.1-vs2.3.1-pre9/net/unix/af_unix.c
---- linux-3.0.1/net/unix/af_unix.c     2011-07-22 11:18:13.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/net/unix/af_unix.c        2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/net/unix/af_unix.c linux-3.0.3-vs2.3.1-pre10/net/unix/af_unix.c
+--- linux-3.0.3/net/unix/af_unix.c     2011-07-22 11:18:13.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/net/unix/af_unix.c       2011-06-10 22:11:24.000000000 +0200
 @@ -114,6 +114,8 @@
  #include <linux/mount.h>
  #include <net/checksum.h>
@@ -28150,9 +28154,9 @@ diff -NurpP --minimal linux-3.0.1/net/unix/af_unix.c linux-3.0.1-vs2.3.1-pre9/ne
                sk = next_unix_socket(&iter->i, sk);
        return sk;
  }
-diff -NurpP --minimal linux-3.0.1/scripts/checksyscalls.sh linux-3.0.1-vs2.3.1-pre9/scripts/checksyscalls.sh
---- linux-3.0.1/scripts/checksyscalls.sh       2011-03-15 18:07:46.000000000 +0100
-+++ linux-3.0.1-vs2.3.1-pre9/scripts/checksyscalls.sh  2011-06-10 22:11:24.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/scripts/checksyscalls.sh linux-3.0.3-vs2.3.1-pre10/scripts/checksyscalls.sh
+--- linux-3.0.3/scripts/checksyscalls.sh       2011-03-15 18:07:46.000000000 +0100
++++ linux-3.0.3-vs2.3.1-pre10/scripts/checksyscalls.sh 2011-06-10 22:11:24.000000000 +0200
 @@ -193,7 +193,6 @@ cat << EOF
  #define __IGNORE_afs_syscall
  #define __IGNORE_getpmsg
@@ -28161,17 +28165,9 @@ diff -NurpP --minimal linux-3.0.1/scripts/checksyscalls.sh linux-3.0.1-vs2.3.1-p
  EOF
  }
  
-diff -NurpP --minimal linux-3.0.1/security/commoncap.c linux-3.0.1-vs2.3.1-pre9/security/commoncap.c
---- linux-3.0.1/security/commoncap.c   2011-07-22 11:18:14.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/security/commoncap.c      2011-06-16 14:16:51.000000000 +0200
-@@ -62,6 +62,7 @@ int cap_netlink_recv(struct sk_buff *skb
-               return -EPERM;
-       return 0;
- }
-+
- EXPORT_SYMBOL(cap_netlink_recv);
- 
- /**
+diff -NurpP --minimal linux-3.0.3/security/commoncap.c linux-3.0.3-vs2.3.1-pre10/security/commoncap.c
+--- linux-3.0.3/security/commoncap.c   2011-07-22 11:18:14.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/security/commoncap.c     2011-06-16 14:16:51.000000000 +0200
 @@ -83,14 +84,20 @@ EXPORT_SYMBOL(cap_netlink_recv);
  int cap_capable(struct task_struct *tsk, const struct cred *cred,
                struct user_namespace *targ_ns, int cap, int audit)
@@ -28213,9 +28209,9 @@ diff -NurpP --minimal linux-3.0.1/security/commoncap.c linux-3.0.1-vs2.3.1-pre9/
                return -EPERM;
        return 0;
  }
-diff -NurpP --minimal linux-3.0.1/security/selinux/hooks.c linux-3.0.1-vs2.3.1-pre9/security/selinux/hooks.c
---- linux-3.0.1/security/selinux/hooks.c       2011-07-22 11:18:14.000000000 +0200
-+++ linux-3.0.1-vs2.3.1-pre9/security/selinux/hooks.c  2011-06-15 02:40:14.000000000 +0200
+diff -NurpP --minimal linux-3.0.3/security/selinux/hooks.c linux-3.0.3-vs2.3.1-pre10/security/selinux/hooks.c
+--- linux-3.0.3/security/selinux/hooks.c       2011-07-22 11:18:14.000000000 +0200
++++ linux-3.0.3-vs2.3.1-pre10/security/selinux/hooks.c 2011-06-15 02:40:14.000000000 +0200
 @@ -67,7 +67,6 @@
  #include <linux/dccp.h>
  #include <linux/quota.h>

diff --git a/kernel.spec b/kernel.spec
index 0f19e7b000403a0e634d9d1fa6d7a68773f19fdf..a38f025f0914290da9af028fd96a3136b9b98057 100644 (file)
--- a/kernel.spec
+++ b/kernel.spec
@@ -240,7 +240,7 @@ Patch70:    kernel-tuxonice-headers.patch
 # http://patches.aircrack-ng.org/hostap-kernel-2.6.18.patch
 Patch85:       kernel-hostap.patch
 
-# http://vserver.13thfloor.at/Experimental/patch-3.0.1-vs2.3.1-pre9.diff
+# http://vserver.13thfloor.at/Experimental/patch-3.0.3-vs2.3.1-pre10.diff
 Patch100:      kernel-vserver-2.3.patch
 Patch101:      kernel-vserver-fixes.patch
 
@@ -285,7 +285,7 @@ Patch5000:  kernel-apparmor.patch
 # based on ftp://ftp.leg.uct.ac.za/pub/linux/rip/tmpfs_root-2.6.30.diff.gz
 Patch7000:     kernel-inittmpfs.patch
 
-# based on http://grsecurity.net/~spender/grsecurity-2.2.2-3.0.3-201108241901.patch
+# based on http://grsecurity.net/~spender/grsecurity-2.2.2-3.0.4-201108300001.patch
 # NOTE: put raw upstream patches on kernel-grsec_full.patch:GRSECURITY_RAW for reference
 #       (since upstream deletes older patches)
 Patch9999:     kernel-grsec_full.patch