[kernel] r6200 - in dists/trunk/linux-2.6/debian: arch/amd64/xen-vserver patches patches/series

Bastian Blank waldi at costa.debian.org
Fri Mar 17 21:44:46 UTC 2006 

Author: waldi
Date: Fri Mar 17 21:44:45 2006
New Revision: 6200

Added:
   dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/
   dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config
   dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config.amd64-k8
      - copied unchanged from r6035, dists/trunk/linux-2.6/debian/arch/amd64/xen/config.amd64-k8
   dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/defines
      - copied, changed from r6034, dists/trunk/linux-2.6/debian/arch/amd64/xen/defines
   dists/trunk/linux-2.6/debian/patches/vserver-xen-clash.patch
Modified:
   dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra
Log:
* debian/arch/amd64/xen-vserver: New directory.
* debian/arch/amd64/xen-vserver/config,
  debian/arch/amd64/xen-vserver/config.amd64-k8,
  debian/arch/amd64/xen-vserver/defines: Add.
* debian/patches/series/0experimental.1-extra:
  Apply vserver, vserver-xen-clash and xen for xen-vserver images.
* debian/patches/vserver-xen-clash.patch: Add.


Added: dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/config	Fri Mar 17 21:44:45 2006
@@ -0,0 +1,45 @@
+CONFIG_X86_64_XEN=y
+CONFIG_XEN_PCIDEV_FRONTEND=y
+# CONFIG_XEN_PCIDEV_FE_DEBUG is not set
+CONFIG_XEN_PRIVILEGED_GUEST=y
+CONFIG_XEN_PCIDEV_BACKEND=y
+CONFIG_XEN_PCIDEV_BACKEND_VPCI=y
+# CONFIG_XEN_PCIDEV_BACKEND_PASS is not set
+# CONFIG_XEN_PCIDEV_BE_DEBUG is not set
+CONFIG_XEN_BLKDEV_BACKEND=y
+# CONFIG_XEN_BLKDEV_TAP_BE is not set
+CONFIG_XEN_NETDEV_BACKEND=y
+# CONFIG_XEN_NETDEV_PIPELINED_TRANSMITTER is not set
+# CONFIG_XEN_TPMDEV_BACKEND is not set
+CONFIG_XEN_BLKDEV_FRONTEND=y
+CONFIG_XEN_NETDEV_FRONTEND=y
+# CONFIG_XEN_BLKDEV_TAP is not set
+CONFIG_XEN_NETDEV_LOOPBACK=y
+# CONFIG_XEN_TPMDEV_FRONTEND is not set
+CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_DISABLE_SERIAL=y
+CONFIG_VSERVER=y
+CONFIG_VSERVER_SECURITY=y
+CONFIG_VSERVER_LEGACYNET=y
+CONFIG_VSERVER_LEGACY=y
+# CONFIG_VSERVER_LEGACY_VERSION is not set
+CONFIG_VSERVER_DYNAMIC_IDS=y
+# CONFIG_VSERVER_NGNET is not set
+CONFIG_VSERVER_COWBL=y
+CONFIG_VSERVER_PROC_SECURE=y
+# CONFIG_VSERVER_HARDCPU is not set
+# CONFIG_INOXID_NONE is not set
+# CONFIG_INOXID_UID16 is not set
+# CONFIG_INOXID_GID16 is not set
+CONFIG_INOXID_UGID24=y
+# CONFIG_INOXID_INTERN is not set
+# CONFIG_INOXID_RUNTIME is not set
+# CONFIG_XID_TAG_NFSD is not set
+# CONFIG_XID_PROPAGATE is not set
+# CONFIG_VSERVER_DEBUG is not set
+CONFIG_VMSPLIT_3G=y
+# CONFIG_VMSPLIT_25G is not set
+# CONFIG_VMSPLIT_2G is not set
+# CONFIG_VMSPLIT_15G is not set
+# CONFIG_VMSPLIT_1G is not set
+CONFIG_BLK_DEV_VROOT=y

Copied: dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/defines (from r6034, dists/trunk/linux-2.6/debian/arch/amd64/xen/defines)
==============================================================================
--- dists/trunk/linux-2.6/debian/arch/amd64/xen/defines	(original)
+++ dists/trunk/linux-2.6/debian/arch/amd64/xen-vserver/defines	Fri Mar 17 21:44:45 2006
@@ -1,7 +1,6 @@
 [base]
 flavours:
  amd64-k8
- em64t-p4
 
 [image]
 initramfs: false
@@ -11,7 +10,3 @@
 class: AMD64 K8 
 longclass: 64bit AMD Athlon64, AthlonFX, Opteron 1xx and Turion64
 
-[em64t-p4]
-class: Intel em64t P4
-longclass: 64bit Intel em64t Pentium4 
-

Modified: dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra	(original)
+++ dists/trunk/linux-2.6/debian/patches/series/0experimental.1-extra	Fri Mar 17 21:44:45 2006
@@ -1,7 +1,8 @@
 + maclist.patch arm armeb
 + arm-nslu2-maclist.patch arm armeb
 + vserver-version.patch *_vserver
-+ vserver-vs2.0.2-rc12.patch *_vserver
-+ xen-tree-merge-21966.patch *_xen
++ vserver-vs2.0.2-rc12.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

Added: dists/trunk/linux-2.6/debian/patches/vserver-xen-clash.patch
==============================================================================
--- (empty file)
+++ dists/trunk/linux-2.6/debian/patches/vserver-xen-clash.patch	Fri Mar 17 21:44:45 2006
@@ -0,0 +1,60 @@
+--- 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)

More information about the Kernel-svn-changes mailing list