[merge] with xen-unstable

Signed-off-by: Christian Limpach <Christian.Limpach@xensource.com>

diff --cc buildconfigs/linux-defconfig_xen0_x86_32
index 76b284068530ebb1942293b6a313876b7d67e217,4cc0ac33868d79d34571b4fe083dca53bebdf836..27fc2f666a773594d2af1db78cb6f3a41af9f868
--- 1/buildconfigs/linux-defconfig_xen0_x86_32
--- 2/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 50191f868cb2a22bbe6e801acdb5ff29ee768eff,ef1443eeeb213fa92e5ab990c558703e013ae80f..d93d10d1cb17102d9005a80ed48d3dcf24094cf7
--- 1/buildconfigs/linux-defconfig_xen0_x86_64
--- 2/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 67650c73d5a37586b98d32f03b8188356943f0b7,605b82901b7172a504bbd4ae7843f96a2fdacefc..590d23841c0b405fc855d72ea15a8d8e2ec9edf0
--- 1/buildconfigs/linux-defconfig_xenU_x86_32
--- 2/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 1cb9be12363207443cd1544ac2bf148b34fe3583,62b398459a82115fd778ed442efcab31a4b61d4a..1d7a46dba7d47eca2dbef0190816c84ad3f9c467
--- 1/buildconfigs/linux-defconfig_xenU_x86_64
--- 2/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 4928f8d32ecf840f9e782eb90d1707389c790adf,111890bd483cbe131001d233bbbf88216554ce67..fedfa15ccea0a64f6cefb2845eb1a452cccc54ed
--- 1/buildconfigs/linux-defconfig_xen_x86_32
--- 2/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 7672bd1fc64b0d81bbf2d2e3c76d1d7706297d6f,a51bfc122653862043069cc9886b39ee5edad50f..a7269fbf88bc08da114e6907bc14946067a8c23c
--- 1/buildconfigs/linux-defconfig_xen_x86_64
--- 2/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 buildconfigs/mk.linux-2.6-xen
Simple merge

diff --cc linux-2.6-xen-sparse/arch/i386/kernel/sysenter.c
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/Kconfig
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/kernel/asm-offsets.c
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/kernel/gate.S
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/kernel/gate.lds.S
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/kernel/patch.c
Simple merge

diff --cc linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
Simple merge

diff --cc linux-2.6-xen-sparse/include/asm-ia64/page.h
index fd614c0a9426fa8d935754df5bda7972ada1396c,c161dc3aeb1b96b78fe6427b139910222c483969..e8ad9ec4ee6cb765def750b43f65732e47d1b25a
--- 1/linux-2.6-xen-sparse/include/asm-ia64/page.h
--- 2/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 <asm-generic/memory_model.h>
 +#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))

diff --cc linux-2.6-xen-sparse/include/linux/skbuff.h
Simple merge

diff --cc linux-2.6-xen-sparse/net/core/skbuff.c
Simple merge