debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

* 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.

svn path=/dists/trunk/linux-2.6/; revision=6200
This commit is contained in:
Bastian Blank 2006-03-17 21:44:45 +00:00
parent 32a76e7e73
commit 84d26d234c
5 changed files with 155 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
debian/arch/amd64/xen-vserver/config vendored Normal file
View File

@ -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

35
debian/arch/amd64/xen-vserver/config.amd64-k8 vendored Normal file
View File

@ -0,0 +1,35 @@
CONFIG_LOCK_KERNEL=y
CONFIG_CPUSETS=y
CONFIG_STOP_MACHINE=y
CONFIG_MK8=y
# CONFIG_MPSC is not set
# CONFIG_GENERIC_CPU is not set
CONFIG_X86_L1_CACHE_BYTES=64
CONFIG_X86_L1_CACHE_SHIFT=6
CONFIG_SMP=y
# CONFIG_SCHED_SMT is not set
CONFIG_K8_NUMA=y
# CONFIG_NUMA_EMU is not set
CONFIG_NUMA=y
CONFIG_HAVE_DEC_LOCK=y
CONFIG_NR_CPUS=32
# CONFIG_CPU_FREQ_STAT_DETAILS is not set
# CONFIG_R8169_VLAN is not set
CONFIG_FB_MATROX_G=y
CONFIG_FB_MATROX_MAVEN=m
# CONFIG_SOUND_AWE32_SYNTH is not set
CONFIG_FS_MBCACHE=m
CONFIG_NEED_MULTIPLE_NODES=y
# CONFIG_HOTPLUG_CPU is not set
CONFIG_HAVE_MEMORY_PRESENT=y
CONFIG_DIGIEPCA=m
CONFIG_ARCH_DISCONTIGMEM_DEFAULT=y
# CONFIG_FLATMEM_MANUAL is not set
CONFIG_ARCH_DISCONTIGMEM_ENABLE=y
# CONFIG_SPARSEMEM_MANUAL is not set
CONFIG_DISCONTIGMEM=y
CONFIG_DISCONTIGMEM_MANUAL=y
CONFIG_X86_MCE_AMD=y
CONFIG_X86_64_ACPI_NUMA=y
CONFIG_ACPI_NUMA=y
CONFIG_MIGRATION=y

12
debian/arch/amd64/xen-vserver/defines vendored Normal file
View File

@ -0,0 +1,12 @@
[base]
flavours:
amd64-k8
[image]
initramfs: false
type: plain-xen
[amd64-k8]
class: AMD64 K8
longclass: 64bit AMD Athlon64, AthlonFX, Opteron 1xx and Turion64

5
debian/patches/series/0experimental.1-extra vendored
View File

@ -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

60
debian/patches/vserver-xen-clash.patch vendored Normal file
View File

@ -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)