Commit b8cb48aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip 

* 'x86-xen-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: split __phys_addr out into separate file
  xen: use stronger barrier after unlocking lock
  xen: only enable interrupts while actually blocking for spinlock
  xen: make -fstack-protector work under Xen
parents 0cc6d77e 78c86e5e

arch/x86/mm/Makefile

+5 −1
Original line number Diff line number Diff line 
obj-y	:=  init.o init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \

	    pat.o pgtable.o gup.o

	    pat.o pgtable.o physaddr.o gup.o



# Make sure __phys_addr has no stackprotector

nostackp := $(call cc-option, -fno-stack-protector)

CFLAGS_physaddr.o		:= $(nostackp)



obj-$(CONFIG_SMP)		+= tlb.o

arch/x86/mm/ioremap.c

+1 −71
Original line number Diff line number Diff line
@@ -22,77 +22,7 @@ 
#include <asm/pgalloc.h>

#include <asm/pat.h>



static inline int phys_addr_valid(resource_size_t addr)

{

#ifdef CONFIG_PHYS_ADDR_T_64BIT

	return !(addr >> boot_cpu_data.x86_phys_bits);

#else

	return 1;

#endif

}



#ifdef CONFIG_X86_64



unsigned long __phys_addr(unsigned long x)

{

	if (x >= __START_KERNEL_map) {

		x -= __START_KERNEL_map;

		VIRTUAL_BUG_ON(x >= KERNEL_IMAGE_SIZE);

		x += phys_base;

	} else {

		VIRTUAL_BUG_ON(x < PAGE_OFFSET);

		x -= PAGE_OFFSET;

		VIRTUAL_BUG_ON(!phys_addr_valid(x));

	}

	return x;

}

EXPORT_SYMBOL(__phys_addr);



bool __virt_addr_valid(unsigned long x)

{

	if (x >= __START_KERNEL_map) {

		x -= __START_KERNEL_map;

		if (x >= KERNEL_IMAGE_SIZE)

			return false;

		x += phys_base;

	} else {

		if (x < PAGE_OFFSET)

			return false;

		x -= PAGE_OFFSET;

		if (!phys_addr_valid(x))

			return false;

	}



	return pfn_valid(x >> PAGE_SHIFT);

}

EXPORT_SYMBOL(__virt_addr_valid);



#else



#ifdef CONFIG_DEBUG_VIRTUAL

unsigned long __phys_addr(unsigned long x)

{

	/* VMALLOC_* aren't constants  */

	VIRTUAL_BUG_ON(x < PAGE_OFFSET);

	VIRTUAL_BUG_ON(__vmalloc_start_set && is_vmalloc_addr((void *) x));

	return x - PAGE_OFFSET;

}

EXPORT_SYMBOL(__phys_addr);

#endif



bool __virt_addr_valid(unsigned long x)

{

	if (x < PAGE_OFFSET)

		return false;

	if (__vmalloc_start_set && is_vmalloc_addr((void *) x))

		return false;

	if (x >= FIXADDR_START)

		return false;

	return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);

}

EXPORT_SYMBOL(__virt_addr_valid);



#endif

#include "physaddr.h"



int page_is_ram(unsigned long pagenr)

{

arch/x86/mm/physaddr.c

0 → 100644
+70 −0
Original line number Diff line number Diff line 
#include <linux/mmdebug.h>

#include <linux/module.h>

#include <linux/mm.h>



#include <asm/page.h>



#include "physaddr.h"



#ifdef CONFIG_X86_64



unsigned long __phys_addr(unsigned long x)

{

	if (x >= __START_KERNEL_map) {

		x -= __START_KERNEL_map;

		VIRTUAL_BUG_ON(x >= KERNEL_IMAGE_SIZE);

		x += phys_base;

	} else {

		VIRTUAL_BUG_ON(x < PAGE_OFFSET);

		x -= PAGE_OFFSET;

		VIRTUAL_BUG_ON(!phys_addr_valid(x));

	}

	return x;

}

EXPORT_SYMBOL(__phys_addr);



bool __virt_addr_valid(unsigned long x)

{

	if (x >= __START_KERNEL_map) {

		x -= __START_KERNEL_map;

		if (x >= KERNEL_IMAGE_SIZE)

			return false;

		x += phys_base;

	} else {

		if (x < PAGE_OFFSET)

			return false;

		x -= PAGE_OFFSET;

		if (!phys_addr_valid(x))

			return false;

	}



	return pfn_valid(x >> PAGE_SHIFT);

}

EXPORT_SYMBOL(__virt_addr_valid);



#else



#ifdef CONFIG_DEBUG_VIRTUAL

unsigned long __phys_addr(unsigned long x)

{

	/* VMALLOC_* aren't constants  */

	VIRTUAL_BUG_ON(x < PAGE_OFFSET);

	VIRTUAL_BUG_ON(__vmalloc_start_set && is_vmalloc_addr((void *) x));

	return x - PAGE_OFFSET;

}

EXPORT_SYMBOL(__phys_addr);

#endif



bool __virt_addr_valid(unsigned long x)

{

	if (x < PAGE_OFFSET)

		return false;

	if (__vmalloc_start_set && is_vmalloc_addr((void *) x))

		return false;

	if (x >= FIXADDR_START)

		return false;

	return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);

}

EXPORT_SYMBOL(__virt_addr_valid);



#endif	/* CONFIG_X86_64 */

arch/x86/mm/physaddr.h

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#include <asm/processor.h>



static inline int phys_addr_valid(resource_size_t addr)

{

#ifdef CONFIG_PHYS_ADDR_T_64BIT

	return !(addr >> boot_cpu_data.x86_phys_bits);

#else

	return 1;

#endif

}

arch/x86/xen/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ endif 
# Make sure early boot has no stackprotector

nostackp := $(call cc-option, -fno-stack-protector)

CFLAGS_enlighten.o		:= $(nostackp)

CFLAGS_mmu.o			:= $(nostackp)



obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \

			time.o xen-asm.o xen-asm_$(BITS).o \
@@ -16,3 +17,4 @@ obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ 
obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

obj-$(CONFIG_XEN_DEBUG_FS)	+= debugfs.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE