Wed Feb 20 15:35:39 UTC 2008

Author: markmc

Update of /cvs/pkgs/rpms/kernel-xen-2.6/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15663

Modified Files:
      Tag: private-markmc-pv-ops-branch
	kernel.spec 
	linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch 
	linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch 
	linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch 
	linux-2.6-0004-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch 
	linux-2.6-0005-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch 
	linux-2.6-0006-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch 
	linux-2.6-0007-xen-acpi-Enable-early-access-to-ACPI-tables.patch 
	linux-2.6-0008-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch 
	linux-2.6-0009-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch 
	linux-2.6-0010-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch 
	linux-2.6-0011-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch 
	linux-2.6-0012-xen-mtrr-set-cpu-in-cpu_callout_map.patch 
	linux-2.6-0013-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch 
	linux-2.6-0014-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch 
	linux-2.6-0015-xen-mtrr-Kill-some-unneccessary-includes.patch 
	linux-2.6-0016-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch 
	linux-2.6-0017-xen-mtrr-Use-generic_validate_add_page.patch 
	linux-2.6-0018-xen-mtrr-Implement-xen_get_free_region.patch 
	linux-2.6-0019-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch 
	linux-2.6-0020-irq2.diff-from-Juan-Quintela.patch 
	linux-2.6-0021-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch 
	linux-2.6-0022-xen-debug-Diagnose-bind_virq_to_irq-errors.patch 
	linux-2.6-0023-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch 
	linux-2.6-0024-xen-debug-Move-init_apic_mappings-after-trap-init.patch 
	linux-2.6-0025-xen-debug-Trace-progress-in-trap_init-around-init.patch 
	linux-2.6-0026-xen-apic-Disable-init_apic_mappings-when-under-CO.patch 
	linux-2.6-0027-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch 
	linux-2.6-0028-xen-debug-Log-bind_virq_to_irq-events.patch 
	linux-2.6-0029-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch 
	linux-2.6-0030-Remove-duplicated-dma_alloc-free_noncoherent-define.patch 
	linux-2.6-0031-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch 
	linux-2.6-0032-xen-dom0-add-virt_to_pfn-macro.patch 
	linux-2.6-0033-xen-dom0-use-virt_to_pfn-where-appropriate.patch 
	linux-2.6-0034-xen-dom0-Add-contiguous-region-support.patch 
	linux-2.6-0035-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch 
	linux-2.6-0036-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch 
	linux-2.6-0037-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch 
	linux-2.6-0038-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch 
	linux-2.6-0039-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch 
	linux-2.6-0040-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch 
	linux-2.6-0041-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch 
	linux-2.6-0042-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch 
	linux-2.6-0043-xen-dma-Add-xen_alloc-free_coherent.patch 
	linux-2.6-0044-xen-dma-Don-t-merge-bios-on-xen-pvops.patch 
	linux-2.6-0045-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch 
	linux-2.6-0046-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch 
	linux-2.6-0047-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch 
	linux-2.6-0048-xen-dom0-Reserve-ISA-address-space-earlier.patch 
	linux-2.6-0049-xen-Add-empty-xenctrl-module.patch 
	linux-2.6-0050-xen-dom0-Add-proc-xen-capabilities.patch 
	linux-2.6-0051-xen-Add-proc-xen-privcmd.patch 
	linux-2.6-0052-xen-dom0-Add-proc-xen-xsd_-port-kva.patch 
	linux-2.6-0053-xen-Add-proc-xen-xenbus.patch 
	linux-2.6-0054-xen-Add-dev-xen-evtchn.patch 
	linux-2.6-0055-xen-Add-__init-__exit-notations-to-xenctrl-function.patch 
	linux-2.6-0056-xen-Add-Xen-s-sys-hypervisor-interface.patch 
	linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch 
	linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch 
	linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch 
	linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch 
Added Files:
      Tag: private-markmc-pv-ops-branch
	linux-2.6-revert-execshield.patch 
Log Message:
* Wed Feb 20 2008 Mark McLoughlin <markmc at redhat.com>
- Revert the execshield patch for now
- Add a couple of contiguous region fixes


linux-2.6-revert-execshield.patch:

--- NEW FILE linux-2.6-revert-execshield.patch ---
>From 938ed1c956b85a073c1679f079d89afbc336dfe5 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc at redhat.com>
Date: Wed, 20 Feb 2008 15:15:21 +0000
Subject: [PATCH] Revert linux-2.6-execshield.patch from kernel-2_6_24-23_fc9

Signed-off-by: Mark McLoughlin <markmc at redhat.com>
---
 arch/ia64/ia32/binfmt_elf32.c  |    2 +-
 arch/x86/ia32/ia32_binfmt.c    |    4 +
 arch/x86/kernel/cpu/common.c   |    7 --
 arch/x86/kernel/process_32.c   |   60 +-----------------
 arch/x86/kernel/process_64.c   |    6 ++
 arch/x86/kernel/setup64.c      |   40 +++++++++++
 arch/x86/kernel/smp_32.c       |    3 -
 arch/x86/kernel/sysenter_32.c  |    3 +-
 arch/x86/kernel/traps_32.c     |  106 +-----------------------------
 arch/x86/mm/fault_64.c         |    2 +-
 arch/x86/mm/init_32.c          |    7 +--
 arch/x86/mm/mmap_32.c          |    6 +-
 arch/x86/mm/mmap_64.c          |   97 ++++++----------------------
 arch/x86/mm/pageattr_32.c      |    9 ---
 drivers/char/random.c          |    8 +--
 fs/binfmt_elf.c                |  141 ++++++++--------------------------------
 fs/proc/array.c                |    8 +--
 fs/proc/base.c                 |    8 +-
 fs/proc/task_mmu.c             |   29 +-------
 include/asm-ia64/pgalloc.h     |    4 -
 include/asm-powerpc/pgalloc.h  |    5 --
 include/asm-ppc/pgalloc.h      |    5 --
 include/asm-s390/pgalloc.h     |    4 -
 include/asm-sparc/pgalloc.h    |    4 -
 include/asm-sparc64/pgalloc.h  |    4 -
 include/asm-x86/a.out.h        |    2 +-
 include/asm-x86/desc_32.h      |   14 ----
 include/asm-x86/elf.h          |    5 --
 include/asm-x86/mmu.h          |    6 --
 include/asm-x86/pgalloc_64.h   |    7 --
 include/asm-x86/processor_32.h |    8 +--
 include/linux/mm.h             |    8 +--
 include/linux/mm_types.h       |    3 -
 include/linux/resource.h       |    5 +-
 include/linux/sched.h          |    7 --
 kernel/sysctl.c                |   28 --------
 mm/mmap.c                      |  108 ++----------------------------
 mm/mprotect.c                  |    9 +--
 mm/mremap.c                    |    4 +-
 39 files changed, 131 insertions(+), 655 deletions(-)

diff --git a/arch/ia64/ia32/binfmt_elf32.c b/arch/ia64/ia32/binfmt_elf32.c
index b217c7d..3e35987 100644
--- a/arch/ia64/ia32/binfmt_elf32.c
+++ b/arch/ia64/ia32/binfmt_elf32.c
@@ -222,7 +222,7 @@ elf32_set_personality (void)
 }
 
 static unsigned long
-elf32_map(struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type, unsigned long unused)
+elf32_map (struct file *filep, unsigned long addr, struct elf_phdr *eppnt, int prot, int type)
 {
 	unsigned long pgoff = (eppnt->p_vaddr) & ~IA32_PAGE_MASK;
 
diff --git a/arch/x86/ia32/ia32_binfmt.c b/arch/x86/ia32/ia32_binfmt.c
index 35921d6..55822d2 100644
--- a/arch/x86/ia32/ia32_binfmt.c
+++ b/arch/x86/ia32/ia32_binfmt.c
@@ -167,6 +167,8 @@ elf32_core_copy_task_xfpregs(struct task_struct *t, elf_fpxregset_t *xfpu)
 #define elf_check_arch(x) \
 	((x)->e_machine == EM_386)
 
+extern int force_personality32;
+
 #undef	ELF_EXEC_PAGESIZE
 #undef	ELF_HWCAP
 #undef	ELF_PLATFORM
@@ -184,6 +186,8 @@ do {							\
 		set_thread_flag(TIF_ABI_PENDING);		\
 	else							\
 		clear_thread_flag(TIF_ABI_PENDING);		\
+	/* XXX This overwrites the user set personality */	\
+	current->personality |= force_personality32;		\
 } while (0)
 
 /* Override some function names */
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index d0c0143..e2fcf20 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -470,13 +470,6 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
 	if (disable_pse)
 		clear_bit(X86_FEATURE_PSE, c->x86_capability);
 
-	if (exec_shield != 0) {
-#ifdef CONFIG_X86_PAE
-		if (!test_bit(X86_FEATURE_NX, c->x86_capability))
-#endif
-		clear_bit(X86_FEATURE_SEP, c->x86_capability);
-	}
-
 	/* If the model name is still unset, do table lookup. */
 	if ( !c->x86_model_id[0] ) {
 		char *p;
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index f653d51..1eabfa7 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -701,8 +701,7 @@ struct task_struct fastcall * __switch_to(struct task_struct *prev_p, struct tas
 	/* never put a printk in __switch_to... printk() calls wake_up*() indirectly */
 
 	__unlazy_fpu(prev_p);
-	if (next_p->mm)
-		load_user_cs_desc(cpu, next_p->mm);
+
 
 	/* we're going to use this soon, after a few expensive things */
 	if (next_p->fpu_counter > 5)
@@ -980,60 +979,3 @@ unsigned long arch_align_stack(unsigned long sp)
 		sp -= get_random_int() % 8192;
 	return sp & ~0xf;
 }
-
-void arch_add_exec_range(struct mm_struct *mm, unsigned long limit)
-{
-	if (limit > mm->context.exec_limit) {
-		mm->context.exec_limit = limit;
-		set_user_cs(&mm->context.user_cs, limit);
-		if (mm == current->mm) {
-			preempt_disable();
-			load_user_cs_desc(smp_processor_id(), mm);
-			preempt_enable();
-		}
-	}
-}
-
-void arch_remove_exec_range(struct mm_struct *mm, unsigned long old_end)
-{
-	struct vm_area_struct *vma;
-	unsigned long limit = PAGE_SIZE;
-
-	if (old_end == mm->context.exec_limit) {
-		for (vma = mm->mmap; vma; vma = vma->vm_next)
-			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
-				limit = vma->vm_end;
-
-		mm->context.exec_limit = limit;
-		set_user_cs(&mm->context.user_cs, limit);
-		if (mm == current->mm) {
-			preempt_disable();
-			load_user_cs_desc(smp_processor_id(), mm);
-			preempt_enable();
-		}
-	}
-}
-
-void arch_flush_exec_range(struct mm_struct *mm)
-{
-	mm->context.exec_limit = 0;
-	set_user_cs(&mm->context.user_cs, 0);
-}
-
-/*
- * Generate random brk address between 128MB and 196MB. (if the layout
- * allows it.)
- */
-void randomize_brk(unsigned long old_brk)
-{
-	unsigned long new_brk, range_start, range_end;
-
-	range_start = 0x08000000;
-	if (current->mm->brk >= range_start)
-		range_start = current->mm->brk;
-	range_end = range_start + 0x02000000;
-	new_brk = randomize_range(range_start, range_end, 0);
-	if (new_brk)
-		current->mm->brk = new_brk;
-}
-
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index b8a8fa9..f541e58 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -722,6 +722,12 @@ void set_personality_64bit(void)
 
 	/* Make sure to be in 64bit mode */
 	clear_thread_flag(TIF_IA32); 
+
+	/* TBD: overwrites user setup. Should have two bits.
+	   But 64bit processes have always behaved this way,
+	   so it's not too bad. The main problem is just that
+   	   32bit childs are affected again. */
+	current->personality &= ~READ_IMPLIES_EXEC;
 }
 
 asmlinkage long sys_fork(struct pt_regs *regs)
diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c
index 04ddd21..3558ac7 100644
--- a/arch/x86/kernel/setup64.c
+++ b/arch/x86/kernel/setup64.c
@@ -39,6 +39,46 @@ char boot_cpu_stack[IRQSTACKSIZE] __attribute__((section(".bss.page_aligned")));
 unsigned long __supported_pte_mask __read_mostly = ~0UL;
 static int do_not_nx __cpuinitdata = 0;
 
+/* noexec=on|off
+Control non executable mappings for 64bit processes.
+
+on	Enable(default)
+off	Disable
+*/ 
+static int __init nonx_setup(char *str)
+{
+	if (!str)
+		return -EINVAL;
+	if (!strncmp(str, "on", 2)) {
+                __supported_pte_mask |= _PAGE_NX; 
+ 		do_not_nx = 0; 
+	} else if (!strncmp(str, "off", 3)) {
+		do_not_nx = 1;
+		__supported_pte_mask &= ~_PAGE_NX;
+        }
+	return 0;
+} 
+early_param("noexec", nonx_setup);
+
+int force_personality32 = 0; 
+
+/* noexec32=on|off
+Control non executable heap for 32bit processes.
+To control the stack too use noexec=off
+
+on	PROT_READ does not imply PROT_EXEC for 32bit processes
+off	PROT_READ implies PROT_EXEC (default)
+*/
+static int __init nonx32_setup(char *str)
+{
+	if (!strcmp(str, "on"))
+		force_personality32 &= ~READ_IMPLIES_EXEC;
+	else if (!strcmp(str, "off"))
+		force_personality32 |= READ_IMPLIES_EXEC;
+	return 1;
+}
+__setup("noexec32=", nonx32_setup);
+
 /*
  * Great future plan:
  * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data.
diff --git a/arch/x86/kernel/smp_32.c b/arch/x86/kernel/smp_32.c
index cc70d74..fcaa026 100644
--- a/arch/x86/kernel/smp_32.c
+++ b/arch/x86/kernel/smp_32.c
@@ -22,7 +22,6 @@
 
 #include <asm/mtrr.h>
 #include <asm/tlbflush.h>
-#include <asm/desc.h>
 #include <asm/mmu_context.h>
 #include <mach_apic.h>
 
@@ -316,8 +315,6 @@ fastcall void smp_invalidate_interrupt(struct pt_regs *regs)
 	unsigned long cpu;
 
 	cpu = get_cpu();
-	if (current->active_mm)
-		load_user_cs_desc(cpu, current->active_mm);
 
 	if (!cpu_isset(cpu, flush_cpumask))
 		goto out;
diff --git a/arch/x86/kernel/sysenter_32.c b/arch/x86/kernel/sysenter_32.c
index 7f4dde2..5a2d951 100644
--- a/arch/x86/kernel/sysenter_32.c
+++ b/arch/x86/kernel/sysenter_32.c
@@ -14,7 +14,6 @@
 #include <linux/string.h>
 #include <linux/elf.h>
 #include <linux/mm.h>
-#include <linux/mman.h>
 #include <linux/err.h>
 #include <linux/module.h>
 
@@ -282,7 +281,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int exstack)
 	if (compat)
 		addr = VDSO_HIGH_BASE;
 	else {
-		addr = get_unmapped_area_prot(NULL, 0, PAGE_SIZE, 0, 0, 1);
+		addr = get_unmapped_area(NULL, 0, PAGE_SIZE, 0, 0);
 		if (IS_ERR_VALUE(addr)) {
 			ret = addr;
 			goto up_fail;
diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
index 3b0ac7e..02d1e1e 100644
--- a/arch/x86/kernel/traps_32.c
+++ b/arch/x86/kernel/traps_32.c
@@ -560,91 +560,7 @@ DO_ERROR(10, SIGSEGV, "invalid TSS", invalid_TSS)
 DO_ERROR(11, SIGBUS,  "segment not present", segment_not_present)
 DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
 DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0, 0)
-
-/*
- * lazy-check for CS validity on exec-shield binaries:
- *
- * the original non-exec stack patch was written by
- * Solar Designer <solar at openwall.com>. Thanks!
- */
-static int
-check_lazy_exec_limit(int cpu, struct pt_regs *regs, long error_code)
-{
-	struct desc_struct *desc1, *desc2;
-	struct vm_area_struct *vma;
-	unsigned long limit;
-
-	if (current->mm == NULL)
-		return 0;
-
-	limit = -1UL;
-	if (current->mm->context.exec_limit != -1UL) {
-		limit = PAGE_SIZE;
-		spin_lock(&current->mm->page_table_lock);
-		for (vma = current->mm->mmap; vma; vma = vma->vm_next)
-			if ((vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
-				limit = vma->vm_end;
-		vma = get_gate_vma(current);
-		if (vma && (vma->vm_flags & VM_EXEC) && (vma->vm_end > limit))
-			limit = vma->vm_end;
-		spin_unlock(&current->mm->page_table_lock);
-		if (limit >= TASK_SIZE)
-			limit = -1UL;
-		current->mm->context.exec_limit = limit;
-	}
-	set_user_cs(&current->mm->context.user_cs, limit);
-
-	desc1 = &current->mm->context.user_cs;
-	desc2 = get_cpu_gdt_table(cpu) + GDT_ENTRY_DEFAULT_USER_CS;
-
-	if (desc1->a != desc2->a || desc1->b != desc2->b) {
-		/*
-		 * The CS was not in sync - reload it and retry the
-		 * instruction. If the instruction still faults then
-		 * we won't hit this branch next time around.
-		 */
-		if (print_fatal_signals >= 2) {
-			printk(KERN_ERR "#GPF fixup (%ld[seg:%lx]) at %08lx, CPU#%d.\n",
-				error_code, error_code/8, regs->eip, smp_processor_id());
-			printk(KERN_ERR "exec_limit: %08lx, user_cs: %08lx/%08lx, CPU_cs: %08lx/%08lx.\n",
-				current->mm->context.exec_limit, desc1->a, desc1->b, desc2->a, desc2->b);
-		}
-		load_user_cs_desc(cpu, current->mm);
-		return 1;
-	}
-
-	return 0;
-}
-
-/*
- * The fixup code for errors in iret jumps to here (iret_exc).  It loses
- * the original trap number and error code.  The bogus trap 32 and error
- * code 0 are what the vanilla kernel delivers via:
- * DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
- *
- * NOTE: Because of the final "1" in the macro we need to enable interrupts.
- *
- * In case of a general protection fault in the iret instruction, we
- * need to check for a lazy CS update for exec-shield.
- */
-fastcall void do_iret_error(struct pt_regs *regs, long error_code)
-{
-	int ok;
-	local_irq_enable();
-	ok = check_lazy_exec_limit(get_cpu(), regs, error_code);
-	put_cpu();
-	if (!ok && notify_die(DIE_TRAP, "iret exception", regs,
-	    error_code, 32, SIGSEGV) != NOTIFY_STOP) {
-		siginfo_t info;
-		info.si_signo = SIGSEGV;
-		info.si_errno = 0;
-		info.si_code = ILL_BADSTK;
-		info.si_addr = 0;
-		do_trap(32, SIGSEGV, "iret exception", 0, regs, error_code,
-			&info);
-	}
-}
-
+DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0, 1)
 
 fastcall void __kprobes do_general_protection(struct pt_regs * regs,
 					      long error_code)
@@ -652,7 +568,6 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs,
 	int cpu = get_cpu();
 	struct tss_struct *tss = &per_cpu(init_tss, cpu);
 	struct thread_struct *thread = &current->thread;
-	int ok;
 
 	/*
 	 * Perform the lazy TSS's I/O bitmap copy. If the TSS has an
@@ -679,6 +594,7 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs,
 		put_cpu();
 		return;
 	}
+	put_cpu();
 
 	if (regs->eflags & VM_MASK)
 		goto gp_in_vm86;
@@ -686,22 +602,6 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs,
 	if (!user_mode(regs))
 		goto gp_in_kernel;
 
-	ok = check_lazy_exec_limit(cpu, regs, error_code);
-
-	put_cpu();
-
-	if (ok)
-		return;
-
-	if (print_fatal_signals) {
-		printk(KERN_ERR "#GPF(%ld[seg:%lx]) at %08lx, CPU#%d.\n", error_code,
-			error_code/8, regs->eip, smp_processor_id());
-		printk(KERN_ERR "exec_limit: %08lx, user_cs: %08lx/%08lx.\n",
-			current->mm->context.exec_limit,
-			current->mm->context.user_cs.a,
-			current->mm->context.user_cs.b);
-	}
-
 	current->thread.error_code = error_code;
 	current->thread.trap_no = 13;
 	if (show_unhandled_signals && unhandled_signal(current, SIGSEGV) &&
@@ -715,13 +615,11 @@ fastcall void __kprobes do_general_protection(struct pt_regs * regs,
 	return;
 
 gp_in_vm86:
-	put_cpu();
 	local_irq_enable();
 	handle_vm86_fault((struct kernel_vm86_regs *) regs, error_code);
 	return;
 
 gp_in_kernel:
-	put_cpu();
 	if (!fixup_exception(regs)) {
 		current->thread.error_code = error_code;
 		current->thread.trap_no = 13;
diff --git a/arch/x86/mm/fault_64.c b/arch/x86/mm/fault_64.c
index 0c3876c..f114411 100644
--- a/arch/x86/mm/fault_64.c
+++ b/arch/x86/mm/fault_64.c
@@ -81,7 +81,7 @@ static noinline int is_prefetch(struct pt_regs *regs, unsigned long addr,
 	instr = (unsigned char __user *)convert_rip_to_linear(current, regs);
 	max_instr = instr + 15;
 
-	if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE64)
+	if (user_mode(regs) && instr >= (unsigned char *)TASK_SIZE)
 		return 0;
 
 	while (scan_more && instr < max_instr) { 
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
index 7287ae4..4e8851a 100644
--- a/arch/x86/mm/init_32.c
+++ b/arch/x86/mm/init_32.c
@@ -518,7 +518,7 @@ EXPORT_SYMBOL_GPL(__supported_pte_mask);
  * Control non executable mappings.
  *
  * on      Enable
- * off     Disable (disables exec-shield too)
+ * off     Disable
  */
 static int __init noexec_setup(char *str)
 {
@@ -530,7 +530,6 @@ static int __init noexec_setup(char *str)
 	} else if (!strcmp(str,"off")) {
 		disable_nx = 1;
 		__supported_pte_mask &= ~_PAGE_NX;
-		exec_shield = 0;
 	} else
 		return -EINVAL;
 
@@ -597,11 +596,7 @@ void __init paging_init(void)
 	set_nx();
 	if (nx_enabled)
 		printk("NX (Execute Disable) protection: active\n");
-	else
 #endif
-	if (exec_shield)
-		printk(KERN_INFO "Using x86 segment limits to approximate "
-			"NX protection\n");
 
 	pagetable_init();
 
diff --git a/arch/x86/mm/mmap_32.c b/arch/x86/mm/mmap_32.c
index 0fac8d9..552e084 100644
--- a/arch/x86/mm/mmap_32.c
+++ b/arch/x86/mm/mmap_32.c
@@ -63,17 +63,15 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 	 * Fall back to the standard layout if the personality
 	 * bit is set, or if the expected stack growth is unlimited:
 	 */
-	if (!(2 & exec_shield) && (sysctl_legacy_va_layout ||
+	if (sysctl_legacy_va_layout ||
 			(current->personality & ADDR_COMPAT_LAYOUT) ||
-			current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)) {
+			current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY) {
 		mm->mmap_base = TASK_UNMAPPED_BASE;
 		mm->get_unmapped_area = arch_get_unmapped_area;
 		mm->unmap_area = arch_unmap_area;
 	} else {
 		mm->mmap_base = mmap_base(mm);
 		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
-		if (!(current->personality & READ_IMPLIES_EXEC))
-			mm->get_unmapped_exec_area = arch_get_unmapped_exec_area;
 		mm->unmap_area = arch_unmap_area_topdown;
 	}
 }
diff --git a/arch/x86/mm/mmap_64.c b/arch/x86/mm/mmap_64.c
index a4a9916..80bba0d 100644
--- a/arch/x86/mm/mmap_64.c
+++ b/arch/x86/mm/mmap_64.c
@@ -1,88 +1,29 @@
-/*
- *  linux/arch/x86-64/mm/mmap.c
- *
- *  flexible mmap layout support
- *
- * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina.
- * All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *
- * Started by Ingo Molnar <mingo at elte.hu>
+/* Copyright 2005 Andi Kleen, SuSE Labs.
+ * Licensed under GPL, v.2
  */
-
-#include <linux/personality.h>
 #include <linux/mm.h>
 #include <linux/sched.h>
 #include <linux/random.h>
+#include <asm/ia32.h>
 
-/*
- * Top of mmap area (just below the process stack).
- *
- * Leave an at least ~128 MB hole.
- */
-#define MIN_GAP (128*1024*1024)
-#define MAX_GAP (TASK_SIZE/6*5)
-
-static inline unsigned long mmap_base(void)
-{
-	unsigned long gap = current->signal->rlim[RLIMIT_STACK].rlim_cur;
-
-	if (gap < MIN_GAP)
-		gap = MIN_GAP;
-	else if (gap > MAX_GAP)
-		gap = MAX_GAP;
-
-	return TASK_SIZE - (gap & PAGE_MASK);
-}
+/* Notebook: move the mmap code from sys_x86_64.c over here. */
 
-static inline int mmap_is_legacy(void)
-{
-	/*
-	 * Force standard allocation for 64 bit programs.
-	 */
-	if (!test_thread_flag(TIF_IA32))
-		return 1;
-
-	if (current->personality & ADDR_COMPAT_LAYOUT)
-		return 1;
-
-	if (current->signal->rlim[RLIMIT_STACK].rlim_cur == RLIM_INFINITY)
-		return 1;
-
-	return sysctl_legacy_va_layout;
-}
-
-/*
- * This function, called very early during the creation of a new
- * process VM image, sets up which VM layout function to use:
- */
 void arch_pick_mmap_layout(struct mm_struct *mm)
 {
-	/*
-	 * Fall back to the standard layout if the personality
-	 * bit is set, or if the expected stack growth is unlimited:
-	 */
-	if (mmap_is_legacy()) {
-		mm->mmap_base = TASK_UNMAPPED_BASE;
-		mm->get_unmapped_area = arch_get_unmapped_area;
-		mm->unmap_area = arch_unmap_area;
-	} else {
-		mm->mmap_base = mmap_base();
-		mm->get_unmapped_area = arch_get_unmapped_area_topdown;
-		mm->unmap_area = arch_unmap_area_topdown;
+#ifdef CONFIG_IA32_EMULATION
+	if (current_thread_info()->flags & _TIF_IA32)
+		return ia32_pick_mmap_layout(mm);
+#endif
+	mm->mmap_base = TASK_UNMAPPED_BASE;
+	if (current->flags & PF_RANDOMIZE) {
+		/* Add 28bit randomness which is about 40bits of address space
+		   because mmap base has to be page aligned.
+ 		   or ~1/128 of the total user VM
+	   	   (total user address space is 47bits) */
+		unsigned rnd = get_random_int() & 0xfffffff;
+		mm->mmap_base += ((unsigned long)rnd) << PAGE_SHIFT;
 	}
+	mm->get_unmapped_area = arch_get_unmapped_area;
+	mm->unmap_area = arch_unmap_area;
 }
+
diff --git a/arch/x86/mm/pageattr_32.c b/arch/x86/mm/pageattr_32.c
index 5ae46c9..260073c 100644
--- a/arch/x86/mm/pageattr_32.c
+++ b/arch/x86/mm/pageattr_32.c
@@ -8,8 +8,6 @@
 #include <linux/highmem.h>
 #include <linux/module.h>
 #include <linux/slab.h>
-#include <linux/kernel.h>
-#include <asm/sections.h>
 #include <asm/uaccess.h>
 #include <asm/processor.h>
 #include <asm/tlbflush.h>
@@ -154,13 +152,6 @@ __change_page_attr(struct page *page, pgprot_t prot)
 	BUG_ON(PageHighMem(page));
 	address = (unsigned long)page_address(page);
 
-	if (address >= (unsigned long)__start_rodata &&
-		address <= (unsigned long)__end_rodata &&
-		(pgprot_val(prot) & _PAGE_RW)) {
-		pgprot_val(prot) &= ~(_PAGE_RW);
-		add_taint(TAINT_MACHINE_CHECK);
-	}
-
 	kpte = lookup_address(address);
 	if (!kpte)
 		return -EINVAL;
diff --git a/drivers/char/random.c b/drivers/char/random.c
index 1c0860e..5fee056 100644
--- a/drivers/char/random.c
+++ b/drivers/char/random.c
@@ -1639,19 +1639,13 @@ EXPORT_SYMBOL(secure_dccp_sequence_number);
  */
 unsigned int get_random_int(void)
 {
-	unsigned int val = 0;
-
-#ifdef CONFIG_X86_HAS_TSC
-	rdtscl(val);
-#endif
-
 	/*
 	 * Use IP's RNG. It suits our purpose perfectly: it re-keys itself
 	 * every second, from the entropy pool (and thus creates a limited
 	 * drain on it), and uses halfMD4Transform within the second. We
 	 * also mix it with jiffies and the PID:
 	 */
-	return secure_ip_id((__force __be32)(current->pid + jiffies  + (int)val));
+	return secure_ip_id((__force __be32)(current->pid + jiffies));
 }
 
 /*
diff --git a/fs/binfmt_elf.c b/fs/binfmt_elf.c
index cdc5125..161509b 100644
--- a/fs/binfmt_elf.c
+++ b/fs/binfmt_elf.c
@@ -45,7 +45,7 @@
 
 static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs);
 static int load_elf_library(struct file *);
-static unsigned long elf_map(struct file *, unsigned long, struct elf_phdr *, int, int, unsigned long);
+static unsigned long elf_map (struct file *, unsigned long, struct elf_phdr *, int, int);
 
 /*
  * If we don't support core dumping, then supply a NULL so we
@@ -80,7 +80,7 @@ static struct linux_binfmt elf_format = {
 		.hasvdso	= 1
 };
 
-#define BAD_ADDR(x) IS_ERR_VALUE(x)
+#define BAD_ADDR(x) ((unsigned long)(x) >= TASK_SIZE)
 
 static int set_brk(unsigned long start, unsigned long end)
 {
@@ -298,70 +298,33 @@ create_elf_tables(struct linux_binprm *bprm, struct elfhdr *exec,
 #ifndef elf_map
 
 static unsigned long elf_map(struct file *filep, unsigned long addr,
-		struct elf_phdr *eppnt, int prot, int type,
-		unsigned long total_size)
+		struct elf_phdr *eppnt, int prot, int type)
 {
 	unsigned long map_addr;
-	unsigned long size = eppnt->p_filesz + ELF_PAGEOFFSET(eppnt->p_vaddr);
-	unsigned long off = eppnt->p_offset - ELF_PAGEOFFSET(eppnt->p_vaddr);
-	addr = ELF_PAGESTART(addr);
-	size = ELF_PAGEALIGN(size);
+	unsigned long pageoffset = ELF_PAGEOFFSET(eppnt->p_vaddr);
 
+	down_write(&current->mm->mmap_sem);
 	/* mmap() will return -EINVAL if given a zero size, but a
 	 * segment with zero filesize is perfectly valid */
-	if (!size)
-		return addr;
-
-	down_write(&current->mm->mmap_sem);
-	/*
-	* total_size is the size of the ELF (interpreter) image.
-	* The _first_ mmap needs to know the full size, otherwise
-	* randomization might put this image into an overlapping
-	* position with the ELF binary image. (since size < total_size)
-	* So we first map the 'big' image - and unmap the remainder at
-	* the end. (which unmap is needed for ELF images with holes.)
-	*/
-	if (total_size) {
-		total_size = ELF_PAGEALIGN(total_size);
-		map_addr = do_mmap(filep, addr, total_size, prot, type, off);
-		if (!BAD_ADDR(map_addr))
-			do_munmap(current->mm, map_addr+size, total_size-size);
-	} else
-		map_addr = do_mmap(filep, addr, size, prot, type, off);
-
+	if (eppnt->p_filesz + pageoffset)
+		map_addr = do_mmap(filep, ELF_PAGESTART(addr),
+				   eppnt->p_filesz + pageoffset, prot, type,
+				   eppnt->p_offset - pageoffset);
+	else
+		map_addr = ELF_PAGESTART(addr);
 	up_write(&current->mm->mmap_sem);
 	return(map_addr);
 }
 
 #endif /* !elf_map */
 
-static unsigned long total_mapping_size(struct elf_phdr *cmds, int nr)
-{
-	int i, first_idx = -1, last_idx = -1;
-
-	for (i = 0; i < nr; i++) {
-		if (cmds[i].p_type == PT_LOAD) {
-			last_idx = i;
-			if (first_idx == -1)
-				first_idx = i;
-		}
-	}
-	if (first_idx == -1)
-		return 0;
-
-	return cmds[last_idx].p_vaddr + cmds[last_idx].p_memsz -
-				ELF_PAGESTART(cmds[first_idx].p_vaddr);
-}
-
-
 /* This is much more generalized than the library routine read function,
    so we keep this separate.  Technically the library read function
    is only provided so that we can read a.out libraries that have
    an ELF header */
 
 static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
-		struct file *interpreter, unsigned long *interp_map_addr,
-		unsigned long no_base)
+		struct file *interpreter, unsigned long *interp_load_addr)
 {
 	struct elf_phdr *elf_phdata;
 	struct elf_phdr *eppnt;
@@ -369,7 +332,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
 	int load_addr_set = 0;
 	unsigned long last_bss = 0, elf_bss = 0;
 	unsigned long error = ~0UL;
-	unsigned long total_size;
 	int retval, i, size;
 
 	/* First of all, some simple consistency checks */
@@ -408,12 +370,6 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
 		goto out_close;
 	}
 
-	total_size = total_mapping_size(elf_phdata, interp_elf_ex->e_phnum);
-	if (!total_size) {
-		error = -EINVAL;
-		goto out_close;
-	}
-
 	eppnt = elf_phdata;
 	for (i = 0; i < interp_elf_ex->e_phnum; i++, eppnt++) {
 		if (eppnt->p_type == PT_LOAD) {
@@ -431,14 +387,9 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
 			vaddr = eppnt->p_vaddr;
 			if (interp_elf_ex->e_type == ET_EXEC || load_addr_set)
 				elf_type |= MAP_FIXED;
-			else if (no_base && interp_elf_ex->e_type == ET_DYN)
-				load_addr = -vaddr;
 
 			map_addr = elf_map(interpreter, load_addr + vaddr,
-					   eppnt, elf_prot, elf_type, total_size);
-			total_size = 0;
-			if (!*interp_map_addr)
-				*interp_map_addr = map_addr;
+					   eppnt, elf_prot, elf_type);
 			error = map_addr;
 			if (BAD_ADDR(map_addr))
 				goto out_close;
@@ -504,7 +455,8 @@ static unsigned long load_elf_interp(struct elfhdr *interp_elf_ex,
 			goto out_close;
 	}
 
-	error = load_addr;
+	*interp_load_addr = load_addr;
+	error = ((unsigned long)interp_elf_ex->e_entry) + load_addr;
 
 out_close:
 	kfree(elf_phdata);
@@ -601,13 +553,12 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	int elf_exec_fileno;
 	int retval, i;
 	unsigned int size;
-	unsigned long elf_entry;
-	unsigned long interp_load_addr = 0;
+	unsigned long elf_entry, interp_load_addr = 0;
 	unsigned long start_code, end_code, start_data, end_data;
 	unsigned long reloc_func_desc = 0;
 	char passed_fileno[6];
 	struct files_struct *files;
-	int executable_stack;
+	int executable_stack = EXSTACK_DEFAULT;
 	unsigned long def_flags = 0;
 	struct {
 		struct elfhdr elf_ex;
@@ -674,8 +625,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	fd_install(elf_exec_fileno = retval, bprm->file);
 
 	elf_ppnt = elf_phdata;
-	executable_stack = EXSTACK_DEFAULT;
-
 	elf_bss = 0;
 	elf_brk = 0;
 
@@ -782,11 +731,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 			break;
 		}
 
-	if (current->personality == PER_LINUX && (exec_shield & 2)) {
-		executable_stack = EXSTACK_DISABLE_X;
-		current->flags |= PF_RANDOMIZE;
-	}
-
 	/* Some simple consistency checks for the interpreter */
 	if (elf_interpreter) {
 		static int warn;
@@ -847,15 +791,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	if (retval)
 		goto out_free_dentry;
 
-#ifdef CONFIG_X86_32
-	/*
-	 * Turn off the CS limit completely if exec-shield disabled or
-	 * NX active:
-	 */
-	if (!exec_shield || executable_stack != EXSTACK_DISABLE_X || nx_enabled)
-		arch_add_exec_range(current->mm, -1);
-#endif
-
 	/* Discard our unneeded old files struct */
 	if (files) {
 		put_files_struct(files);
@@ -869,8 +804,7 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	/* Do this immediately, since STACK_TOP as used in setup_arg_pages
 	   may depend on the personality.  */
 	SET_PERSONALITY(loc->elf_ex, ibcs2_interpreter);
-	if (!(exec_shield & 2) &&
-			elf_read_implies_exec(loc->elf_ex, executable_stack))
+	if (elf_read_implies_exec(loc->elf_ex, executable_stack))
 		current->personality |= READ_IMPLIES_EXEC;
 
 	if (!(current->personality & ADDR_NO_RANDOMIZE) && randomize_va_space)
@@ -891,7 +825,9 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	current->mm->start_stack = bprm->p;
 
 	/* Now we do a little grungy work by mmaping the ELF image into
-	   the correct location in memory. */
+	   the correct location in memory.  At this point, we assume that
+	   the image should be loaded at fixed address, not at a variable
+	   address. */
 	for(i = 0, elf_ppnt = elf_phdata;
 	    i < loc->elf_ex.e_phnum; i++, elf_ppnt++) {
 		int elf_prot = 0, elf_flags;
@@ -945,15 +881,11 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 			 * default mmap base, as well as whatever program they
 			 * might try to exec.  This is because the brk will
 			 * follow the loader, and is not movable.  */
-#ifdef CONFIG_X86
-			load_bias = 0;
-#else
 			load_bias = ELF_PAGESTART(ELF_ET_DYN_BASE - vaddr);
-#endif
 		}
 
 		error = elf_map(bprm->file, load_bias + vaddr, elf_ppnt,
-				elf_prot, elf_flags, 0);
+				elf_prot, elf_flags);
 		if (BAD_ADDR(error)) {
 			send_sig(SIGKILL, current, 0);
 			retval = IS_ERR((void *)error) ?
@@ -1029,25 +961,13 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	}
 
 	if (elf_interpreter) {
-		if (interpreter_type == INTERPRETER_AOUT) {
+		if (interpreter_type == INTERPRETER_AOUT)
 			elf_entry = load_aout_interp(&loc->interp_ex,
 						     interpreter);
-		} else {
-			unsigned long uninitialized_var(interp_map_addr);
-
+		else
 			elf_entry = load_elf_interp(&loc->interp_elf_ex,
 						    interpreter,
-						    &interp_map_addr,
-						    load_bias);
-			if (!BAD_ADDR(elf_entry)) {
-				/*
-				 * load_elf_interp() returns relocation
-				 * adjustment
-				 */
-				interp_load_addr = elf_entry;
-				elf_entry += loc->interp_elf_ex.e_entry;
-			}
-		}
+						    &interp_load_addr);
 		if (BAD_ADDR(elf_entry)) {
 			force_sig(SIGSEGV, current);
 			retval = IS_ERR((void *)elf_entry) ?
@@ -1068,6 +988,8 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 		}
 	}
 
+	kfree(elf_phdata);
+
 	if (interpreter_type != INTERPRETER_AOUT)
 		sys_close(elf_exec_fileno);
 
@@ -1075,15 +997,12 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 
 #ifdef ARCH_HAS_SETUP_ADDITIONAL_PAGES
 	retval = arch_setup_additional_pages(bprm, executable_stack);
-
 	if (retval < 0) {
 		send_sig(SIGKILL, current, 0);
-		goto out_free_fh;
+		goto out;
 	}
 #endif /* ARCH_HAS_SETUP_ADDITIONAL_PAGES */
 
-	kfree(elf_phdata);
-
 	compute_creds(bprm);
 	current->flags &= ~PF_FORKNOEXEC;
 	retval = create_elf_tables(bprm, &loc->elf_ex,
@@ -1102,10 +1021,6 @@ static int load_elf_binary(struct linux_binprm *bprm, struct pt_regs *regs)
 	current->mm->end_data = end_data;
 	current->mm->start_stack = bprm->p;
 
-#ifdef __HAVE_ARCH_RANDOMIZE_BRK
-	if (current->flags & PF_RANDOMIZE)
-		randomize_brk(elf_brk);
-#endif
 	if (current->personality & MMAP_PAGE_ZERO) {
 		/* Why this, you ask???  Well SVr4 maps page 0 as read-only,
 		   and some applications "depend" upon this behavior.
diff --git a/fs/proc/array.c b/fs/proc/array.c
index d0b28c6..a7081c5 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -473,12 +473,8 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
 	}
 	rcu_read_unlock();
 
-	if (!whole || num_threads < 2) {
-		wchan = 0;
-		if (current->uid == task->uid || current->euid == task->uid ||
-			capable(CAP_SYS_NICE))
-				wchan = get_wchan(task);
-	}
+	if (!whole || num_threads < 2)
+		wchan = get_wchan(task);
 	if (!whole) {
 		min_flt = task->min_flt;
 		maj_flt = task->maj_flt;
diff --git a/fs/proc/base.c b/fs/proc/base.c
index 1101b0d..72b8937 100644
--- a/fs/proc/base.c
+++ b/fs/proc/base.c
@@ -2244,7 +2244,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 	INF("cmdline",    S_IRUGO, pid_cmdline),
 	INF("stat",       S_IRUGO, tgid_stat),
 	INF("statm",      S_IRUGO, pid_statm),
-	REG("maps",       S_IRUSR, maps),
+	REG("maps",       S_IRUGO, maps),
 #ifdef CONFIG_NUMA
 	REG("numa_maps",  S_IRUGO, numa_maps),
 #endif
@@ -2256,7 +2256,7 @@ static const struct pid_entry tgid_base_stuff[] = {
 	REG("mountstats", S_IRUSR, mountstats),
 #ifdef CONFIG_MMU
 	REG("clear_refs", S_IWUSR, clear_refs),
-	REG("smaps",      S_IRUSR, smaps),
+	REG("smaps",      S_IRUGO, smaps),
 #endif
 #ifdef CONFIG_SECURITY
 	DIR("attr",       S_IRUGO|S_IXUGO, attr_dir),
@@ -2570,7 +2570,7 @@ static const struct pid_entry tid_base_stuff[] = {
 	INF("cmdline",   S_IRUGO, pid_cmdline),
 	INF("stat",      S_IRUGO, tid_stat),
 	INF("statm",     S_IRUGO, pid_statm),
-	REG("maps",      S_IRUSR, maps),
+	REG("maps",      S_IRUGO, maps),
 #ifdef CONFIG_NUMA
 	REG("numa_maps", S_IRUGO, numa_maps),
 #endif
@@ -2581,7 +2581,7 @@ static const struct pid_entry tid_base_stuff[] = {
 	REG("mounts",    S_IRUGO, mounts),
 #ifdef CONFIG_MMU
 	REG("clear_refs", S_IWUSR, clear_refs),
-	REG("smaps",     S_IRUSR, smaps),
+	REG("smaps",     S_IRUGO, smaps),
 #endif
 #ifdef CONFIG_SECURITY
 	DIR("attr",      S_IRUGO|S_IXUGO, attr_dir),
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
index f2725da..8043a3e 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -44,11 +44,7 @@ char *task_mem(struct mm_struct *mm, char *buffer)
 		"VmStk:\t%8lu kB\n"
 		"VmExe:\t%8lu kB\n"
 		"VmLib:\t%8lu kB\n"
-		"VmPTE:\t%8lu kB\n"
-		"StaBrk:\t%08lx kB\n"
-		"Brk:\t%08lx kB\n"
-		"StaStk:\t%08lx kB\n"
-		,
+		"VmPTE:\t%8lu kB\n",
 		hiwater_vm << (PAGE_SHIFT-10),
 		(total_vm - mm->reserved_vm) << (PAGE_SHIFT-10),
 		mm->locked_vm << (PAGE_SHIFT-10),
@@ -56,13 +52,7 @@ char *task_mem(struct mm_struct *mm, char *buffer)
 		total_rss << (PAGE_SHIFT-10),
 		data << (PAGE_SHIFT-10),
 		mm->stack_vm << (PAGE_SHIFT-10), text, lib,
-		(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10,
-		mm->start_brk, mm->brk, mm->start_stack);
-#ifdef CONFIG_X86_32
-	if (!nx_enabled)
-		buffer += sprintf(buffer,
-			"ExecLim:\t%08lx\n", mm->context.exec_limit);
-#endif
+		(PTRS_PER_PTE*sizeof(pte_t)*mm->nr_ptes) >> 10);
 	return buffer;
 }
 
@@ -145,9 +135,6 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats
 {
 	struct proc_maps_private *priv = m->private;
 	struct task_struct *task = priv->task;
-#ifdef CONFIG_X86_32
-	struct mm_struct *tmm = get_task_mm(task);
-#endif
 	struct vm_area_struct *vma = v;
 	struct mm_struct *mm = vma->vm_mm;
 	struct file *file = vma->vm_file;
@@ -170,20 +157,10 @@ static int show_map_internal(struct seq_file *m, void *v, struct mem_size_stats
 			vma->vm_end,
 			flags & VM_READ ? 'r' : '-',
 			flags & VM_WRITE ? 'w' : '-',
-			(flags & VM_EXEC
-#ifdef CONFIG_X86_32
-				|| (!nx_enabled && tmm &&
-				(vma->vm_start < tmm->context.exec_limit))
-#endif
-			)
-				? 'x' : '-',
+			flags & VM_EXEC ? 'x' : '-',
 			flags & VM_MAYSHARE ? 's' : 'p',
 			vma->vm_pgoff << PAGE_SHIFT,
 			MAJOR(dev), MINOR(dev), ino, &len);
-#ifdef CONFIG_X86_32
-	if (tmm)
-		mmput(tmm);
-#endif
 
 	/*
 	 * Print the dentry name for named mappings, and a
diff --git a/include/asm-ia64/pgalloc.h b/include/asm-ia64/pgalloc.h
index f1a12a1..67552ca 100644
--- a/include/asm-ia64/pgalloc.h
+++ b/include/asm-ia64/pgalloc.h
@@ -1,10 +1,6 @@
 #ifndef _ASM_IA64_PGALLOC_H
 #define _ASM_IA64_PGALLOC_H
 
-#define arch_add_exec_range(mm, limit)		do { ; } while (0)
-#define arch_flush_exec_range(mm)		do { ; } while (0)
-#define arch_remove_exec_range(mm, limit)	do { ; } while (0)
-
 /*
  * This file contains the functions and defines necessary to allocate
  * page tables.
diff --git a/include/asm-powerpc/pgalloc.h b/include/asm-powerpc/pgalloc.h
index 25068ae..b4505ed 100644
--- a/include/asm-powerpc/pgalloc.h
+++ b/include/asm-powerpc/pgalloc.h
@@ -2,11 +2,6 @@
 #define _ASM_POWERPC_PGALLOC_H
 #ifdef __KERNEL__
 
-/* Dummy functions since we don't support execshield on ppc */
-#define arch_add_exec_range(mm, limit) do { ; } while (0)
-#define arch_flush_exec_range(mm)      do { ; } while (0)
-#define arch_remove_exec_range(mm, limit) do { ; } while (0)
-
 #ifdef CONFIG_PPC64
 #include <asm/pgalloc-64.h>
 #else
diff --git a/include/asm-ppc/pgalloc.h b/include/asm-ppc/pgalloc.h
index d880c27..44d88a9 100644
--- a/include/asm-ppc/pgalloc.h
+++ b/include/asm-ppc/pgalloc.h
@@ -39,10 +39,5 @@ extern void pte_free(struct page *pte);
 
 #define check_pgt_cache()	do { } while (0)
 
-#define arch_add_exec_range(mm, limit)         do { ; } while (0)
-#define arch_flush_exec_range(mm)              do { ; } while (0)
-#define arch_remove_exec_range(mm, limit)      do { ; } while (0)
-
-
 #endif /* _PPC_PGALLOC_H */
 #endif /* __KERNEL__ */
diff --git a/include/asm-s390/pgalloc.h b/include/asm-s390/pgalloc.h
index aadc022..709dd17 100644
--- a/include/asm-s390/pgalloc.h
+++ b/include/asm-s390/pgalloc.h
@@ -17,10 +17,6 @@
 #include <linux/gfp.h>
 #include <linux/mm.h>
 
-#define arch_add_exec_range(mm, limit) do { ; } while (0)
-#define arch_flush_exec_range(mm)      do { ; } while (0)
-#define arch_remove_exec_range(mm, limit) do { ; } while (0)
-
 #define check_pgt_cache()	do {} while (0)
 
 unsigned long *crst_table_alloc(struct mm_struct *, int);
diff --git a/include/asm-sparc/pgalloc.h b/include/asm-sparc/pgalloc.h
index 2882595..a449cd4 100644
--- a/include/asm-sparc/pgalloc.h
+++ b/include/asm-sparc/pgalloc.h
@@ -65,8 +65,4 @@ BTFIXUPDEF_CALL(void, pte_free, struct page *)
 #define pte_free(pte)		BTFIXUP_CALL(pte_free)(pte)
 #define __pte_free_tlb(tlb, pte)	pte_free(pte)
 
-#define arch_add_exec_range(mm, limit)		do { ; } while (0)
-#define arch_flush_exec_range(mm)		do { ; } while (0)
-#define arch_remove_exec_range(mm, limit)	do { ; } while (0)
-
 #endif /* _SPARC_PGALLOC_H */
diff --git a/include/asm-sparc64/pgalloc.h b/include/asm-sparc64/pgalloc.h
index ab1b3c5..5d66b85 100644
--- a/include/asm-sparc64/pgalloc.h
+++ b/include/asm-sparc64/pgalloc.h
@@ -70,8 +70,4 @@ static inline void check_pgt_cache(void)
 	quicklist_trim(0, NULL, 25, 16);
 }
 
-#define arch_add_exec_range(mm, limit)		do { ; } while (0)
-#define arch_flush_exec_range(mm)		do { ; } while (0)
-#define arch_remove_exec_range(mm, limit)	do { ; } while (0)
-
 #endif /* _SPARC64_PGALLOC_H */
diff --git a/include/asm-x86/a.out.h b/include/asm-x86/a.out.h
index ac6e12b..a62443e 100644
--- a/include/asm-x86/a.out.h
+++ b/include/asm-x86/a.out.h
@@ -19,7 +19,7 @@ struct exec
 
 #ifdef __KERNEL__
 # include <linux/thread_info.h>
-# define STACK_TOP	(TASK_SIZE - PAGE_SIZE)  /* 1 page for vdso */
+# define STACK_TOP	TASK_SIZE
 # ifdef CONFIG_X86_32
 #  define STACK_TOP_MAX	STACK_TOP
 # else
diff --git a/include/asm-x86/desc_32.h b/include/asm-x86/desc_32.h
index e36ee8f..c547403 100644
--- a/include/asm-x86/desc_32.h
+++ b/include/asm-x86/desc_32.h
@@ -216,20 +216,6 @@ static inline unsigned long get_desc_base(unsigned long *desc)
 	return base;
 }
 
-static inline void set_user_cs(struct desc_struct *desc, unsigned long limit)
-{
-	limit = (limit - 1) / PAGE_SIZE;
-	desc->a = limit & 0xffff;
-	desc->b = (limit & 0xf0000) | 0x00c0fb00;
-}
-
-#define load_user_cs_desc(cpu, mm) \
-	get_cpu_gdt_table(cpu)[GDT_ENTRY_DEFAULT_USER_CS] = (mm)->context.user_cs
-
-extern void arch_add_exec_range(struct mm_struct *mm, unsigned long limit);
-extern void arch_remove_exec_range(struct mm_struct *mm, unsigned long limit);
-extern void arch_flush_exec_range(struct mm_struct *mm);
-
 #else /* __ASSEMBLY__ */
 
 /*
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h
index f526256..ec42a4d 100644
--- a/include/asm-x86/elf.h
+++ b/include/asm-x86/elf.h
@@ -285,11 +285,6 @@ struct linux_binprm;
 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
 				       int executable_stack);
 
-#ifdef CONFIG_X86_32
-#define __HAVE_ARCH_RANDOMIZE_BRK
-extern void randomize_brk(unsigned long old_brk);
-#endif
-
 #endif /* __KERNEL__ */
 
 #endif
diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
index d95803f..3f922c8 100644
--- a/include/asm-x86/mmu.h
+++ b/include/asm-x86/mmu.h
@@ -9,8 +9,6 @@
  * we put the segment information here.
  *
  * cpu_vm_mask is used to optimize ldt flushing.
- * exec_limit is used to track the range PROT_EXEC
- * mappings span.
  */
 typedef struct { 
 	void *ldt;
@@ -20,10 +18,6 @@ typedef struct {
 	int size;
 	struct mutex lock;
 	void *vdso;
-#ifdef CONFIG_X86_32
-	struct desc_struct user_cs;
-	unsigned long exec_limit;
-#endif
 } mm_context_t;
 
 #endif /* _ASM_X86_MMU_H */
diff --git a/include/asm-x86/pgalloc_64.h b/include/asm-x86/pgalloc_64.h
index 284c9fc..8bb5646 100644
--- a/include/asm-x86/pgalloc_64.h
+++ b/include/asm-x86/pgalloc_64.h
@@ -5,13 +5,6 @@
 #include <linux/threads.h>
 #include <linux/mm.h>
 
-#define arch_add_exec_range(mm, limit) \
-		do { (void)(mm), (void)(limit); } while (0)
-#define arch_flush_exec_range(mm) \
-		do { (void)(mm); } while (0)
-#define arch_remove_exec_range(mm, limit) \
-		do { (void)(mm), (void)(limit); } while (0)
-
 #define pmd_populate_kernel(mm, pmd, pte) \
 		set_pmd(pmd, __pmd(_PAGE_TABLE | __pa(pte)))
 #define pud_populate(mm, pud, pmd) \
diff --git a/include/asm-x86/processor_32.h b/include/asm-x86/processor_32.h
index 81dfdf2..13976b0 100644
--- a/include/asm-x86/processor_32.h
+++ b/include/asm-x86/processor_32.h
@@ -218,10 +218,7 @@ extern int bootloader_type;
 /* This decides where the kernel will search for a free chunk of vm
  * space during mmap's.
  */
-#define TASK_UNMAPPED_BASE	PAGE_ALIGN(TASK_SIZE/3)
-
-#define __HAVE_ARCH_ALIGN_STACK
-extern unsigned long arch_align_stack(unsigned long sp);
+#define TASK_UNMAPPED_BASE	(PAGE_ALIGN(TASK_SIZE / 3))
 
 #define HAVE_ARCH_PICK_MMAP_LAYOUT
 
@@ -408,9 +405,6 @@ struct thread_struct {
 	regs->xcs = __USER_CS;					\
 	regs->eip = new_eip;					\
 	regs->esp = new_esp;					\
-	preempt_disable();					\
-	load_user_cs_desc(smp_processor_id(), current->mm);	\
-	preempt_enable();					\
 } while (0)
 
 /* Forward declaration, a strange C thing */
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 9cda7b1..1b7b95c 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -994,13 +994,7 @@ extern int install_special_mapping(struct mm_struct *mm,
 				   unsigned long addr, unsigned long len,
 				   unsigned long flags, struct page **pages);
 
-extern unsigned long get_unmapped_area_prot(struct file *, unsigned long, unsigned long, unsigned long, unsigned long, int);
-
-static inline unsigned long get_unmapped_area(struct file *file, unsigned long addr,
-		unsigned long len, unsigned long pgoff, unsigned long flags)
-{
-	return get_unmapped_area_prot(file, addr, len, pgoff, flags, 0);
-}
+extern unsigned long get_unmapped_area(struct file *, unsigned long, unsigned long, unsigned long, unsigned long);
 
 extern unsigned long do_mmap_pgoff(struct file *file, unsigned long addr,
 	unsigned long len, unsigned long prot,
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index 7b4ad3f..f4c03e0 100644
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -160,9 +160,6 @@ struct mm_struct {
 	unsigned long (*get_unmapped_area) (struct file *filp,
 				unsigned long addr, unsigned long len,
 				unsigned long pgoff, unsigned long flags);
-       unsigned long (*get_unmapped_exec_area) (struct file *filp,
-				unsigned long addr, unsigned long len,
-				unsigned long pgoff, unsigned long flags);
 	void (*unmap_area) (struct mm_struct *mm, unsigned long addr);
 	unsigned long mmap_base;		/* base of mmap area */
 	unsigned long task_size;		/* size of task vm space */
diff --git a/include/linux/resource.h b/include/linux/resource.h
index 14757af..ae13db7 100644
--- a/include/linux/resource.h
+++ b/include/linux/resource.h
@@ -54,11 +54,8 @@ struct rlimit {
 /*
  * Limit the stack by to some sane default: root can always
  * increase this limit if needed..  8MB seems reasonable.
- *
- * (2MB more to cover randomization effects.)
  */
-#define _STK_LIM	(10*1024*1024)
-#define EXEC_STACK_BIAS	(2*1024*1024)
+#define _STK_LIM	(8*1024*1024)
 
 /*
  * GPG wants 32kB of mlocked memory, to make sure pass phrases
diff --git a/include/linux/sched.h b/include/linux/sched.h
index 0300018..04e732f 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -95,9 +95,6 @@ struct exec_domain;
 struct futex_pi_state;
 struct bio;
 
-extern int exec_shield;
-extern int print_fatal_signals;
-
 /*
  * List of flags we want to share for kernel threads,
  * if only because they are not used by them anyway.
@@ -311,10 +308,6 @@ extern int sysctl_max_map_count;
 extern unsigned long
 arch_get_unmapped_area(struct file *, unsigned long, unsigned long,
 		       unsigned long, unsigned long);
-
-extern unsigned long
-arch_get_unmapped_exec_area(struct file *, unsigned long, unsigned long,
-		       unsigned long, unsigned long);
 extern unsigned long
 arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
 			  unsigned long len, unsigned long pgoff,
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 867ffd7..dc21621 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -83,26 +83,6 @@ extern int maps_protect;
 extern int sysctl_stat_interval;
 extern int audit_argv_kb;
 
-int exec_shield = (1<<0);
-/* exec_shield is a bitmask:
- * 0: off; vdso at STACK_TOP, 1 page below TASK_SIZE
- * (1<<0) 1: on [also on if !=0]
- * (1<<1) 2: force noexecstack regardless of PT_GNU_STACK
- * The old settings
- * (1<<2) 4: vdso just below .text of main (unless too low)
- * (1<<3) 8: vdso just below .text of PT_INTERP (unless too low)
- * are ignored because the vdso is placed completely randomly
- */
-
-static int __init setup_exec_shield(char *str)
-{
-	get_option(&str, &exec_shield);
-
-	return 1;
-}
-
-__setup("exec-shield=", setup_exec_shield);
-
 /* Constants used for minimum and  maximum */
 #ifdef CONFIG_DETECT_SOFTLOCKUP
 static int one = 1;
@@ -368,14 +348,6 @@ static struct ctl_table kern_table[] = {
 		.proc_handler	= &proc_dointvec,
 	},
 	{
-		.ctl_name	= CTL_UNNUMBERED,
-		.procname	= "exec-shield",
-		.data		= &exec_shield,
-		.maxlen		= sizeof(int),
-		.mode		= 0644,
-		.proc_handler	= &proc_dointvec,
-	},
-	{
 		.ctl_name	= KERN_CORE_USES_PID,
 		.procname	= "core_uses_pid",
 		.data		= &core_uses_pid,
diff --git a/mm/mmap.c b/mm/mmap.c
index 26e3756..15678aa 100644
--- a/mm/mmap.c
+++ b/mm/mmap.c
@@ -26,7 +26,6 @@
 #include <linux/mount.h>
 #include <linux/mempolicy.h>
 #include <linux/rmap.h>
-#include <linux/random.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
@@ -373,8 +372,6 @@ static inline void
 __vma_link_list(struct mm_struct *mm, struct vm_area_struct *vma,
 		struct vm_area_struct *prev, struct rb_node *rb_parent)
 {
-	if (vma->vm_flags & VM_EXEC)
-		arch_add_exec_range(mm, vma->vm_end);
 	if (prev) {
 		vma->vm_next = prev->vm_next;
 		prev->vm_next = vma;
@@ -478,8 +475,6 @@ __vma_unlink(struct mm_struct *mm, struct vm_area_struct *vma,
 	rb_erase(&vma->vm_rb, &mm->mm_rb);
 	if (mm->mmap_cache == vma)
 		mm->mmap_cache = prev;
-	if (vma->vm_flags & VM_EXEC)
-		arch_remove_exec_range(mm, vma->vm_end);
 }
 
 /*
@@ -785,8 +780,6 @@ struct vm_area_struct *vma_merge(struct mm_struct *mm,
 		} else					/* cases 2, 5, 7 */
 			vma_adjust(prev, prev->vm_start,
 				end, prev->vm_pgoff, NULL);
-		if (prev->vm_flags & VM_EXEC)
-			arch_add_exec_range(mm, prev->vm_end);
 		return prev;
 	}
 
@@ -942,8 +935,7 @@ unsigned long do_mmap_pgoff(struct file * file, unsigned long addr,
 	/* Obtain the address to map to. we verify (or select) it and ensure
 	 * that it represents a valid section of the address space.
 	 */
-	addr = get_unmapped_area_prot(file, addr, len, pgoff, flags,
-		prot & PROT_EXEC);
+	addr = get_unmapped_area(file, addr, len, pgoff, flags);
 	if (addr & ~PAGE_MASK)
 		return addr;
 
@@ -1413,17 +1405,13 @@ void arch_unmap_area_topdown(struct mm_struct *mm, unsigned long addr)
 }
 
 unsigned long
-get_unmapped_area_prot(struct file *file, unsigned long addr, unsigned long len,
-		unsigned long pgoff, unsigned long flags, int exec)
+get_unmapped_area(struct file *file, unsigned long addr, unsigned long len,
+		unsigned long pgoff, unsigned long flags)
 {
 	unsigned long (*get_area)(struct file *, unsigned long,
 				  unsigned long, unsigned long, unsigned long);
 
-	if (exec && current->mm->get_unmapped_exec_area)
-		get_area = current->mm->get_unmapped_exec_area;
-	else
-		get_area = current->mm->get_unmapped_area;
-
+	get_area = current->mm->get_unmapped_area;
 	if (file && file->f_op && file->f_op->get_unmapped_area)
 		get_area = file->f_op->get_unmapped_area;
 	addr = get_area(file, addr, len, pgoff, flags);
@@ -1437,75 +1425,8 @@ get_unmapped_area_prot(struct file *file, unsigned long addr, unsigned long len,
 
 	return addr;
 }
-EXPORT_SYMBOL(get_unmapped_area_prot);
-
-#define SHLIB_BASE             0x00110000
-
-unsigned long arch_get_unmapped_exec_area(struct file *filp, unsigned long addr0,
-		unsigned long len0, unsigned long pgoff, unsigned long flags)
-{
-	unsigned long addr = addr0, len = len0;
-	struct mm_struct *mm = current->mm;
-	struct vm_area_struct *vma;
-	unsigned long tmp;
-
-	if (len > TASK_SIZE)
-		return -ENOMEM;
-
-	if (flags & MAP_FIXED)
-		return addr;
-
-	if (!addr) {
-		addr = randomize_range(SHLIB_BASE, 0x01000000, len);
-	} else {
-		addr = PAGE_ALIGN(addr);
-		vma = find_vma(mm, addr);
-		if (TASK_SIZE - len >= addr &&
-		    (!vma || addr + len <= vma->vm_start)) {
-			return addr;
-		}
-	}
-
-	addr = SHLIB_BASE;
-	for (vma = find_vma(mm, addr); ; vma = vma->vm_next) {
-		/* At this point:  (!vma || addr < vma->vm_end). */
-		if (TASK_SIZE - len < addr)
-			return -ENOMEM;
-
-		if (!vma || addr + len <= vma->vm_start) {
-			/*
-			 * Must not let a PROT_EXEC mapping get into the
-			 * brk area:
-			 */
-			if (addr + len > mm->brk)
-				goto failed;
-
-			/*
-			 * Up until the brk area we randomize addresses
-			 * as much as possible:
-			 */
-			if (addr >= 0x01000000) {
-				tmp = randomize_range(0x01000000,
-					PAGE_ALIGN(max(mm->start_brk,
-					(unsigned long)0x08000000)), len);
-				vma = find_vma(mm, tmp);
-				if (TASK_SIZE - len >= tmp &&
-				    (!vma || tmp + len <= vma->vm_start))
-					return tmp;
-			}
-			/*
-			 * Ok, randomization didnt work out - return
-			 * the result of the linear search:
-			 */
-			return addr;
-		}
-		addr = vma->vm_end;
-	}
-
-failed:
-	return current->mm->get_unmapped_area(filp, addr0, len0, pgoff, flags);
-}
 
+EXPORT_SYMBOL(get_unmapped_area);
 
 /* Look up the first VMA which satisfies  addr < vm_end,  NULL if none. */
 struct vm_area_struct * find_vma(struct mm_struct * mm, unsigned long addr)
@@ -1580,14 +1501,6 @@ out:
 	return prev ? prev->vm_next : vma;
 }
 
-static int over_stack_limit(unsigned long sz)
-{
-	if (sz < EXEC_STACK_BIAS)
-		return 0;
-	return (sz - EXEC_STACK_BIAS) >
-			current->signal->rlim[RLIMIT_STACK].rlim_cur;
-}
-
 /*
  * Verify that the stack growth is acceptable and
  * update accounting. This is shared with both the
@@ -1604,7 +1517,7 @@ static int acct_stack_growth(struct vm_area_struct * vma, unsigned long size, un
 		return -ENOMEM;
 
 	/* Stack limit test */
-	if (over_stack_limit(size))
+	if (size > rlim[RLIMIT_STACK].rlim_cur)
 		return -ENOMEM;
 
 	/* mlock limit tests */
@@ -1908,14 +1821,10 @@ int split_vma(struct mm_struct * mm, struct vm_area_struct * vma,
 	if (new->vm_ops && new->vm_ops->open)
 		new->vm_ops->open(new);
 
-	if (new_below) {
-		unsigned long old_end = vma->vm_end;
-
+	if (new_below)
 		vma_adjust(vma, addr, vma->vm_end, vma->vm_pgoff +
 			((addr - new->vm_start) >> PAGE_SHIFT), new);
-		if (vma->vm_flags & VM_EXEC)
-			arch_remove_exec_range(mm, old_end);
-	} else
+	else
 		vma_adjust(vma, vma->vm_start, addr, vma->vm_pgoff, new);
 
 	return 0;
@@ -2134,7 +2043,6 @@ void exit_mmap(struct mm_struct *mm)
 	vm_unacct_memory(nr_accounted);
 	free_pgtables(&tlb, vma, FIRST_USER_ADDRESS, 0);
 	tlb_finish_mmu(tlb, 0, end);
-	arch_flush_exec_range(mm);
 
 	/*
 	 * Walk the list again, actually closing and freeing it,
diff --git a/mm/mprotect.c b/mm/mprotect.c
index 6d822ad..4de5468 100644
--- a/mm/mprotect.c
+++ b/mm/mprotect.c
@@ -23,12 +23,8 @@
 #include <linux/swapops.h>
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
-#include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
-#ifdef CONFIG_X86
-#include <asm/desc.h>
-#endif
 
 static void change_pte_range(struct mm_struct *mm, pmd_t *pmd,
 		unsigned long addr, unsigned long end, pgprot_t newprot,
@@ -138,7 +134,7 @@ mprotect_fixup(struct vm_area_struct *vma, struct vm_area_struct **pprev,
 	struct mm_struct *mm = vma->vm_mm;
 	unsigned long oldflags = vma->vm_flags;
 	long nrpages = (end - start) >> PAGE_SHIFT;
-	unsigned long charged = 0, old_end = vma->vm_end;
+	unsigned long charged = 0;
 	pgoff_t pgoff;
 	int error;
 	int dirty_accountable = 0;
@@ -202,9 +198,6 @@ success:
 		dirty_accountable = 1;
 	}
 
-	if (oldflags & VM_EXEC)
-		arch_remove_exec_range(current->mm, old_end);
-
 	if (is_vm_hugetlb_page(vma))
 		hugetlb_change_protection(vma, start, end, vma->vm_page_prot);
 	else
diff --git a/mm/mremap.c b/mm/mremap.c
index 101f885..08e3c7f 100644
--- a/mm/mremap.c
+++ b/mm/mremap.c
@@ -392,8 +392,8 @@ unsigned long do_mremap(unsigned long addr,
 			if (vma->vm_flags & VM_MAYSHARE)
 				map_flags |= MAP_SHARED;
 
-			new_addr = get_unmapped_area_prot(vma->vm_file, 0, new_len,
-				vma->vm_pgoff, map_flags, vma->vm_flags & VM_EXEC);
+			new_addr = get_unmapped_area(vma->vm_file, 0, new_len,
+						vma->vm_pgoff, map_flags);
 			if (new_addr & ~PAGE_MASK) {
 				ret = new_addr;
 				goto out;
-- 
1.5.4.1



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/kernel.spec,v
retrieving revision 1.11.2.5
retrieving revision 1.11.2.6
diff -u -r1.11.2.5 -r1.11.2.6
--- kernel.spec	19 Feb 2008 16:05:29 -0000	1.11.2.5
+++ kernel.spec	20 Feb 2008 15:34:17 -0000	1.11.2.6
@@ -690,6 +690,7 @@
 Patch2400: linux-2.6-uvcvideo.patch
 
 # kernel-xen patches start
+Patch5000: linux-2.6-revert-execshield.patch
 Patch5001: linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch
 Patch5002: linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch
 Patch5003: linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch
@@ -1329,6 +1330,7 @@
 # ---------- below all scheduled for 2.6.24 -----------------
 
 # kernel-xen apply start
+ApplyPatch linux-2.6-revert-execshield.patch
 ApplyPatch linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch
 ApplyPatch linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch
 ApplyPatch linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch
@@ -1972,7 +1974,12 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Wed Feb 20 2008 Mark McLoughlin <markmc at redhat.com>
+- Revert the execshield patch for now
+- Add a couple of contiguous region fixes
+
 * Mon Feb 18 2008 Mark McLoughlin <markmc at redhat.com>
+- Re-base to kernel-2_6_24-23_fc9
 - Add first round of dom0 pv_ops patches
 
 * Fri Feb 15 2008 Mark McLoughlin <markmc at redhat.com>

linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch:

Index: linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0001-xen-debug-Add-xprintk-to-log-directly-via-hypercall.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From cbdf50a0e23b958ec393b044a8414ac24117558e Mon Sep 17 00:00:00 2001
+From fd1802a98f56866ecdb657e60df75b68620c0a83 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Wed, 21 Nov 2007 18:40:31 +0000
 Subject: [PATCH] xen debug: Add xprintk to log directly via hypercall

linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch:

Index: linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0002-xen-dom0-Make-hvc_xen-console-work-for-dom0.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From f66e3b5781df65ae5b42eaaa97a5487c45620c6a Mon Sep 17 00:00:00 2001
+From 6b873a8a50f67e644fb22d74f4dfb271d0afc8a7 Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela at redhat.com>
 Date: Mon, 26 Nov 2007 07:38:29 +0100
 Subject: [PATCH] xen dom0: Make hvc_xen console work for dom0.

linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch:

Index: linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0003-xen-dom0-Initialize-xenbus-for-dom0.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From a7ff3dba9663a740f85d5bcb71492eb58c03ce4c Mon Sep 17 00:00:00 2001
+From a44d84322333942040bf7fb89effd0fd9f905572 Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela at redhat.com>
 Date: Mon, 26 Nov 2007 08:35:10 +0100
 Subject: [PATCH] xen dom0: Initialize xenbus for dom0.

linux-2.6-0004-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch:

Index: linux-2.6-0004-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0004-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0004-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0004-xen-dom0-Set-up-basic-IO-permissions-for-dom0.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From d60e2added25bfb050c8b0bb8b23a2eed234f284 Mon Sep 17 00:00:00 2001
+From a5b57f1e88e9765a2c56de43a63f587e06959fec Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela at redhat.com>
 Date: Mon, 26 Nov 2007 08:53:42 +0100
 Subject: [PATCH] xen dom0: Set up basic IO permissions for dom0.

linux-2.6-0005-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch:

Index: linux-2.6-0005-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0005-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0005-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0005-xen-dom0-Add-set_fixmap-pv_mmu_ops.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 75eea581acc135d53cdc0985ab8c834259f5474d Mon Sep 17 00:00:00 2001
+From efda8ce8bf1fa523071872480846472bb901f751 Mon Sep 17 00:00:00 2001
 From: Juan Quintela <quintela at redhat.com>
 Date: Tue, 27 Nov 2007 06:44:53 +0100
 Subject: [PATCH] xen dom0: Add set_fixmap pv_mmu_ops.

linux-2.6-0006-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch:

Index: linux-2.6-0006-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0006-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0006-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0006-xen-dom0-Add-support-for-the-platform_ops-hypercall.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From f8db032de9275f8fd65ede35d066e07a1aa0f562 Mon Sep 17 00:00:00 2001
+From 91089c273194df8c280685209027c3512fb57d48 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Fri, 30 Nov 2007 15:06:30 +0000
 Subject: [PATCH] xen dom0: Add support for the platform_ops hypercall

linux-2.6-0007-xen-acpi-Enable-early-access-to-ACPI-tables.patch:

Index: linux-2.6-0007-xen-acpi-Enable-early-access-to-ACPI-tables.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0007-xen-acpi-Enable-early-access-to-ACPI-tables.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0007-xen-acpi-Enable-early-access-to-ACPI-tables.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0007-xen-acpi-Enable-early-access-to-ACPI-tables.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From db0d4ab042b1c3585f5e788a4355309d364e634f Mon Sep 17 00:00:00 2001
+From 1acbc776e77c064f642ff5163edcafab38a4a465 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Fri, 7 Dec 2007 11:39:27 +0000
 Subject: [PATCH] xen acpi: Enable early access to ACPI tables.

linux-2.6-0008-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch:

Index: linux-2.6-0008-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0008-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0008-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0008-xen-dom0-Add-paravirt_ops-ioremap_page_range-for.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 13d626b80c3668757421f6206f2006e0f49ac7fe Mon Sep 17 00:00:00 2001
+From dc81d46de6fbce381bbad9e7c423b062355676ca Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Fri, 7 Dec 2007 15:27:21 +0000
 Subject: [PATCH] xen dom0: Add paravirt_ops ioremap_page_range() for Xen.

linux-2.6-0009-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch:

Index: linux-2.6-0009-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0009-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0009-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0009-MTRR-use-cpu_callout_map-instead-of-cpu_online_map.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From aa1ebf6fb1281589541682a4dbaafcf048695141 Mon Sep 17 00:00:00 2001
+From 4583b58fcfe84b832569a601777e02b01c569bfa Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Wed, 30 Jan 2008 13:25:36 +0000
 Subject: [PATCH] MTRR: use cpu_callout_map instead of cpu_online_map

linux-2.6-0010-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch:

Index: linux-2.6-0010-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0010-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0010-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0010-xen-mtrr-Add-mtrr_ops-support-for-Xen-mtrr.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 75ca621fd427a007e4b9117e3e3bd3dc89f23567 Mon Sep 17 00:00:00 2001
+From 6381459c7ac3f57c3ca1e71e187fbc786f951628 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 10 Dec 2007 11:32:15 +0000
 Subject: [PATCH] xen mtrr: Add mtrr_ops support for Xen mtrr

linux-2.6-0011-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch:

Index: linux-2.6-0011-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0011-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0011-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0011-xen-mtrr-Don-t-enable-xen-mtrr-on-bare-metal.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 514160c53a50854b774ade0621c03693dbbee961 Mon Sep 17 00:00:00 2001
+From 44d22b11adf09de4d15742da9015b4235ebbf8d7 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Wed, 12 Dec 2007 14:31:16 +0000
 Subject: [PATCH] xen mtrr: Don't enable xen mtrr on bare metal

linux-2.6-0012-xen-mtrr-set-cpu-in-cpu_callout_map.patch:

Index: linux-2.6-0012-xen-mtrr-set-cpu-in-cpu_callout_map.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0012-xen-mtrr-set-cpu-in-cpu_callout_map.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0012-xen-mtrr-set-cpu-in-cpu_callout_map.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0012-xen-mtrr-set-cpu-in-cpu_callout_map.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 2117cdc21eebec01e0aaa592136a8845886d31f8 Mon Sep 17 00:00:00 2001
+From 51233905d8abff68df9ac373509e0bea138b5cda Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Wed, 30 Jan 2008 13:18:23 +0000
 Subject: [PATCH] xen mtrr: set cpu in cpu_callout_map

linux-2.6-0013-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch:

Index: linux-2.6-0013-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0013-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0013-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0013-xen-mtrr-Clean-up-the-num_var_ranges-CPU_UNKOWN-hac.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From d79941eb28132b96b50cd3e7d37c38e667551878 Mon Sep 17 00:00:00 2001
+From a0e3f6bd4583d2911713584f1030e1fcfa1faf70 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 28 Jan 2008 18:55:06 +0000
 Subject: [PATCH] xen mtrr: Clean up the num_var_ranges/CPU_UNKOWN hack

linux-2.6-0014-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch:

Index: linux-2.6-0014-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0014-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0014-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0014-xen-mtrr-Use-specific-cpu_has_foo-macros-instead-of.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From a658c6d3c92f86e2789d2ac0ce9197ad76879cb7 Mon Sep 17 00:00:00 2001
+From b5e0a996850a56ce918e779539eef1d6870cf205 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 28 Jan 2008 18:40:06 +0000
 Subject: [PATCH] xen mtrr: Use specific cpu_has_foo macros instead of generic cpu_has()

linux-2.6-0015-xen-mtrr-Kill-some-unneccessary-includes.patch:

Index: linux-2.6-0015-xen-mtrr-Kill-some-unneccessary-includes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0015-xen-mtrr-Kill-some-unneccessary-includes.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0015-xen-mtrr-Kill-some-unneccessary-includes.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0015-xen-mtrr-Kill-some-unneccessary-includes.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 7f0aef7d0e4883c19002ca52f1766df4713de1f4 Mon Sep 17 00:00:00 2001
+From eb641d309ec66e35f855b24345f300eed73fbc7c Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 28 Jan 2008 19:05:11 +0000
 Subject: [PATCH] xen mtrr: Kill some unneccessary includes

linux-2.6-0016-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch:

Index: linux-2.6-0016-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0016-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0016-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0016-xen-mtrr-No-need-to-explicitly-set-use_intel_if-0.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From acaa2ebcc82e41a5e7adb9ec6223aa96f6d7a246 Mon Sep 17 00:00:00 2001
+From a7d3fe3546b14137f04e3bbdb5c77a4015ce1f85 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 28 Jan 2008 18:39:29 +0000
 Subject: [PATCH] xen mtrr: No need to explicitly set use_intel_if = 0

linux-2.6-0017-xen-mtrr-Use-generic_validate_add_page.patch:

Index: linux-2.6-0017-xen-mtrr-Use-generic_validate_add_page.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0017-xen-mtrr-Use-generic_validate_add_page.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0017-xen-mtrr-Use-generic_validate_add_page.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0017-xen-mtrr-Use-generic_validate_add_page.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 80001f5436ec01d4e0291c2e2bc499c7a92a0608 Mon Sep 17 00:00:00 2001
+From 6dd99a1bed13be3e31d7604cdbfde30ebca7e049 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Tue, 29 Jan 2008 17:43:25 +0000
 Subject: [PATCH] xen mtrr: Use generic_validate_add_page()

linux-2.6-0018-xen-mtrr-Implement-xen_get_free_region.patch:

Index: linux-2.6-0018-xen-mtrr-Implement-xen_get_free_region.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0018-xen-mtrr-Implement-xen_get_free_region.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0018-xen-mtrr-Implement-xen_get_free_region.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0018-xen-mtrr-Implement-xen_get_free_region.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 8f789415ce84a9619dc6c0193217b1a659ac19f7 Mon Sep 17 00:00:00 2001
+From a035aaf1e97127384d00e271c11dc9c9cdaeae68 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Wed, 30 Jan 2008 09:40:33 +0000
 Subject: [PATCH] xen mtrr: Implement xen_get_free_region()

linux-2.6-0019-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch:

Index: linux-2.6-0019-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0019-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0019-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0019-xen-mtrr-Add-xen_-get-set-_mtrr-implementations.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From bad9371466c166f7339a6813ecc9a4619fe720ea Mon Sep 17 00:00:00 2001
+From 44465f3ae723453422ba4013315a499642e4018e Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Tue, 29 Jan 2008 18:29:46 +0000
 Subject: [PATCH] xen mtrr: Add xen_{get,set}_mtrr() implementations

linux-2.6-0020-irq2.diff-from-Juan-Quintela.patch:

Index: linux-2.6-0020-irq2.diff-from-Juan-Quintela.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0020-irq2.diff-from-Juan-Quintela.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0020-irq2.diff-from-Juan-Quintela.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0020-irq2.diff-from-Juan-Quintela.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 53cb817e322173d6936f92cef04752792e87d7b6 Mon Sep 17 00:00:00 2001
+From 3c5ee0e07ca37dc95f9d319110ac10e6c0b3607e Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Thu, 13 Dec 2007 17:55:34 +0000
 Subject: [PATCH] irq2.diff from Juan Quintela.
@@ -810,7 +810,7 @@
 +	xprintk("setup_arch 15\n");
  }
 diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
-index 3b0ac7e..05bb721 100644
+index 02d1e1e..912cbc8 100644
 --- a/arch/x86/kernel/traps_32.c
 +++ b/arch/x86/kernel/traps_32.c
 @@ -59,6 +59,8 @@
@@ -822,7 +822,7 @@
  #include "mach_traps.h"
  
  int panic_on_unrecovered_nmi;
-@@ -1232,10 +1234,42 @@ static void __init set_task_gate(unsigned int n, unsigned int gdt_entry)
+@@ -1130,10 +1132,42 @@ static void __init set_task_gate(unsigned int n, unsigned int gdt_entry)
  }
  
  
@@ -865,7 +865,7 @@
  #ifdef CONFIG_EISA
  	void __iomem *p = ioremap(0x0FFFD9, 4);
  	if (readl(p) == 'E'+('I'<<8)+('S'<<16)+('A'<<24)) {
-@@ -1270,6 +1304,7 @@ void __init trap_init(void)
+@@ -1168,6 +1202,7 @@ void __init trap_init(void)
  	set_trap_gate(18,&machine_check);
  #endif
  	set_trap_gate(19,&simd_coprocessor_error);
@@ -873,7 +873,7 @@
  
  	if (cpu_has_fxsr) {
  		/*
-@@ -1293,8 +1328,9 @@ void __init trap_init(void)
+@@ -1191,8 +1226,9 @@ void __init trap_init(void)
  		printk("done.\n");
  	}
  
@@ -884,7 +884,7 @@
  	/* Reserve all the builtin and the syscall vector. */
  	for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
  		set_bit(i, used_vectors);
-@@ -1304,8 +1340,9 @@ void __init trap_init(void)
+@@ -1202,8 +1238,9 @@ void __init trap_init(void)
  	 * Should be a barrier for any external CPU state.
  	 */
  	cpu_init();

linux-2.6-0021-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch:

Index: linux-2.6-0021-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0021-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0021-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0021-xen-dom0-Obvious-cpuid-fix-to-domU-handling.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From fb801e12400762fb8cab80beedaa4be854bf0e96 Mon Sep 17 00:00:00 2001
+From be19bc0bb441afb79ca35cd3ca6acfc85ba8fd9e Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Thu, 13 Dec 2007 18:00:17 +0000
 Subject: [PATCH] xen dom0: Obvious cpuid fix to domU handling.

linux-2.6-0022-xen-debug-Diagnose-bind_virq_to_irq-errors.patch:

Index: linux-2.6-0022-xen-debug-Diagnose-bind_virq_to_irq-errors.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0022-xen-debug-Diagnose-bind_virq_to_irq-errors.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0022-xen-debug-Diagnose-bind_virq_to_irq-errors.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0022-xen-debug-Diagnose-bind_virq_to_irq-errors.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 2d1568fdd5f24f8794370e75284903122096ea55 Mon Sep 17 00:00:00 2001
+From 899ea6752cc802089800394b7f3fa47d5700f523 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 7 Jan 2008 20:39:20 +0000
 Subject: [PATCH] xen debug: Diagnose bind_virq_to_irq errors

linux-2.6-0023-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch:

Index: linux-2.6-0023-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0023-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0023-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0023-xen-traps-Revert-Juan-s-traps_32.c-changes-to-debug.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From b017ec4d76818b8336e405bbbac1bc62f2444338 Mon Sep 17 00:00:00 2001
+From c9546e1dbe534fa63c6f573ee79496f4d30c6e97 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 7 Jan 2008 20:39:51 +0000
 Subject: [PATCH] xen traps: Revert Juan's traps_32.c changes to debug why they are needed.
@@ -9,7 +9,7 @@
  1 files changed, 2 insertions(+), 39 deletions(-)
 
 diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
-index 05bb721..3b0ac7e 100644
+index 912cbc8..02d1e1e 100644
 --- a/arch/x86/kernel/traps_32.c
 +++ b/arch/x86/kernel/traps_32.c
 @@ -59,8 +59,6 @@
@@ -21,7 +21,7 @@
  #include "mach_traps.h"
  
  int panic_on_unrecovered_nmi;
-@@ -1234,42 +1232,10 @@ static void __init set_task_gate(unsigned int n, unsigned int gdt_entry)
+@@ -1132,42 +1130,10 @@ static void __init set_task_gate(unsigned int n, unsigned int gdt_entry)
  }
  
  
@@ -64,7 +64,7 @@
  #ifdef CONFIG_EISA
  	void __iomem *p = ioremap(0x0FFFD9, 4);
  	if (readl(p) == 'E'+('I'<<8)+('S'<<16)+('A'<<24)) {
-@@ -1304,7 +1270,6 @@ void __init trap_init(void)
+@@ -1202,7 +1168,6 @@ void __init trap_init(void)
  	set_trap_gate(18,&machine_check);
  #endif
  	set_trap_gate(19,&simd_coprocessor_error);
@@ -72,7 +72,7 @@
  
  	if (cpu_has_fxsr) {
  		/*
-@@ -1328,9 +1293,8 @@ void __init trap_init(void)
+@@ -1226,9 +1191,8 @@ void __init trap_init(void)
  		printk("done.\n");
  	}
  
@@ -83,7 +83,7 @@
  	/* Reserve all the builtin and the syscall vector. */
  	for (i = 0; i < FIRST_EXTERNAL_VECTOR; i++)
  		set_bit(i, used_vectors);
-@@ -1340,9 +1304,8 @@ void __init trap_init(void)
+@@ -1238,9 +1202,8 @@ void __init trap_init(void)
  	 * Should be a barrier for any external CPU state.
  	 */
  	cpu_init();

linux-2.6-0024-xen-debug-Move-init_apic_mappings-after-trap-init.patch:

Index: linux-2.6-0024-xen-debug-Move-init_apic_mappings-after-trap-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0024-xen-debug-Move-init_apic_mappings-after-trap-init.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0024-xen-debug-Move-init_apic_mappings-after-trap-init.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0024-xen-debug-Move-init_apic_mappings-after-trap-init.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 5d9910acad1949a7754860667c4c02e786483f0e Mon Sep 17 00:00:00 2001
+From 2c80794ed2aa398be1e520fef75deac678289f5d Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Tue, 8 Jan 2008 15:33:44 +0000
 Subject: [PATCH] xen debug: Move init_apic_mappings() after trap initialisation.
@@ -11,10 +11,10 @@
  1 files changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
-index 3b0ac7e..e7c3922 100644
+index 02d1e1e..065ef05 100644
 --- a/arch/x86/kernel/traps_32.c
 +++ b/arch/x86/kernel/traps_32.c
-@@ -1244,10 +1244,6 @@ void __init trap_init(void)
+@@ -1142,10 +1142,6 @@ void __init trap_init(void)
  	iounmap(p);
  #endif
  
@@ -25,7 +25,7 @@
  	set_trap_gate(0,&divide_error);
  	set_intr_gate(1,&debug);
  	set_intr_gate(2,&nmi);
-@@ -1271,6 +1267,10 @@ void __init trap_init(void)
+@@ -1169,6 +1165,10 @@ void __init trap_init(void)
  #endif
  	set_trap_gate(19,&simd_coprocessor_error);
  

linux-2.6-0025-xen-debug-Trace-progress-in-trap_init-around-init.patch:

Index: linux-2.6-0025-xen-debug-Trace-progress-in-trap_init-around-init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0025-xen-debug-Trace-progress-in-trap_init-around-init.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0025-xen-debug-Trace-progress-in-trap_init-around-init.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0025-xen-debug-Trace-progress-in-trap_init-around-init.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 508af97e08ab1aa90cb5a6f1b6396e4cbf3c9c8f Mon Sep 17 00:00:00 2001
+From c91686d9991bbc428e5c460a52fd0f518001442c Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Tue, 8 Jan 2008 15:54:05 +0000
 Subject: [PATCH] xen debug: Trace progress in trap_init() around init_apic_mappings()
@@ -9,7 +9,7 @@
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/arch/x86/kernel/traps_32.c b/arch/x86/kernel/traps_32.c
-index e7c3922..8f299a8 100644
+index 065ef05..5def73a 100644
 --- a/arch/x86/kernel/traps_32.c
 +++ b/arch/x86/kernel/traps_32.c
 @@ -61,6 +61,8 @@
@@ -21,7 +21,7 @@
  int panic_on_unrecovered_nmi;
  
  DECLARE_BITMAP(used_vectors, NR_VECTORS);
-@@ -1244,6 +1246,7 @@ void __init trap_init(void)
+@@ -1142,6 +1144,7 @@ void __init trap_init(void)
  	iounmap(p);
  #endif
  
@@ -29,7 +29,7 @@
  	set_trap_gate(0,&divide_error);
  	set_intr_gate(1,&debug);
  	set_intr_gate(2,&nmi);
-@@ -1268,7 +1271,9 @@ void __init trap_init(void)
+@@ -1166,7 +1169,9 @@ void __init trap_init(void)
  	set_trap_gate(19,&simd_coprocessor_error);
  
  #ifdef CONFIG_X86_LOCAL_APIC

linux-2.6-0026-xen-apic-Disable-init_apic_mappings-when-under-CO.patch:

Index: linux-2.6-0026-xen-apic-Disable-init_apic_mappings-when-under-CO.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0026-xen-apic-Disable-init_apic_mappings-when-under-CO.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0026-xen-apic-Disable-init_apic_mappings-when-under-CO.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0026-xen-apic-Disable-init_apic_mappings-when-under-CO.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 99c0cd927046606f7d078038525d787442f31643 Mon Sep 17 00:00:00 2001
+From 604182e6e875ce0781e454ac92f29e181011db7d Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Tue, 8 Jan 2008 15:54:38 +0000
 Subject: [PATCH] xen apic: Disable init_apic_mappings() when under CONFIG_XEN

linux-2.6-0027-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch:

Index: linux-2.6-0027-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0027-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0027-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0027-xen-debug-Log-entry-into-virtual-console-s-xen_init.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 3eebd4611b43778a7a59809cecd8b71c8ba4ab37 Mon Sep 17 00:00:00 2001
+From f1f84365615d8ad3addfb3f296f7189cf46a9cdc Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Tue, 8 Jan 2008 18:42:32 +0000
 Subject: [PATCH] xen debug: Log entry into virtual console's xen_init() function

linux-2.6-0028-xen-debug-Log-bind_virq_to_irq-events.patch:

Index: linux-2.6-0028-xen-debug-Log-bind_virq_to_irq-events.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0028-xen-debug-Log-bind_virq_to_irq-events.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0028-xen-debug-Log-bind_virq_to_irq-events.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0028-xen-debug-Log-bind_virq_to_irq-events.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 5a91a9915e7fb65becd43bbeac59d09fc4e523cf Mon Sep 17 00:00:00 2001
+From b3931a12efab3226b214b6e84cff0a32233bbcc1 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Tue, 8 Jan 2008 18:43:03 +0000
 Subject: [PATCH] xen debug: Log bind_virq_to_irq events

linux-2.6-0029-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch:

Index: linux-2.6-0029-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0029-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0029-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0029-xen-debug-Work-around-USB-issue-triggered-by-Xen-de.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 44f69ec851da845860369311087433ea6f7f750b Mon Sep 17 00:00:00 2001
+From 1b3ecbf5fca1ee2b5d791daa3ab9c9f05a61183a Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 4 Feb 2008 22:10:55 +0000
 Subject: [PATCH] xen debug: Work around USB issue triggered by Xen debugging.

linux-2.6-0030-Remove-duplicated-dma_alloc-free_noncoherent-define.patch:

Index: linux-2.6-0030-Remove-duplicated-dma_alloc-free_noncoherent-define.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0030-Remove-duplicated-dma_alloc-free_noncoherent-define.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0030-Remove-duplicated-dma_alloc-free_noncoherent-define.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0030-Remove-duplicated-dma_alloc-free_noncoherent-define.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 986933e6605e1dfbe5b1dfdb1f5f406215efc5cf Mon Sep 17 00:00:00 2001
+From 2708f70fed883725128cc84493d86ab17d7df956 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 21 Jan 2008 16:18:57 +0000
 Subject: [PATCH] Remove duplicated dma_alloc/free_noncoherent #defines.

linux-2.6-0031-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch:

Index: linux-2.6-0031-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0031-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0031-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0031-xem-dom0-Add-hypervisor-memory_exchange-descriptor.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 0ea94cbcfba1217d99582a479b5e1683340f8087 Mon Sep 17 00:00:00 2001
+From ea954e8b87b2cd217661f560f46434e564021330 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Thu, 31 Jan 2008 19:26:06 +0000
 Subject: [PATCH] xem dom0: Add hypervisor memory_exchange descriptor

linux-2.6-0032-xen-dom0-add-virt_to_pfn-macro.patch:

Index: linux-2.6-0032-xen-dom0-add-virt_to_pfn-macro.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0032-xen-dom0-add-virt_to_pfn-macro.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0032-xen-dom0-add-virt_to_pfn-macro.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0032-xen-dom0-add-virt_to_pfn-macro.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 9c8475bdd4f183f5523c9c023438634cb86df51f Mon Sep 17 00:00:00 2001
+From b0fa9332a6f73136fbe95386cd1d4d0618f6cf00 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 4 Feb 2008 16:40:57 +0000
 Subject: [PATCH] xen dom0: add virt_to_pfn() macro

linux-2.6-0033-xen-dom0-use-virt_to_pfn-where-appropriate.patch:

Index: linux-2.6-0033-xen-dom0-use-virt_to_pfn-where-appropriate.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0033-xen-dom0-use-virt_to_pfn-where-appropriate.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0033-xen-dom0-use-virt_to_pfn-where-appropriate.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0033-xen-dom0-use-virt_to_pfn-where-appropriate.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 4930263799244e70071eff8810194d26c0bc2e61 Mon Sep 17 00:00:00 2001
+From fab92109c026ce97371fefd6902e2e9ad87ae4d1 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 4 Feb 2008 16:42:35 +0000
 Subject: [PATCH] xen dom0: use virt_to_pfn() where appropriate

linux-2.6-0034-xen-dom0-Add-contiguous-region-support.patch:

Index: linux-2.6-0034-xen-dom0-Add-contiguous-region-support.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0034-xen-dom0-Add-contiguous-region-support.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0034-xen-dom0-Add-contiguous-region-support.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0034-xen-dom0-Add-contiguous-region-support.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 82e3dab7c67277c9986bd2d1020be5a8a122cedf Mon Sep 17 00:00:00 2001
+From 04740509cf6a458b74dccbb063661d8af69e2800 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Thu, 31 Jan 2008 11:47:28 +0000
 Subject: [PATCH] xen dom0: Add contiguous region support.
@@ -60,7 +60,7 @@
  }
  
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 5bbdbb7..54b6275 100644
+index 5bbdbb7..7d5111b 100644
 --- a/arch/x86/xen/mmu.c
 +++ b/arch/x86/xen/mmu.c
 @@ -47,15 +47,17 @@
@@ -236,7 +236,7 @@
 +	BUG_ON (extents_in << order_in != extents_out << order_out);
 +	
 +	rc = HYPERVISOR_memory_op(XENMEM_exchange, &exchange);
-+	success = (exchange.nr_exchanged == (extents_in << order_in));
++	success = (exchange.nr_exchanged == extents_in);
 +
 +	BUG_ON(!success && ((exchange.nr_exchanged != 0) || (rc == 0)));
 +	BUG_ON(success && (rc != 0));
@@ -273,7 +273,7 @@
 +	out_frame = virt_to_pfn(vstart);
 +	success = xen_exchange_memory(1UL << order, 0, in_frames,
 +				      1, order, &out_frame,
-+				      0);
++				      address_bits);
 +
 +	/* 3. Map the new extent in place of old pages. */
 +	if (success)

linux-2.6-0035-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch:

Index: linux-2.6-0035-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0035-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0035-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0035-xen-dom0-Don-t-mask-off-PCD-bits-from-pte-entries.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 7ddc4ba1a0a61549236cba6d84abc8306382822b Mon Sep 17 00:00:00 2001
+From 0439de83bbfbcc9c8700010d17bb976de65d0f8a Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Tue, 29 Jan 2008 16:53:30 +0000
 Subject: [PATCH] xen dom0: Don't mask off PCD bits from pte entries.
@@ -18,7 +18,7 @@
  1 files changed, 0 insertions(+), 4 deletions(-)
 
 diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c
-index 54b6275..bc08a86 100644
+index 7d5111b..cb78a87 100644
 --- a/arch/x86/xen/mmu.c
 +++ b/arch/x86/xen/mmu.c
 @@ -218,8 +218,6 @@ pte_t xen_make_pte(unsigned long long pte)

linux-2.6-0036-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch:

Index: linux-2.6-0036-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0036-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0036-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0036-xen-dom0-Remove-duplicate-xen_store_interface-assig.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 1b8b253b758a9dddf00bf18dbf28e519f83d7a84 Mon Sep 17 00:00:00 2001
+From 40ad4cc40032c9d2679b5dcb568d50b7b83aff63 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 28 Jan 2008 09:32:31 +0000
 Subject: [PATCH] xen dom0: Remove duplicate xen_store_interface assignment

linux-2.6-0037-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch:

Index: linux-2.6-0037-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0037-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0037-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0037-xen-dom0-Slightly-re-arrange-xenbus_probe_init-er.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 6bbb3766d2f1d4ec8f030010ea81e8f390f4c9d6 Mon Sep 17 00:00:00 2001
+From deeac25f4182e1fdf7aeb9fe753df4b1c30c3a00 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 28 Jan 2008 09:44:46 +0000
 Subject: [PATCH] xen dom0: Slightly re-arrange xenbus_probe_init() error handling

linux-2.6-0038-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch:

Index: linux-2.6-0038-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0038-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0038-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0038-xen-dom0-Use-max_low_pfn-declaration-from-linux-boo.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 905c016ae31e9898831629dd752bfe5f95161a54 Mon Sep 17 00:00:00 2001
+From f58a97f0c481895102edf383fb06df4414eac779 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 28 Jan 2008 16:42:05 +0000
 Subject: [PATCH] xen dom0: Use max_low_pfn declaration from linux/bootmem.h

linux-2.6-0039-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch:

Index: linux-2.6-0039-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0039-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0039-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0039-xen-dma-Add-dma_mapping_ops-indirection-for-32-bit.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From facec1f45c47be4a882c25d8dd34dffd7b87b8f9 Mon Sep 17 00:00:00 2001
+From ce0cdebe107e487c48f8c437de7a747eebc510e5 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 21 Jan 2008 19:03:54 +0000
 Subject: [PATCH] xen dma: Add dma_mapping_ops indirection for 32-bit dma mappings
@@ -155,7 +155,7 @@
 +/* Must execute after PCI subsystem */
 +fs_initcall(no_iommu_init);
 diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c
-index 7287ae4..fcf1be6 100644
+index 4e8851a..daaeca4 100644
 --- a/arch/x86/mm/init_32.c
 +++ b/arch/x86/mm/init_32.c
 @@ -31,6 +31,7 @@

linux-2.6-0040-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch:

Index: linux-2.6-0040-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0040-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0040-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0040-xen-dma-Remove-unused-32-bit-dma_ops-map_simple-me.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 213e0e2c49eeaf47fa466eaf55bdf067d7e4b320 Mon Sep 17 00:00:00 2001
+From b9546492cbc920f411b3f746da8aa4011ca63d46 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Mon, 21 Jan 2008 22:51:56 +0000
 Subject: [PATCH] xen dma: Remove unused 32-bit dma_ops->map_simple method

linux-2.6-0041-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch:

Index: linux-2.6-0041-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0041-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0041-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0041-xen-dma-Initial-commit-of-pci-xen.c-dma-mapping-fun.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 15257ab609ca909111c424377a331d95e8739c65 Mon Sep 17 00:00:00 2001
+From 4560bb78b32b7057c1df0bad9e9a89ee103ff316 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Tue, 22 Jan 2008 17:01:48 +0000
 Subject: [PATCH] xen dma: Initial commit of pci-xen.c dma mapping functions.

linux-2.6-0042-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch:

Index: linux-2.6-0042-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0042-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0042-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0042-xen-dma-Add-calls-to-dma_ops-alloc-free_coherent-ho.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 0f4965d087c23fa5d3c351724003aecb5881e037 Mon Sep 17 00:00:00 2001
+From 1f80ce118d09ee1d7936ba86d2b96ace0ba26fa3 Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Wed, 30 Jan 2008 21:53:48 +0000
 Subject: [PATCH] xen dma: Add calls to dma_ops alloc/free_coherent hooks.

linux-2.6-0043-xen-dma-Add-xen_alloc-free_coherent.patch:

Index: linux-2.6-0043-xen-dma-Add-xen_alloc-free_coherent.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0043-xen-dma-Add-xen_alloc-free_coherent.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0043-xen-dma-Add-xen_alloc-free_coherent.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0043-xen-dma-Add-xen_alloc-free_coherent.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From f33c0f237ea698a756b4c04926c09c407a731705 Mon Sep 17 00:00:00 2001
+From 5e2cc85e6c7dca8d31ad403ed18ad1a4142f9f7d Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Thu, 31 Jan 2008 11:49:04 +0000
 Subject: [PATCH] xen dma: Add xen_alloc/free_coherent

linux-2.6-0044-xen-dma-Don-t-merge-bios-on-xen-pvops.patch:

Index: linux-2.6-0044-xen-dma-Don-t-merge-bios-on-xen-pvops.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0044-xen-dma-Don-t-merge-bios-on-xen-pvops.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0044-xen-dma-Don-t-merge-bios-on-xen-pvops.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0044-xen-dma-Don-t-merge-bios-on-xen-pvops.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From ac9db3990366b613147e45bd0e7ceb4cc4501854 Mon Sep 17 00:00:00 2001
+From 5594b9bc7cf4a18381ae1d993b395870352a50ac Mon Sep 17 00:00:00 2001
 From: Stephen Tweedie <sct at redhat.com>
 Date: Fri, 1 Feb 2008 18:04:53 +0000
 Subject: [PATCH] xen dma: Don't merge bios on xen pvops.

linux-2.6-0045-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch:

Index: linux-2.6-0045-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0045-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0045-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0045-xen-dom0-Minor-coding-style-issue-in-ISA-mapping-co.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From f834f38a5c22552015cc00dbc64139cada2c2610 Mon Sep 17 00:00:00 2001
+From ee8d6210aeec8ed737ee60339cd6e9cf57dfcb48 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 1 Feb 2008 10:15:18 +0000
 Subject: [PATCH] xen dom0: Minor coding style issue in ISA mapping code

linux-2.6-0046-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch:

Index: linux-2.6-0046-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0046-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0046-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0046-xen-dom0-Use-i-PAGE_SHIFT-instead-of-PAGE_DOWN-i.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 93ffa1eae323db8e86c4277bb627f993ea7c84bd Mon Sep 17 00:00:00 2001
+From a29342abaafcd6ae0ffa033a6c998f6f38fecc15 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 1 Feb 2008 10:17:05 +0000
 Subject: [PATCH] xen dom0: Use i >> PAGE_SHIFT instead of PAGE_DOWN(i)

linux-2.6-0047-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch:

Index: linux-2.6-0047-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0047-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0047-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch	18 Feb 2008 16:55:16 -0000	1.1.2.1
+++ linux-2.6-0047-xen-dom0-Match-up-set_pte_mfn-prototype-with-the.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 2db238704dd7015ef03bc6d070da5b73b4c64cec Mon Sep 17 00:00:00 2001
+From 0a4883f1aee1d96eff63441decd6332bb5cf1786 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 1 Feb 2008 10:19:02 +0000
 Subject: [PATCH] xen dom0: Match up set_pte_mfn() prototype with the impl

linux-2.6-0048-xen-dom0-Reserve-ISA-address-space-earlier.patch:

Index: linux-2.6-0048-xen-dom0-Reserve-ISA-address-space-earlier.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0048-xen-dom0-Reserve-ISA-address-space-earlier.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0048-xen-dom0-Reserve-ISA-address-space-earlier.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0048-xen-dom0-Reserve-ISA-address-space-earlier.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 34721eeb0f38e7fe8567a47bc9aa0f3328b55d52 Mon Sep 17 00:00:00 2001
+From fc47eedfde2ff4f4567e4f5359af078948b63307 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Fri, 1 Feb 2008 15:08:26 +0000
 Subject: [PATCH] xen dom0: Reserve ISA address space earlier

linux-2.6-0049-xen-Add-empty-xenctrl-module.patch:

Index: linux-2.6-0049-xen-Add-empty-xenctrl-module.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0049-xen-Add-empty-xenctrl-module.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0049-xen-Add-empty-xenctrl-module.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0049-xen-Add-empty-xenctrl-module.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 8a2b660e6a45e4f441cbf163df2501b0bd8ecb63 Mon Sep 17 00:00:00 2001
+From a8b60f6d8fe020ff1b6329c1973cb18a4714c747 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 4 Feb 2008 08:30:37 +0000
 Subject: [PATCH] xen: Add empty xenctrl module

linux-2.6-0050-xen-dom0-Add-proc-xen-capabilities.patch:

Index: linux-2.6-0050-xen-dom0-Add-proc-xen-capabilities.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0050-xen-dom0-Add-proc-xen-capabilities.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0050-xen-dom0-Add-proc-xen-capabilities.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0050-xen-dom0-Add-proc-xen-capabilities.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From ff8d1ce07961633c01846fc746c863bca53550df Mon Sep 17 00:00:00 2001
+From 3ff3725d22ff3af1ad7e8114225fb5e1e65432a7 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 4 Feb 2008 09:16:51 +0000
 Subject: [PATCH] xen dom0: Add /proc/xen/capabilities

linux-2.6-0051-xen-Add-proc-xen-privcmd.patch:

Index: linux-2.6-0051-xen-Add-proc-xen-privcmd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0051-xen-Add-proc-xen-privcmd.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0051-xen-Add-proc-xen-privcmd.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0051-xen-Add-proc-xen-privcmd.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 2148d579f8673c6cb4cd66110d0105543c22157d Mon Sep 17 00:00:00 2001
+From d6d2e0bd059b9a62fe640e33fda1d632815ad9bb Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 4 Feb 2008 08:24:57 +0000
 Subject: [PATCH] xen: Add /proc/xen/privcmd

linux-2.6-0052-xen-dom0-Add-proc-xen-xsd_-port-kva.patch:

Index: linux-2.6-0052-xen-dom0-Add-proc-xen-xsd_-port-kva.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0052-xen-dom0-Add-proc-xen-xsd_-port-kva.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0052-xen-dom0-Add-proc-xen-xsd_-port-kva.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0052-xen-dom0-Add-proc-xen-xsd_-port-kva.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 859171fe39c21fbff963c9fb9afa1996e9dcc942 Mon Sep 17 00:00:00 2001
+From 25f3059f2c65fed4bb9e4b05aa72984b8fb6b5e4 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 4 Feb 2008 10:29:28 +0000
 Subject: [PATCH] xen dom0: Add /proc/xen/xsd_{port,kva}

linux-2.6-0053-xen-Add-proc-xen-xenbus.patch:

Index: linux-2.6-0053-xen-Add-proc-xen-xenbus.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0053-xen-Add-proc-xen-xenbus.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0053-xen-Add-proc-xen-xenbus.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0053-xen-Add-proc-xen-xenbus.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 3d5825ae92d8c5b59448a51d818c4b049b414e4f Mon Sep 17 00:00:00 2001
+From 2cbaac34e9bebf0449856baf318ebdf5aea74e3f Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 4 Feb 2008 22:04:36 +0000
 Subject: [PATCH] xen: Add /proc/xen/xenbus

linux-2.6-0054-xen-Add-dev-xen-evtchn.patch:

Index: linux-2.6-0054-xen-Add-dev-xen-evtchn.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0054-xen-Add-dev-xen-evtchn.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0054-xen-Add-dev-xen-evtchn.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0054-xen-Add-dev-xen-evtchn.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 6c6205cc795e06cbfc9bad5d54ce4dbb3984de95 Mon Sep 17 00:00:00 2001
+From d19d1a0bef07facbab7154e793716174f274484d Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 4 Feb 2008 08:25:31 +0000
 Subject: [PATCH] xen: Add /dev/xen/evtchn

linux-2.6-0055-xen-Add-__init-__exit-notations-to-xenctrl-function.patch:

Index: linux-2.6-0055-xen-Add-__init-__exit-notations-to-xenctrl-function.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0055-xen-Add-__init-__exit-notations-to-xenctrl-function.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0055-xen-Add-__init-__exit-notations-to-xenctrl-function.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0055-xen-Add-__init-__exit-notations-to-xenctrl-function.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From ad1aeb74ebf2d336685a7d2f0ffb623ca174ebc5 Mon Sep 17 00:00:00 2001
+From 930f710fe79bf8983f7fb968cc698a2d5e6a9ff2 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 7 Feb 2008 15:37:30 +0000
 Subject: [PATCH] xen: Add __init/__exit notations to xenctrl function

linux-2.6-0056-xen-Add-Xen-s-sys-hypervisor-interface.patch:

Index: linux-2.6-0056-xen-Add-Xen-s-sys-hypervisor-interface.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0056-xen-Add-Xen-s-sys-hypervisor-interface.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0056-xen-Add-Xen-s-sys-hypervisor-interface.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0056-xen-Add-Xen-s-sys-hypervisor-interface.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 4cb49c6a7650381ba772fe3ee401d55cf934601c Mon Sep 17 00:00:00 2001
+From 04611157ddb9c46cb18efcefe9d066d0661b0bb0 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 7 Feb 2008 15:32:28 +0000
 Subject: [PATCH] xen: Add Xen's /sys/hypervisor interface

linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch:

Index: linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0057-xen-dom0-Add-basic-proc-xen-balloon.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From a5c0567769e088973ab955040d407834f51bcb2a Mon Sep 17 00:00:00 2001
+From dcf4c24006629769a2a292dbc4a0cb364e0459c0 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 7 Feb 2008 19:11:54 +0000
 Subject: [PATCH] xen dom0: Add basic /proc/xen/balloon

linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch:

Index: linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0058-xen-dom0-Re-work-privcmd_ioctl-a-little.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From 9ee1b3b4d416e0ab0b312df334460c84de42be9a Mon Sep 17 00:00:00 2001
+From d3c6c6f5e5dd350b0dbd86a53dd77ef888ac6f8b Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Mon, 11 Feb 2008 11:23:54 +0000
 Subject: [PATCH] xen dom0: Re-work privcmd_ioctl() a little

linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch:

Index: linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch	18 Feb 2008 16:55:17 -0000	1.1.2.1
+++ linux-2.6-0059-xen-dom0-Add-IOCTL_PRIVCMD_MMAP.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From c647aacea518e0a0b0358a04576a33aca697683b Mon Sep 17 00:00:00 2001
+From 8cced17ecf4d3f358b1e2cceeabc830c367a2c1b Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Thu, 7 Feb 2008 19:05:10 +0000
 Subject: [PATCH] xen dom0: Add IOCTL_PRIVCMD_MMAP

linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch:

Index: linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel-xen-2.6/devel/Attic/linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch	19 Feb 2008 16:05:29 -0000	1.1.2.1
+++ linux-2.6-0060-xen-dom0-Add-a-vmlinuz-target.patch	20 Feb 2008 15:34:17 -0000	1.1.2.2
@@ -1,4 +1,4 @@
-From fb3b534913680df3caeed83f54094d047c248785 Mon Sep 17 00:00:00 2001
+From 213daf8c2526df1f5b4a9b4bd04105875ed73d42 Mon Sep 17 00:00:00 2001
 From: Mark McLoughlin <markmc at redhat.com>
 Date: Tue, 19 Feb 2008 15:34:32 +0000
 Subject: [PATCH] xen dom0: Add a vmlinuz target


