This commit is contained in:
committed by
Git OBS Bridge
parent
616dfa112f
commit
b4c780fd71
@@ -1,7 +1,7 @@
|
||||
Index: xen-3.4.0-testing/xen/arch/x86/boot/head.S
|
||||
Index: xen-3.4.1-testing/xen/arch/x86/boot/head.S
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/arch/x86/boot/head.S
|
||||
+++ xen-3.4.0-testing/xen/arch/x86/boot/head.S
|
||||
--- xen-3.4.1-testing.orig/xen/arch/x86/boot/head.S
|
||||
+++ xen-3.4.1-testing/xen/arch/x86/boot/head.S
|
||||
@@ -33,7 +33,7 @@ ENTRY(start)
|
||||
/* Checksum: must be the negated sum of the first two fields. */
|
||||
.long -(MULTIBOOT_HEADER_MAGIC + MULTIBOOT_HEADER_FLAGS)
|
||||
@@ -28,10 +28,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/boot/head.S
|
||||
#else
|
||||
/* Initialize low and high mappings of memory with 2MB pages */
|
||||
mov $sym_phys(idle_pg_table_l2),%edi
|
||||
Index: xen-3.4.0-testing/xen/arch/x86/e820.c
|
||||
Index: xen-3.4.1-testing/xen/arch/x86/e820.c
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/arch/x86/e820.c
|
||||
+++ xen-3.4.0-testing/xen/arch/x86/e820.c
|
||||
--- xen-3.4.1-testing.orig/xen/arch/x86/e820.c
|
||||
+++ xen-3.4.1-testing/xen/arch/x86/e820.c
|
||||
@@ -467,15 +467,19 @@ static void __init machine_specific_memo
|
||||
"can be accessed by Xen in 32-bit mode.");
|
||||
#else
|
||||
@@ -53,10 +53,10 @@ Index: xen-3.4.0-testing/xen/arch/x86/e820.c
|
||||
if ( limit > pft_limit )
|
||||
limit = pft_limit;
|
||||
clip_to_limit(limit,
|
||||
Index: xen-3.4.0-testing/xen/include/asm-x86/config.h
|
||||
Index: xen-3.4.1-testing/xen/include/asm-x86/config.h
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/include/asm-x86/config.h
|
||||
+++ xen-3.4.0-testing/xen/include/asm-x86/config.h
|
||||
--- xen-3.4.1-testing.orig/xen/include/asm-x86/config.h
|
||||
+++ xen-3.4.1-testing/xen/include/asm-x86/config.h
|
||||
@@ -124,10 +124,12 @@ extern unsigned int video_mode, video_fl
|
||||
#define PML4_ADDR(_slot) \
|
||||
((((_slot ## UL) >> 8) * 0xffff000000000000UL) | \
|
||||
@@ -136,10 +136,10 @@ Index: xen-3.4.0-testing/xen/include/asm-x86/config.h
|
||||
|
||||
#ifndef __ASSEMBLY__
|
||||
|
||||
Index: xen-3.4.0-testing/xen/include/asm-x86/x86_64/page.h
|
||||
Index: xen-3.4.1-testing/xen/include/asm-x86/x86_64/page.h
|
||||
===================================================================
|
||||
--- xen-3.4.0-testing.orig/xen/include/asm-x86/x86_64/page.h
|
||||
+++ xen-3.4.0-testing/xen/include/asm-x86/x86_64/page.h
|
||||
--- xen-3.4.1-testing.orig/xen/include/asm-x86/x86_64/page.h
|
||||
+++ xen-3.4.1-testing/xen/include/asm-x86/x86_64/page.h
|
||||
@@ -16,8 +16,8 @@
|
||||
#define L4_PAGETABLE_ENTRIES (1<<PAGETABLE_ORDER)
|
||||
#define ROOT_PAGETABLE_ENTRIES L4_PAGETABLE_ENTRIES
|
||||
|
Reference in New Issue
Block a user