* debian/arch/amd64/defines, debian/arch/i386/defines:

Disable xen and xen-vserver subarches.
* debian/patches/series/1-extra: Remove xen patches.
* debian/patches/vserver-xen-clash.patch,
  debian/patches/xen-tree-merge-21966.patch: Remove.

svn path=/dists/sid/linux-2.6/; revision=6229

debian/arch/amd64/defines

@@ -9,8 +9,6 @@ kernel-arch: x86_64
 kernel-header-dirs: x86_64
 subarches:
  vserver
- xen
- xen-vserver
 
 [image]
 depends: e2fsprogs (>= 1.35-7)

debian/arch/i386/defines

@@ -9,7 +9,6 @@ kernel-arch: i386
 kernel-header-dirs: i386
 subarches:
  vserver
- xen
 
 [image]
 suggests: grub | lilo (>= 19.1)

debian/patches/series/1-extra

@@ -2,7 +2,5 @@
 #+ arm-nslu2-maclist.patch arm armeb
 + vserver-version.patch *_vserver *_xen-vserver
 + vserver-vs2.0.2-rc13.patch *_vserver *_xen-vserver
-+ vserver-xen-clash.patch *_xen-vserver
-+ xen-tree-merge-21966.patch *_xen *_xen-vserver
 #+ mips-tulip.patch mipsel
 #+ mips-tulip_dc21143.patch mipsel

debian/patches/vserver-xen-clash.patch

@@ -1,60 +0,0 @@
---- a/arch/i386/boot/compressed/misc.c
-+++ b/arch/i386/boot/compressed/misc.c
-@@ -309,7 +309,7 @@ static void setup_normal_output_buffer(v
- #else
- 	if ((RM_ALT_MEM_K > RM_EXT_MEM_K ? RM_ALT_MEM_K : RM_EXT_MEM_K) < 1024) error("Less than 2MB of memory");
- #endif
-+	output_data = (char *)__PHYSICAL_START; /* Normally Points to 1M */
--	output_data = (char *)PHYSICAL_START; /* Normally Points to 1M */
- 	free_mem_end_ptr = (long)real_mode;
- }
- 
-@@ -334,8 +334,8 @@ static void setup_output_buffer_if_we_ru
- 	low_buffer_size = low_buffer_end - LOW_BUFFER_START;
- 	high_loaded = 1;
- 	free_mem_end_ptr = (long)high_buffer_start;
-+	if ( (__PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
-+		high_buffer_start = (uch *)(__PHYSICAL_START + low_buffer_size);
--	if ((PHYSICAL_START + low_buffer_size) > ((ulg)high_buffer_start)) {
--		high_buffer_start = (uch *)(PHYSICAL_START + low_buffer_size);
- 		mv->hcount = 0; /* say: we need not to move high_buffer */
- 	}
- 	else mv->hcount = -1;
---- a/arch/i386/kernel/setup.c
-+++ b/arch/i386/kernel/setup.c
-@@ -1192,8 +1192,8 @@ void __init setup_bootmem_allocator(void
- 	 * the (very unlikely) case of us accidentally initializing the
- 	 * bootmem allocator with an invalid RAM area.
- 	 */
-+	reserve_bootmem(__PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
-+			 bootmap_size + PAGE_SIZE-1) - (__PHYSICAL_START));
--	reserve_bootmem(PHYSICAL_START, (PFN_PHYS(min_low_pfn) +
--			 bootmap_size + PAGE_SIZE-1) - (PHYSICAL_START));
- 
- 	/*
- 	 * reserve physical page 0 - it's a special BIOS page on many boxes,
---- a/include/asm-i386/page.h
-+++ b/include/asm-i386/page.h
-@@ -109,15 +109,19 @@ extern int page_is_ram(unsigned long pag
- 
- #endif /* __ASSEMBLY__ */
- 
-+#ifdef __ASSEMBLY__
- #define __PAGE_OFFSET		CONFIG_PAGE_OFFSET
- #define __PHYSICAL_START	CONFIG_PHYSICAL_START
-+#else
-+#define __PAGE_OFFSET		((unsigned long)CONFIG_PAGE_OFFSET)
-+#define __PHYSICAL_START	((unsigned long)CONFIG_PHYSICAL_START)
-+#endif
- #define __KERNEL_START		(__PAGE_OFFSET + __PHYSICAL_START)
-+
--#define __MAXMEM		(-__PAGE_OFFSET-__VMALLOC_RESERVE)
- 
- #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
--#define PHYSICAL_START		((unsigned long)__PHYSICAL_START)
- #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
-+#define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)
--#define MAXMEM			((unsigned long)__MAXMEM)
- #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
- #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
- #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)