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

* debian/patches/series/11-extra 

- Enable vserver patchesfor xen-vserver.
  - Enable xen patches.
* debian/patches/series/3-extra, debian/patches/series/5-extra,
  debian/patches/series/9-extra: Enable vserver patches for xen-vserver.
* debian/patches/vserver-xen-clash.patch, debian/patches/xen-tls.patch,
  debian/patches/xen-tree-3.0-testing-9659.patch: Add.

svn path=/dists/sid/linux-2.6/; revision=6494
This commit is contained in:
Bastian Blank 2006-04-29 20:25:06 +00:00
parent 8911b8bcd2
commit 1565ddce0f
7 changed files with 83537 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/patches/series/11-extra vendored
View File

@ -1 +1,4 @@
+ vserver-vs2.0.2-rc18-update.patch *_vserver
+ vserver-vs2.0.2-rc18-update.patch *_vserver *_xen-vserver
+ vserver-xen-clash.patch *_xen-vserver
+ xen-tree-3.0-testing-9659.patch *_xen *_xen-vserver
+ xen-tls.patch *_xen *_xen-vserver

2
debian/patches/series/3-extra vendored
View File

@ -1 +1 @@
+ vserver-vs2.0.2-rc14-update.patch *_vserver
+ vserver-vs2.0.2-rc14-update.patch *_vserver *_xen-vserver

2
debian/patches/series/5-extra vendored
View File

@ -1 +1 @@
+ vserver-vs2.0.2-rc15-update.patch *_vserver
+ vserver-vs2.0.2-rc15-update.patch *_vserver *_xen-vserver

2
debian/patches/series/9-extra vendored
View File

@ -1 +1 @@
+ vserver-vs2.0.2-rc17-update.patch *_vserver
+ vserver-vs2.0.2-rc17-update.patch *_vserver *_xen-vserver

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)

24
debian/patches/xen-tls.patch vendored Normal file
View File

@ -0,0 +1,24 @@
diff --git a/arch/i386/kernel/fixup.c b/arch/i386/kernel/fixup.c
index 5188b23..d506a65 100644
--- a/arch/i386/kernel/fixup.c
+++ b/arch/i386/kernel/fixup.c
@@ -39,7 +39,7 @@
fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
{
- static unsigned long printed = 0;
+ static unsigned long printed = 1;
char info[100];
int i;
diff --git a/arch/i386/kernel/vsyscall-note-xen.S b/arch/i386/kernel/vsyscall-note-xen.S
index c2d6dbf..019d9af 100644
--- a/arch/i386/kernel/vsyscall-note-xen.S
+++ b/arch/i386/kernel/vsyscall-note-xen.S
@@ -28,5 +28,5 @@
#define NOTE_KERNELCAP_END ASM_ELF_NOTE_END
NOTE_KERNELCAP_BEGIN(1, 1)
-NOTE_KERNELCAP(1, "nosegneg") /* Change 1 back to 0 when glibc is fixed! */
+NOTE_KERNELCAP(0, "nosegneg")
NOTE_KERNELCAP_END

83446
debian/patches/xen-tree-3.0-testing-9659.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff