From: Christian Limpach Date: Fri, 19 Jan 2007 14:48:57 +0000 (+0000) Subject: [merge] with xen-unstable X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~15371^2~133 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c6a0a466fab92f08e73fe2bdaed40ef73f524c9b;p=xen.git [merge] with xen-unstable Signed-off-by: Christian Limpach --- c6a0a466fab92f08e73fe2bdaed40ef73f524c9b diff --cc buildconfigs/linux-defconfig_xen0_x86_32 index 76b2840685,4cc0ac3386..27fc2f666a --- a/buildconfigs/linux-defconfig_xen0_x86_32 +++ b/buildconfigs/linux-defconfig_xen0_x86_32 @@@ -1413,15 -1338,7 +1413,13 @@@ CONFIG_XEN_SYSFS= CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set CONFIG_XEN_COMPAT_030002=y - CONFIG_HAVE_ARCH_ALLOC_SKB=y - CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y +CONFIG_XEN_UTIL=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y +CONFIG_XEN_REBOOT=y +CONFIG_XEN_SMPBOOT=y # # Library routines diff --cc buildconfigs/linux-defconfig_xen0_x86_64 index 50191f868c,ef1443eeeb..d93d10d1cb --- a/buildconfigs/linux-defconfig_xen0_x86_64 +++ b/buildconfigs/linux-defconfig_xen0_x86_64 @@@ -1363,14 -1278,7 +1363,12 @@@ CONFIG_XEN_SYSFS= CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set CONFIG_XEN_COMPAT_030002=y - CONFIG_HAVE_ARCH_ALLOC_SKB=y - CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y +CONFIG_XEN_UTIL=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y +CONFIG_XEN_REBOOT=y # # Library routines diff --cc buildconfigs/linux-defconfig_xenU_x86_32 index 67650c73d5,605b82901b..590d23841c --- a/buildconfigs/linux-defconfig_xenU_x86_32 +++ b/buildconfigs/linux-defconfig_xenU_x86_32 @@@ -922,15 -865,7 +922,13 @@@ CONFIG_XEN_SYSFS= CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set CONFIG_XEN_COMPAT_030002=y - CONFIG_HAVE_ARCH_ALLOC_SKB=y - CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y +CONFIG_XEN_UTIL=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y +CONFIG_XEN_REBOOT=y +CONFIG_XEN_SMPBOOT=y # # Library routines diff --cc buildconfigs/linux-defconfig_xenU_x86_64 index 1cb9be1236,62b398459a..1d7a46dba7 --- a/buildconfigs/linux-defconfig_xenU_x86_64 +++ b/buildconfigs/linux-defconfig_xenU_x86_64 @@@ -1218,15 -1151,7 +1218,13 @@@ CONFIG_XEN_SYSFS= CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set CONFIG_XEN_COMPAT_030002=y - CONFIG_HAVE_ARCH_ALLOC_SKB=y - CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y +CONFIG_XEN_UTIL=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y +CONFIG_XEN_REBOOT=y +CONFIG_XEN_SMPBOOT=y # # Library routines diff --cc buildconfigs/linux-defconfig_xen_x86_32 index 4928f8d32e,111890bd48..fedfa15cce --- a/buildconfigs/linux-defconfig_xen_x86_32 +++ b/buildconfigs/linux-defconfig_xen_x86_32 @@@ -3272,15 -3043,7 +3272,13 @@@ CONFIG_XEN_SYSFS= CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set CONFIG_XEN_COMPAT_030002=y - CONFIG_HAVE_ARCH_ALLOC_SKB=y - CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y +CONFIG_XEN_UTIL=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y +CONFIG_XEN_REBOOT=y +CONFIG_XEN_SMPBOOT=y # # Library routines diff --cc buildconfigs/linux-defconfig_xen_x86_64 index 7672bd1fc6,a51bfc1226..a7269fbf88 --- a/buildconfigs/linux-defconfig_xen_x86_64 +++ b/buildconfigs/linux-defconfig_xen_x86_64 @@@ -3103,15 -2874,7 +3103,13 @@@ CONFIG_XEN_SYSFS= CONFIG_XEN_COMPAT_030002_AND_LATER=y # CONFIG_XEN_COMPAT_LATEST_ONLY is not set CONFIG_XEN_COMPAT_030002=y - CONFIG_HAVE_ARCH_ALLOC_SKB=y - CONFIG_HAVE_ARCH_DEV_ALLOC_SKB=y +CONFIG_HAVE_IRQ_IGNORE_UNHANDLED=y CONFIG_NO_IDLE_HZ=y +CONFIG_XEN_UTIL=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_DEVMEM=y +CONFIG_XEN_REBOOT=y +CONFIG_XEN_SMPBOOT=y # # Library routines diff --cc linux-2.6-xen-sparse/include/asm-ia64/page.h index fd614c0a94,c161dc3aeb..e8ad9ec4ee --- a/linux-2.6-xen-sparse/include/asm-ia64/page.h +++ b/linux-2.6-xen-sparse/include/asm-ia64/page.h @@@ -105,22 -104,13 +105,23 @@@ extern int ia64_pfn_valid (unsigned lon # define ia64_pfn_valid(pfn) 1 #endif +#ifdef CONFIG_VIRTUAL_MEM_MAP +extern struct page *vmem_map; +#ifdef CONFIG_DISCONTIGMEM +# define page_to_pfn(page) ((unsigned long) (page - vmem_map)) +# define pfn_to_page(pfn) (vmem_map + (pfn)) +#endif +#endif + +#if defined(CONFIG_FLATMEM) || defined(CONFIG_SPARSEMEM) +/* FLATMEM always configures mem_map (mem_map = vmem_map if necessary) */ +#include +#endif + #ifdef CONFIG_FLATMEM + extern unsigned long max_mapnr; # define pfn_valid(pfn) (((pfn) < max_mapnr) && ia64_pfn_valid(pfn)) -# define page_to_pfn(page) ((unsigned long) (page - mem_map)) -# define pfn_to_page(pfn) (mem_map + (pfn)) #elif defined(CONFIG_DISCONTIGMEM) -extern struct page *vmem_map; extern unsigned long min_low_pfn; extern unsigned long max_low_pfn; # define pfn_valid(pfn) (((pfn) >= min_low_pfn) && ((pfn) < max_low_pfn) && ia64_pfn_valid(pfn))