rpms/kernel/devel kernel-2.6.spec, 1.2149, 1.2150 linux-2.6-devmem-xen.patch, 1.2, 1.3 linux-2.6-xen-compile-fixes.patch, 1.7, 1.8 linux-2.6-xen.patch, 1.12, 1.13
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Sat Apr 22 17:48:33 UTC 2006
Author: quintela
Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv5293
Modified Files:
kernel-2.6.spec linux-2.6-devmem-xen.patch
linux-2.6-xen-compile-fixes.patch linux-2.6-xen.patch
Log Message:
rebase xen & enable it
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/kernel-2.6.spec,v
retrieving revision 1.2149
retrieving revision 1.2150
diff -u -r1.2149 -r1.2150
--- kernel-2.6.spec 21 Apr 2006 18:11:05 -0000 1.2149
+++ kernel-2.6.spec 22 Apr 2006 17:48:28 -0000 1.2150
@@ -7,7 +7,7 @@
%define buildsmp 0
%define buildpae 0
# Whether to apply the Xen patches, leave this enabled.
-%define includexen 0
+%define includexen 1
# Whether to build the Xen kernels, disable if you want.
%define buildxen 1
%define buildxenPAE 0
@@ -781,8 +781,9 @@
#
# ... and back out all the ia64-specific sections, as they currently prevent
# non-xen builds from working.
+# Now also with tpm
#
-for f in `find arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
+for f in `find drivers/char/tpm arch/ia64/ include/asm-ia64/ include/xen/interface/arch-ia64.h* -type f -name "*.p.xen"` ; do \
g=`dirname $f`/`basename $f .p.xen`; \
mv "$f" "$g"; \
if [ ! -s "$g" ] ; then rm -f "$g" ; fi; \
@@ -1659,6 +1660,11 @@
%endif
%changelog
+* Sat Apr 22 2006 Juan Quintela <quintela at redhat.com>
+- rebase xen.
+- fix x86_64 xen (thanks chris).
+- enable xen again.
+
* Fri Apr 21 2006 Dave Jones <davej at redhat.com>
- Make Promise PATA on SATA work again (thanks Jim Bevier)
- 2.6.17rc2-git4
linux-2.6-devmem-xen.patch:
arch/i386/mm/init-xen.c | 11 +++++++++++
arch/x86_64/mm/init-xen.c | 26 ++++++++++++++++++++++++++
include/asm-i386/mach-xen/asm/page.h | 1 +
include/asm-x86_64/mach-xen/asm/page.h | 4 ++++
4 files changed, 42 insertions(+)
Index: linux-2.6-devmem-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-devmem-xen.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- linux-2.6-devmem-xen.patch 14 Apr 2006 18:11:39 -0000 1.2
+++ linux-2.6-devmem-xen.patch 22 Apr 2006 17:48:28 -0000 1.3
@@ -19,22 +19,6 @@
#ifdef CONFIG_HIGHMEM
pte_t *kmap_pte;
pgprot_t kmap_prot;
-@@ -734,6 +745,7 @@ void __init mem_init(void)
- * Specifically, in the case of x86, we will always add
- * memory to the highmem for now.
- */
-+#ifdef CONFIG_HOTPLUG_MEMORY
- #ifndef CONFIG_NEED_MULTIPLE_NODES
- int add_memory(u64 start, u64 size)
- {
-@@ -750,6 +762,7 @@ int remove_memory(u64 start, u64 size)
- return -EINVAL;
- }
- #endif
-+#endif
-
- kmem_cache_t *pgd_cache;
- kmem_cache_t *pmd_cache;
diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.orig/arch/x86_64/mm/init-xen.c linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c
--- linux-2.6.16.orig/arch/x86_64/mm/init-xen.c 2006-04-13 14:19:58.000000000 +0200
+++ linux-2.6.16.noarch/arch/x86_64/mm/init-xen.c 2006-04-13 16:16:23.000000000 +0200
linux-2.6-xen-compile-fixes.patch:
arch/i386/kernel/acpi/boot-xen.c | 3 +-
arch/x86_64/kernel/head-xen.S | 1
linux-2.6.15.xen/arch/i386/kernel/smp-xen.c | 1
linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c | 2 +
linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c | 6 ----
linux-2.6.15.xen/arch/x86_64/mm/fault-xen.c | 2 -
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/desc.h | 14 +++++++++++
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/mmu.h | 7 +++++
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/pgalloc.h | 1
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/processor.h | 7 ++++-
linux-2.6.15.xen/include/asm-i386/mach-xen/asm/swiotlb.h | 1
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgalloc.h | 7 +++++
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/pgtable.h | 2 -
linux-2.6.15.xen/include/asm-x86_64/mach-xen/asm/processor.h | 2 +
linux-2.6.16.noarch/include/asm-x86_64/ipi.h | 2 +
linux-2.6.16.work/arch/x86_64/ia32/Makefile | 2 -
16 files changed, 49 insertions(+), 11 deletions(-)
Index: linux-2.6-xen-compile-fixes.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen-compile-fixes.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- linux-2.6-xen-compile-fixes.patch 14 Apr 2006 20:49:32 -0000 1.7
+++ linux-2.6-xen-compile-fixes.patch 22 Apr 2006 17:48:28 -0000 1.8
@@ -1,14 +1,3 @@
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/mm/init-xen.c linux-2.6.15.xen/arch/i386/mm/init-xen.c
---- linux-2.6.15.orig/arch/i386/mm/init-xen.c 2006-02-22 15:56:24.000000000 +0100
-+++ linux-2.6.15.xen/arch/i386/mm/init-xen.c 2006-02-22 18:56:27.000000000 +0100
-@@ -34,6 +34,7 @@
- #include <asm/system.h>
- #include <asm/uaccess.h>
- #include <asm/pgtable.h>
-+#include <asm-i386/mach-xen/asm/swiotlb.h>
- #include <asm/dma.h>
- #include <asm/fixmap.h>
- #include <asm/e820.h>
diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c
--- linux-2.6.15.orig/arch/x86_64/kernel/process-xen.c 2006-02-22 15:56:20.000000000 +0100
+++ linux-2.6.15.xen/arch/x86_64/kernel/process-xen.c 2006-02-22 18:32:50.000000000 +0100
@@ -170,19 +159,6 @@
/* This decides where the kernel will search for a free chunk of vm
* space during mmap's.
*/
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/Makefile linux-2.6.15.xen/arch/i386/kernel/Makefile
---- linux-2.6.15.orig/arch/i386/kernel/Makefile 2006-02-22 15:56:20.000000000 +0100
-+++ linux-2.6.15.xen/arch/i386/kernel/Makefile 2006-02-22 17:08:31.000000000 +0100
-@@ -83,8 +83,7 @@ $(obj)/built-in.o: ld_flags += -R $(obj)
-
- SYSCFLAGS_vsyscall-syms.o = -r
- $(obj)/vsyscall-syms.o: $(src)/vsyscall.lds \
-- $(foreach F,$(VSYSCALL_TYPES-y),$(obj)/vsyscall-$F.o) \
-- $(obj)/$(vsyscall_note) FORCE
-+ $(obj)/vsyscall-sysenter.o $(obj)/$(vsyscall_note) FORCE
- $(call if_changed,syscall)
-
- ifdef CONFIG_XEN
diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff linux-2.6.15.orig/arch/i386/kernel/smp-xen.c linux-2.6.15.xen/arch/i386/kernel/smp-xen.c
--- linux-2.6.15.orig/arch/i386/kernel/smp-xen.c 2006-02-22 15:56:21.000000000 +0100
+++ linux-2.6.15.xen/arch/i386/kernel/smp-xen.c 2006-02-22 18:29:12.000000000 +0100
@@ -194,16 +170,6 @@
#if 0
#include <mach_apic.h>
#endif
---- linux-2.6.15.ia64/fs/Kconfig~ 2006-02-24 14:14:42.000000000 -0500
-+++ linux-2.6.15.ia64/fs/Kconfig 2006-02-24 14:38:17.000000000 -0500
-@@ -841,7 +841,6 @@
- config HUGETLBFS
- bool "HugeTLB file system support"
- depends X86 || IA64 || PPC64 || SPARC64 || SUPERH || BROKEN
-- depends !XEN
-
- config HUGETLB_PAGE
- def_bool HUGETLBFS
diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c
--- kernel-2.6.15/linux-2.6.15.noarch/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:47:11.000000000 +0100
+++ linux-2.6.15.xen/arch/x86_64/kernel/pmtimer.c 2006-02-28 22:37:45.000000000 +0100
@@ -231,92 +197,6 @@
return 0;
}
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.works/arch/x86_64/ia32/ia32entry-xen.S linux-2.6.16.noarch/arch/x86_64/ia32/ia32entry-xen.S
---- linux-2.6.16.works/arch/x86_64/ia32/ia32entry-xen.S 2006-04-13 14:19:58.000000000 +0200
-+++ linux-2.6.16.noarch/arch/x86_64/ia32/ia32entry-xen.S 2006-04-13 20:12:17.000000000 +0200
-@@ -17,6 +17,8 @@
-
- #define __XEN_X86_64 1
-
-+#define IA32_NR_syscalls ((ia32_syscall_end - ia32_sys_call_table)/8)
-+
- .macro IA32_ARG_FIXUP noebp=0
- movl %edi,%r8d
- .if \noebp
-@@ -127,8 +129,8 @@ ENTRY(ia32_sysenter_target)
- CFI_REMEMBER_STATE
- jnz sysenter_tracesys
- sysenter_do_call:
-- cmpl $(IA32_NR_syscalls),%eax
-- jae ia32_badsys
-+ cmpl $(IA32_NR_syscalls-1),%eax
-+ ja ia32_badsys
- IA32_ARG_FIXUP 1
- call *ia32_sys_call_table(,%rax,8)
- movq %rax,RAX-ARGOFFSET(%rsp)
-@@ -231,8 +233,8 @@ ENTRY(ia32_cstar_target)
- CFI_REMEMBER_STATE
- jnz cstar_tracesys
- cstar_do_call:
-- cmpl $IA32_NR_syscalls,%eax
-- jae ia32_badsys
-+ cmpl $IA32_NR_syscalls-1,%eax
-+ ja ia32_badsys
- IA32_ARG_FIXUP 1
- call *ia32_sys_call_table(,%rax,8)
- movq %rax,RAX-ARGOFFSET(%rsp)
-@@ -323,8 +325,8 @@ ENTRY(ia32_syscall)
- testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10)
- jnz ia32_tracesys
- ia32_do_syscall:
-- cmpl $(IA32_NR_syscalls),%eax
-- jae ia32_badsys
-+ cmpl $(IA32_NR_syscalls-1),%eax
-+ ja ia32_badsys
- IA32_ARG_FIXUP
- call *ia32_sys_call_table(,%rax,8) # xxx: rip relative
- ia32_sysret:
-@@ -718,6 +720,3 @@ ia32_sys_call_table:
- .quad compat_sys_set_robust_list
- .quad compat_sys_get_robust_list
- ia32_syscall_end:
-- .rept IA32_NR_syscalls-(ia32_syscall_end-ia32_sys_call_table)/8
-- .quad ni_syscall
-- .endr
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c
---- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-04-13 23:58:07.000000000 +0200
-+++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_tcp.c 2006-04-14 19:39:59.000000000 +0200
-@@ -129,9 +129,12 @@ tcp_manip_pkt(struct sk_buff **pskb,
- if (hdrsize < sizeof(*hdr))
- return 1;
-
-+#ifdef CONFIG_XEN
- if ((*pskb)->proto_csum_blank) {
- hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+ } else
-+#endif
-+ {
-- } else {
- hdr->check = ip_nat_cheat_check(~oldip, newip,
- ip_nat_cheat_check(oldport ^ 0xFFFF,
- newport,
-diff -urNp --exclude-from=/home/mitica/quintela/config/misc/dontdiff linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c
---- linux-2.6.16.i686/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-04-13 23:58:39.000000000 +0200
-+++ linux-2.6.16.noarch/net/ipv4/netfilter/ip_nat_proto_udp.c 2006-04-14 19:39:59.000000000 +0200
-@@ -114,9 +114,12 @@ udp_manip_pkt(struct sk_buff **pskb,
- portptr = &hdr->dest;
- }
- if (hdr->check) { /* 0 is a special case meaning no checksum */
-+#ifdef CONFIG_XEN
- if ((*pskb)->proto_csum_blank) {
- hdr->check = ip_nat_cheat_check(oldip, ~newip, hdr->check);
-+ } else
-+#endif
-+ {
-- } else {
- hdr->check = ip_nat_cheat_check(~oldip, newip,
- ip_nat_cheat_check(*portptr ^ 0xFFFF,
- newport,
diff linux-2.6.16.nowork/include/asm-x86_64/ipi.h linux-2.6.16.noarch/include/asm-x86_64/ipi.h
--- linux-2.6.16.nowork/include/asm-x86_64/ipi.h 2006-03-20 06:53:29.000000000 +0100
+++ linux-2.6.16.noarch/include/asm-x86_64/ipi.h 2006-04-14 21:46:59.000000000 +0200
@@ -335,3 +215,26 @@
+#endif
#endif /* __ASM_IPI_H */
+diff -r c68722b17299 arch/x86_64/kernel/head-xen.S
+--- a/arch/x86_64/kernel/head-xen.S Wed Apr 19 11:47:47 2006 +0100
++++ b/arch/x86_64/kernel/head-xen.S Fri Apr 21 19:32:49 2006 -0400
+@@ -23,6 +23,7 @@
+ #include <asm/cache.h>
+
+ .text
++ .section .bootstrap.text
+ .code64
+ .globl startup_64
+ startup_64:
+diff -urNp --exclude-from=/home/quintela/old/config/misc/dontdiff linux-2.6.16.noarch/arch/x86_64/ia32/Makefile linux-2.6.16.work/arch/x86_64/ia32/Makefile
+--- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-04-22 19:19:42.000000000 +0200
++++ linux-2.6.16.work/arch/x86_64/ia32/Makefile 2006-04-21 19:36:31.000000000 +0200
+@@ -26,7 +26,7 @@ quiet_cmd_syscall = SYSCALL $@
+ -Wl,-soname=linux-gate.so.1 -o $@ \
+ -Wl,-T,$(filter-out FORCE,$^)
+
+-$(obj)/vsyscall-int80.so
++$(obj)/vsyscall-int80.so \
+ $(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
+ $(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
+ $(call if_changed,syscall)
linux-2.6-xen.patch:
i386/arch/i386/Kconfig | 99
i386/arch/i386/Kconfig.cpu | 2
i386/arch/i386/Kconfig.debug | 1
i386/arch/i386/Makefile | 24
i386/arch/i386/boot-xen/Makefile | 21
i386/arch/i386/kernel/Makefile | 30
i386/arch/i386/kernel/acpi/Makefile | 4
i386/arch/i386/kernel/acpi/boot-xen.c | 1170 ++++++
i386/arch/i386/kernel/apic-xen.c | 160
i386/arch/i386/kernel/asm-offsets.c | 5
i386/arch/i386/kernel/cpu/Makefile | 5
i386/arch/i386/kernel/cpu/common-xen.c | 732 ++++
i386/arch/i386/kernel/cpu/mtrr/Makefile | 7
i386/arch/i386/kernel/cpu/mtrr/main-xen.c | 197 +
i386/arch/i386/kernel/early_printk-xen.c | 2
i386/arch/i386/kernel/entry-xen.S | 880 ++++
i386/arch/i386/kernel/entry.S | 4
i386/arch/i386/kernel/fixup.c | 96
i386/arch/i386/kernel/head-xen.S | 171
i386/arch/i386/kernel/init_task-xen.c | 51
i386/arch/i386/kernel/io_apic-xen.c | 2744 +++++++++++++++
i386/arch/i386/kernel/ioport-xen.c | 122
i386/arch/i386/kernel/irq-xen.c | 306 +
i386/arch/i386/kernel/irq.c | 4
i386/arch/i386/kernel/ldt-xen.c | 269 +
i386/arch/i386/kernel/microcode-xen.c | 148
i386/arch/i386/kernel/mpparse-xen.c | 1176 ++++++
i386/arch/i386/kernel/pci-dma-xen.c | 344 +
i386/arch/i386/kernel/process-xen.c | 824 ++++
i386/arch/i386/kernel/quirks-xen.c | 48
i386/arch/i386/kernel/setup-xen.c | 1854 ++++++++++
i386/arch/i386/kernel/smp-xen.c | 613 +++
i386/arch/i386/kernel/swiotlb.c | 674 +++
i386/arch/i386/kernel/sysenter.c | 90
i386/arch/i386/kernel/time-xen.c | 1097 +++++
i386/arch/i386/kernel/traps-xen.c | 1137 ++++++
i386/arch/i386/kernel/traps.c | 9
i386/arch/i386/kernel/vm86.c | 8
i386/arch/i386/kernel/vsyscall-note-xen.S | 32
i386/arch/i386/kernel/vsyscall.S | 2
i386/arch/i386/mach-xen/Makefile | 5
i386/arch/i386/mach-xen/setup.c | 49
i386/arch/i386/mm/Makefile | 8
i386/arch/i386/mm/fault-xen.c | 683 +++
i386/arch/i386/mm/highmem-xen.c | 123
i386/arch/i386/mm/hypervisor.c | 424 ++
i386/arch/i386/mm/init-xen.c | 882 ++++
i386/arch/i386/mm/ioremap-xen.c | 486 ++
i386/arch/i386/mm/pageattr.c | 2
i386/arch/i386/mm/pgtable-xen.c | 652 +++
i386/arch/i386/mm/pgtable.c | 12
i386/arch/i386/oprofile/Makefile | 4
i386/arch/i386/oprofile/xenoprof.c | 441 ++
i386/arch/i386/pci/Makefile | 9
i386/arch/i386/pci/irq-xen.c | 1205 ++++++
i386/arch/i386/pci/pcifront.c | 55
i386/arch/i386/power/Makefile | 4
i386/arch/ia64/Kconfig | 51
i386/arch/ia64/Makefile | 16
i386/arch/ia64/hp/sim/Makefile | 2
i386/arch/ia64/kernel/entry.S | 32
i386/arch/ia64/kernel/head.S | 6
i386/arch/ia64/kernel/pal.S | 5
i386/arch/ia64/kernel/sal.c | 3
i386/arch/ia64/kernel/setup.c | 32
i386/arch/ia64/xen/Makefile | 5
i386/arch/ia64/xen/drivers/Makefile | 20
i386/arch/ia64/xen/drivers/README | 2
i386/arch/ia64/xen/drivers/coreMakefile | 26
i386/arch/ia64/xen/drivers/evtchn_ia64.c | 273 +
i386/arch/ia64/xen/drivers/patches/blkback.c.patch | 33
i386/arch/ia64/xen/drivers/patches/console.c.patch | 11
i386/arch/ia64/xen/drivers/patches/devmem.c.patch | 2
i386/arch/ia64/xen/drivers/patches/gnttab.c.patch | 33
i386/arch/ia64/xen/drivers/patches/privcmd.c.patch | 30
i386/arch/ia64/xen/drivers/xenia64_init.c | 55
i386/arch/ia64/xen/hypercall.S | 365 +
i386/arch/ia64/xen/xen_ksyms.c | 12
i386/arch/ia64/xen/xenconsole.c | 19
i386/arch/ia64/xen/xenentry.S | 850 ++++
i386/arch/ia64/xen/xenhpski.c | 19
i386/arch/ia64/xen/xenivt.S | 2032 +++++++++++
i386/arch/ia64/xen/xenminstate.h | 367 ++
i386/arch/ia64/xen/xenpal.S | 73
i386/arch/ia64/xen/xensetup.S | 35
i386/arch/um/kernel/physmem.c | 4
i386/arch/x86_64/Kconfig | 60
i386/arch/x86_64/Makefile | 20
i386/arch/x86_64/ia32/ia32entry-xen.S | 725 +++
i386/arch/x86_64/ia32/syscall32-xen.c | 128
i386/arch/x86_64/ia32/syscall32_syscall-xen.S | 28
i386/arch/x86_64/ia32/vsyscall-int80.S | 58
i386/arch/x86_64/ia32/vsyscall-sigreturn.S | 2
i386/arch/x86_64/kernel/Makefile | 20
i386/arch/x86_64/kernel/acpi/Makefile | 1
i386/arch/x86_64/kernel/apic-xen.c | 198 +
i386/arch/x86_64/kernel/asm-offsets.c | 2
i386/arch/x86_64/kernel/e820-xen.c | 777 ++++
i386/arch/x86_64/kernel/early_printk-xen.c | 304 +
i386/arch/x86_64/kernel/entry-xen.S | 1141 ++++++
i386/arch/x86_64/kernel/entry.S | 2
i386/arch/x86_64/kernel/genapic-xen.c | 144
i386/arch/x86_64/kernel/genapic_xen.c | 162
i386/arch/x86_64/kernel/head-xen.S | 163
i386/arch/x86_64/kernel/head64-xen.c | 140
i386/arch/x86_64/kernel/init_task.c | 3
i386/arch/x86_64/kernel/io_apic-xen.c | 2231 ++++++++++++
i386/arch/x86_64/kernel/ioport-xen.c | 58
i386/arch/x86_64/kernel/irq-xen.c | 163
i386/arch/x86_64/kernel/irq.c | 4
i386/arch/x86_64/kernel/ldt-xen.c | 282 +
i386/arch/x86_64/kernel/mpparse-xen.c | 1002 +++++
i386/arch/x86_64/kernel/pci-swiotlb-xen.c | 54
i386/arch/x86_64/kernel/process-xen.c | 802 ++++
i386/arch/x86_64/kernel/setup-xen.c | 1679 +++++++++
i386/arch/x86_64/kernel/setup64-xen.c | 360 +
i386/arch/x86_64/kernel/smp-xen.c | 596 +++
i386/arch/x86_64/kernel/smp.c | 4
i386/arch/x86_64/kernel/traps-xen.c | 1025 +++++
i386/arch/x86_64/kernel/vsyscall-xen.c | 239 +
i386/arch/x86_64/kernel/x8664_ksyms-xen.c | 155
i386/arch/x86_64/kernel/xen_entry.S | 40
i386/arch/x86_64/mm/Makefile | 10
i386/arch/x86_64/mm/fault-xen.c | 644 +++
i386/arch/x86_64/mm/init-xen.c | 1176 ++++++
i386/arch/x86_64/mm/pageattr-xen.c | 390 ++
i386/arch/x86_64/oprofile/Makefile | 5
i386/arch/x86_64/pci/Makefile | 12
i386/drivers/Makefile | 1
i386/drivers/acpi/Kconfig | 3
i386/drivers/char/mem.c | 6
i386/drivers/char/tpm/Kconfig | 14
i386/drivers/char/tpm/Makefile | 1
i386/drivers/char/tpm/tpm.c | 44
i386/drivers/char/tpm/tpm.h | 7
i386/drivers/char/tpm/tpm_atmel.c | 230 -
i386/drivers/char/tpm/tpm_nsc.c | 395 --
i386/drivers/char/tpm/tpm_xen.c | 536 ++
i386/drivers/char/tty_io.c | 7
i386/drivers/firmware/Kconfig | 2
i386/drivers/pci/Kconfig | 1
i386/drivers/serial/Kconfig | 1
i386/drivers/video/Kconfig | 2
i386/drivers/xen/Kconfig | 223 +
i386/drivers/xen/Makefile | 22
i386/drivers/xen/balloon/Makefile | 2
i386/drivers/xen/balloon/balloon.c | 592 +++
i386/drivers/xen/blkback/Makefile | 3
i386/drivers/xen/blkback/blkback.c | 597 +++
i386/drivers/xen/blkback/common.h | 145
i386/drivers/xen/blkback/interface.c | 181
i386/drivers/xen/blkback/vbd.c | 126
i386/drivers/xen/blkback/xenbus.c | 421 ++
i386/drivers/xen/blkfront/Kconfig | 6
i386/drivers/xen/blkfront/Makefile | 5
i386/drivers/xen/blkfront/blkfront.c | 819 ++++
i386/drivers/xen/blkfront/block.h | 165
i386/drivers/xen/blkfront/vbd.c | 327 +
i386/drivers/xen/blktap/Makefile | 3
i386/drivers/xen/blktap/blktap.c | 910 ++++
i386/drivers/xen/blktap/common.h | 110
i386/drivers/xen/blktap/interface.c | 143
i386/drivers/xen/blktap/xenbus.c | 233 +
i386/drivers/xen/char/Makefile | 2
i386/drivers/xen/char/mem.c | 192 +
i386/drivers/xen/console/Makefile | 2
i386/drivers/xen/console/console.c | 648 +++
i386/drivers/xen/console/xencons_ring.c | 151
i386/drivers/xen/core/Makefile | 11
i386/drivers/xen/core/evtchn.c | 867 ++++
i386/drivers/xen/core/features.c | 29
i386/drivers/xen/core/gnttab.c | 471 ++
i386/drivers/xen/core/hypervisor_sysfs.c | 57
i386/drivers/xen/core/reboot.c | 381 ++
i386/drivers/xen/core/skbuff.c | 144
i386/drivers/xen/core/smpboot.c | 576 +++
i386/drivers/xen/core/xen_proc.c | 29
i386/drivers/xen/core/xen_sysfs.c | 311 +
i386/drivers/xen/evtchn/Makefile | 2
i386/drivers/xen/evtchn/evtchn.c | 464 ++
i386/drivers/xen/net_driver_util.c | 68
i386/drivers/xen/netback/Makefile | 5
i386/drivers/xen/netback/common.h | 133
i386/drivers/xen/netback/interface.c | 328 +
i386/drivers/xen/netback/loopback.c | 254 +
i386/drivers/xen/netback/netback.c | 864 ++++
i386/drivers/xen/netback/xenbus.c | 366 ++
i386/drivers/xen/netfront/Kconfig | 6
i386/drivers/xen/netfront/Makefile | 4
i386/drivers/xen/netfront/netfront.c | 1522 ++++++++
i386/drivers/xen/pciback/Makefile | 10
i386/drivers/xen/pciback/conf_space.c | 345 +
i386/drivers/xen/pciback/conf_space.h | 97
i386/drivers/xen/pciback/conf_space_header.c | 267 +
i386/drivers/xen/pciback/passthrough.c | 157
i386/drivers/xen/pciback/pci_stub.c | 695 +++
i386/drivers/xen/pciback/pciback.h | 78
i386/drivers/xen/pciback/pciback_ops.c | 74
i386/drivers/xen/pciback/vpci.c | 204 +
i386/drivers/xen/pciback/xenbus.c | 441 ++
i386/drivers/xen/pcifront/Makefile | 7
i386/drivers/xen/pcifront/pci.c | 46
i386/drivers/xen/pcifront/pci_op.c | 272 +
i386/drivers/xen/pcifront/pcifront.h | 40
i386/drivers/xen/pcifront/xenbus.c | 294 +
i386/drivers/xen/privcmd/Makefile | 2
i386/drivers/xen/privcmd/privcmd.c | 303 +
i386/drivers/xen/tpmback/Makefile | 4
i386/drivers/xen/tpmback/common.h | 91
i386/drivers/xen/tpmback/interface.c | 192 +
i386/drivers/xen/tpmback/tpmback.c | 1055 +++++
i386/drivers/xen/tpmback/xenbus.c | 329 +
i386/drivers/xen/tpmfront/Makefile | 2
i386/drivers/xen/tpmfront/tpmfront.c | 767 ++++
i386/drivers/xen/tpmfront/tpmfront.h | 40
i386/drivers/xen/util.c | 80
i386/drivers/xen/xenbus/Makefile | 12
i386/drivers/xen/xenbus/xenbus_backend_client.c | 165
i386/drivers/xen/xenbus/xenbus_client.c | 284 +
i386/drivers/xen/xenbus/xenbus_comms.c | 218 +
i386/drivers/xen/xenbus/xenbus_comms.h | 53
i386/drivers/xen/xenbus/xenbus_dev.c | 255 +
i386/drivers/xen/xenbus/xenbus_probe.c | 1093 +++++
i386/drivers/xen/xenbus/xenbus_xs.c | 856 ++++
i386/fs/Kconfig | 1
i386/include/asm-i386/a.out.h | 2
i386/include/asm-i386/apic.h | 2
i386/include/asm-i386/asm-offsets.h | 48
i386/include/asm-i386/elf.h | 7
i386/include/asm-i386/fixmap.h | 13
i386/include/asm-i386/mach-default/mach_traps.h | 12
i386/include/asm-i386/mach-xen/asm/agp.h | 37
i386/include/asm-i386/mach-xen/asm/desc.h | 164
i386/include/asm-i386/mach-xen/asm/dma-mapping.h | 156
i386/include/asm-i386/mach-xen/asm/fixmap.h | 156
i386/include/asm-i386/mach-xen/asm/floppy.h | 147
i386/include/asm-i386/mach-xen/asm/highmem.h | 81
i386/include/asm-i386/mach-xen/asm/hw_irq.h | 73
i386/include/asm-i386/mach-xen/asm/hypercall.h | 357 +
i386/include/asm-i386/mach-xen/asm/hypervisor.h | 224 +
i386/include/asm-i386/mach-xen/asm/io.h | 390 ++
i386/include/asm-i386/mach-xen/asm/kmap_types.h | 32
i386/include/asm-i386/mach-xen/asm/mmu.h | 21
i386/include/asm-i386/mach-xen/asm/mmu_context.h | 105
i386/include/asm-i386/mach-xen/asm/page.h | 326 +
i386/include/asm-i386/mach-xen/asm/param.h | 24
i386/include/asm-i386/mach-xen/asm/pci.h | 154
i386/include/asm-i386/mach-xen/asm/pgalloc.h | 64
i386/include/asm-i386/mach-xen/asm/pgtable-2level-defs.h | 21
i386/include/asm-i386/mach-xen/asm/pgtable-2level.h | 85
i386/include/asm-i386/mach-xen/asm/pgtable-3level-defs.h | 25
i386/include/asm-i386/mach-xen/asm/pgtable-3level.h | 183 +
i386/include/asm-i386/mach-xen/asm/pgtable.h | 520 ++
i386/include/asm-i386/mach-xen/asm/processor.h | 756 ++++
i386/include/asm-i386/mach-xen/asm/ptrace.h | 90
i386/include/asm-i386/mach-xen/asm/scatterlist.h | 22
i386/include/asm-i386/mach-xen/asm/segment.h | 117
i386/include/asm-i386/mach-xen/asm/setup.h | 64
i386/include/asm-i386/mach-xen/asm/smp.h | 104
i386/include/asm-i386/mach-xen/asm/spinlock.h | 200 +
i386/include/asm-i386/mach-xen/asm/swiotlb.h | 43
i386/include/asm-i386/mach-xen/asm/synch_bitops.h | 141
i386/include/asm-i386/mach-xen/asm/system.h | 576 +++
i386/include/asm-i386/mach-xen/asm/tlbflush.h | 102
i386/include/asm-i386/mach-xen/asm/vga.h | 20
i386/include/asm-i386/mach-xen/irq_vectors.h | 125
i386/include/asm-i386/mach-xen/mach_traps.h | 33
i386/include/asm-i386/mach-xen/setup_arch_post.h | 54
i386/include/asm-i386/mach-xen/setup_arch_pre.h | 5
i386/include/asm-i386/page.h | 4
i386/include/asm-i386/pgtable-2level-defs.h | 2
i386/include/asm-i386/pgtable-3level-defs.h | 2
i386/include/asm-ia64/fixmap.h | 2
i386/include/asm-ia64/gcc_intrin.h | 60
i386/include/asm-ia64/hypercall.h | 274 +
i386/include/asm-ia64/hypervisor.h | 138
i386/include/asm-ia64/intel_intrin.h | 68
i386/include/asm-ia64/meminit.h | 5
i386/include/asm-ia64/pal.h | 1
i386/include/asm-ia64/privop.h | 59
i386/include/asm-ia64/processor.h | 1
i386/include/asm-ia64/synch_bitops.h | 61
i386/include/asm-ia64/system.h | 4
i386/include/asm-ia64/xen/privop.h | 277 +
i386/include/asm-um/page.h | 2
i386/include/asm-x86_64/apic.h | 2
i386/include/asm-x86_64/hw_irq.h | 2
i386/include/asm-x86_64/mach-xen/asm/arch_hooks.h | 27
i386/include/asm-x86_64/mach-xen/asm/bootsetup.h | 42
i386/include/asm-x86_64/mach-xen/asm/desc.h | 263 +
i386/include/asm-x86_64/mach-xen/asm/dma-mapping.h | 191 +
i386/include/asm-x86_64/mach-xen/asm/dmi.h | 29
i386/include/asm-x86_64/mach-xen/asm/fixmap.h | 114
i386/include/asm-x86_64/mach-xen/asm/floppy.h | 206 +
i386/include/asm-x86_64/mach-xen/asm/hw_irq.h | 141
i386/include/asm-x86_64/mach-xen/asm/hypercall.h | 357 +
i386/include/asm-x86_64/mach-xen/asm/hypervisor.h | 2
i386/include/asm-x86_64/mach-xen/asm/io.h | 328 +
i386/include/asm-x86_64/mach-xen/asm/irq.h | 39
i386/include/asm-x86_64/mach-xen/asm/mmu.h | 33
i386/include/asm-x86_64/mach-xen/asm/mmu_context.h | 134
i386/include/asm-x86_64/mach-xen/asm/msr.h | 399 ++
i386/include/asm-x86_64/mach-xen/asm/nmi.h | 75
i386/include/asm-x86_64/mach-xen/asm/page.h | 317 +
i386/include/asm-x86_64/mach-xen/asm/param.h | 23
i386/include/asm-x86_64/mach-xen/asm/pci.h | 174
i386/include/asm-x86_64/mach-xen/asm/pgalloc.h | 226 +
i386/include/asm-x86_64/mach-xen/asm/pgtable.h | 564 +++
i386/include/asm-x86_64/mach-xen/asm/processor.h | 494 ++
i386/include/asm-x86_64/mach-xen/asm/ptrace.h | 125
i386/include/asm-x86_64/mach-xen/asm/smp.h | 153
i386/include/asm-x86_64/mach-xen/asm/synch_bitops.h | 2
i386/include/asm-x86_64/mach-xen/asm/system.h | 428 ++
i386/include/asm-x86_64/mach-xen/asm/timer.h | 67
i386/include/asm-x86_64/mach-xen/asm/tlbflush.h | 104
i386/include/asm-x86_64/mach-xen/asm/vga.h | 20
i386/include/asm-x86_64/mach-xen/asm/xor.h | 328 +
i386/include/asm-x86_64/mach-xen/irq_vectors.h | 123
i386/include/asm-x86_64/mach-xen/mach_time.h | 111
i386/include/asm-x86_64/mach-xen/mach_timer.h | 48
i386/include/asm-x86_64/mach-xen/setup_arch_post.h | 41
i386/include/asm-x86_64/mach-xen/setup_arch_pre.h | 5
i386/include/linux/gfp.h | 6
i386/include/linux/highmem.h | 6
i386/include/linux/mm.h | 13
i386/include/linux/pfn.h | 2
i386/include/linux/skbuff.h | 13
i386/include/xen/balloon.h | 73
i386/include/xen/driver_util.h | 26
i386/include/xen/evtchn.h | 126
i386/include/xen/features.h | 20
i386/include/xen/foreign_page.h | 40
i386/include/xen/gnttab.h | 160
i386/include/xen/hypervisor_sysfs.h | 32
i386/include/xen/interface/acm.h | 181
i386/include/xen/interface/acm_ops.h | 98
i386/include/xen/interface/arch-ia64.h | 337 +
i386/include/xen/interface/arch-x86_32.h | 200 +
i386/include/xen/interface/arch-x86_64.h | 273 +
i386/include/xen/interface/callback.h | 57
i386/include/xen/interface/dom0_ops.h | 531 ++
i386/include/xen/interface/event_channel.h | 211 +
i386/include/xen/interface/features.h | 53
i386/include/xen/interface/grant_table.h | 311 +
i386/include/xen/interface/hvm/hvm_info_table.h | 24
i386/include/xen/interface/hvm/ioreq.h | 94
i386/include/xen/interface/hvm/vmx_assist.h | 97
i386/include/xen/interface/io/blkif.h | 85
i386/include/xen/interface/io/console.h | 33
i386/include/xen/interface/io/netif.h | 84
i386/include/xen/interface/io/pciif.h | 55
i386/include/xen/interface/io/ring.h | 265 +
i386/include/xen/interface/io/tpmif.h | 56
i386/include/xen/interface/io/xenbus.h | 42
i386/include/xen/interface/io/xs_wire.h | 97
i386/include/xen/interface/memory.h | 155
i386/include/xen/interface/nmi.h | 59
i386/include/xen/interface/physdev.h | 71
i386/include/xen/interface/sched.h | 100
i386/include/xen/interface/sched_ctl.h | 64
i386/include/xen/interface/trace.h | 86
i386/include/xen/interface/vcpu.h | 119
i386/include/xen/interface/version.h | 64
i386/include/xen/interface/xen-compat.h | 31
i386/include/xen/interface/xen.h | 461 ++
i386/include/xen/interface/xenoprof.h | 91
i386/include/xen/net_driver_util.h | 58
i386/include/xen/pcifront.h | 39
i386/include/xen/public/evtchn.h | 101
i386/include/xen/public/privcmd.h | 94
i386/include/xen/tpmfe.h | 40
i386/include/xen/xen_proc.h | 23
i386/include/xen/xenbus.h | 306 +
i386/include/xen/xencons.h | 14
i386/kernel/Kconfig.preempt | 1
i386/kernel/irq/manage.c | 24
i386/lib/Kconfig.debug | 31
i386/lib/Makefile | 3
i386/mm/Kconfig | 3
i386/mm/highmem.c | 11
i386/mm/memory.c | 116
i386/mm/mmap.c | 4
i386/mm/page_alloc.c | 6
i386/net/core/dev.c | 51
i386/net/core/skbuff.c | 41
i386/net/ipv4/netfilter/ip_nat_proto_tcp.c | 9
i386/net/ipv4/netfilter/ip_nat_proto_udp.c | 12
i386/scripts/Makefile.xen | 14
linux-2.6.16.noarch/arch/x86_64/ia32/Makefile | 20
389 files changed, 80372 insertions(+), 856 deletions(-)
Index: linux-2.6-xen.patch
===================================================================
RCS file: /cvs/dist/rpms/kernel/devel/linux-2.6-xen.patch,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- linux-2.6-xen.patch 20 Apr 2006 17:22:37 -0000 1.12
+++ linux-2.6-xen.patch 22 Apr 2006 17:48:28 -0000 1.13
@@ -26394,20 +26394,22 @@
+ .quad sys_sync_file_range
+ .quad sys_tee
+ia32_syscall_end:
-diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/x86_64/ia32/Makefile i386/arch/x86_64/ia32/Makefile
---- ../hg/linux-2.6/arch/x86_64/ia32/Makefile 2006-04-17 13:34:09.000000000 -0400
-+++ i386/arch/x86_64/ia32/Makefile 2006-04-20 07:09:46.000000000 -0400
-@@ -23,9 +23,25 @@ quiet_cmd_syscall = SYSCALL $@
+diff -uNp linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig linux-2.6.16.noarch/arch/x86_64/ia32/Makefile
+--- linux-2.6.16.noarch/arch/x86_64/ia32/Makefile.orig 2006-04-20 19:32:34.000000000 +0200
++++ linux-2.6.16.noarch/arch/x86_64/ia32/Makefile 2006-04-20 19:32:39.000000000 +0200
+@@ -26,12 +26,28 @@ quiet_cmd_syscall = SYSCALL $@
-Wl,-soname=linux-gate.so.1 -o $@ \
-Wl,-T,$(filter-out FORCE,$^)
-+$(obj)/vsyscall-int80.so \
++$(obj)/vsyscall-int80.so
$(obj)/vsyscall-sysenter.so $(obj)/vsyscall-syscall.so: \
$(obj)/vsyscall-%.so: $(src)/vsyscall.lds $(obj)/vsyscall-%.o FORCE
$(call if_changed,syscall)
-AFLAGS_vsyscall-sysenter.o = -m32
-AFLAGS_vsyscall-syscall.o = -m32
+ AFLAGS_syscall32_syscall.o += -m64
+ AFLAGS_ia32entry.o += -m64
+AFLAGS_vsyscall-sysenter.o = -m32 -Iarch/i386/kernel
+AFLAGS_vsyscall-syscall.o = -m32 -Iarch/i386/kernel
+
@@ -26425,6 +26427,7 @@
+
+obj-y := $(call cherrypickxen, $(obj-y))
+endif
+
diff -urNp --exclude-from=/home/quintela/config/misc/dontdiff --exclude=.hg ../hg/linux-2.6/arch/x86_64/ia32/syscall32_syscall-xen.S i386/arch/x86_64/ia32/syscall32_syscall-xen.S
--- ../hg/linux-2.6/arch/x86_64/ia32/syscall32_syscall-xen.S 1969-12-31 19:00:00.000000000 -0500
+++ i386/arch/x86_64/ia32/syscall32_syscall-xen.S 2006-04-20 07:09:46.000000000 -0400
More information about the fedora-cvs-commits
mailing list