Merge commit 'v2.6.27-rc1' into x86/core
Conflicts: include/asm-x86/dma-mapping.h include/asm-x86/namei.h include/asm-x86/uaccess.h Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
@@ -1044,6 +1044,9 @@ __init void lguest_init(void)
|
||||
init_pg_tables_start = __pa(pg0);
|
||||
init_pg_tables_end = __pa(pg0);
|
||||
|
||||
/* As described in head_32.S, we map the first 128M of memory. */
|
||||
max_pfn_mapped = (128*1024*1024) >> PAGE_SHIFT;
|
||||
|
||||
/* Load the %fs segment register (the per-cpu segment register) with
|
||||
* the normal data segment to get through booting. */
|
||||
asm volatile ("mov %0, %%fs" : : "r" (__KERNEL_DS) : "memory");
|
||||
|
||||
Reference in New Issue
Block a user