Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e9ce0c37 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/untangle2' of... 

Merge branch 'x86/untangle2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen into x86/headers
parents a7eb5189 8960f8c8

arch/x86/boot/compressed/head_32.S

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/page.h>

#include <asm/page_types.h>

#include <asm/boot.h>

#include <asm/asm-offsets.h>

arch/x86/boot/compressed/head_64.S

+2 −2
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 


#include <linux/linkage.h>

#include <asm/segment.h>

#include <asm/pgtable.h>

#include <asm/page.h>

#include <asm/pgtable_types.h>

#include <asm/page_types.h>

#include <asm/boot.h>

#include <asm/msr.h>

#include <asm/processor-flags.h>

arch/x86/boot/header.S

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <linux/utsrelease.h>

#include <asm/boot.h>

#include <asm/e820.h>

#include <asm/page.h>

#include <asm/page_types.h>

#include <asm/setup.h>

#include "boot.h"

#include "offsets.h"

arch/x86/include/asm/page_32_types.h

+0 −2
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ 
/* 44=32+12, the limit we can fit into an unsigned long pfn */

#define __PHYSICAL_MASK_SHIFT	44

#define __VIRTUAL_MASK_SHIFT	32

#define PAGETABLE_LEVELS	3



#else  /* !CONFIG_X86_PAE */

#define __PHYSICAL_MASK_SHIFT	32

#define __VIRTUAL_MASK_SHIFT	32

#define PAGETABLE_LEVELS	2

#endif	/* CONFIG_X86_PAE */



#ifndef __ASSEMBLY__

arch/x86/include/asm/page_64_types.h

+0 −2
Original line number Diff line number Diff line 
#ifndef _ASM_X86_PAGE_64_DEFS_H

#define _ASM_X86_PAGE_64_DEFS_H



#define PAGETABLE_LEVELS	4



#define THREAD_ORDER	1

#define THREAD_SIZE  (PAGE_SIZE << THREAD_ORDER)

#define CURRENT_MASK (~(THREAD_SIZE - 1))