From: Alex Williamson <alex.williamson@hp.com>
Date: Fri, 29 Feb 2008 16:19:58 +0000 (-0700)
Subject: merge with xen-unstable.hg
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14296
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=0e2661a9738d001b2b407c48e48f79484e8a584b;p=xen.git

merge with xen-unstable.hg
---

0e2661a9738d001b2b407c48e48f79484e8a584b
diff --cc xen/arch/ia64/xen/machine_kexec.c
index 849a395f23,d1addea8c1..221f59cf16
--- a/xen/arch/ia64/xen/machine_kexec.c
+++ b/xen/arch/ia64/xen/machine_kexec.c
@@@ -24,7 -24,19 +24,8 @@@
  #include <linux/cpu.h>
  #include <linux/notifier.h>
  #include <asm/dom_fw_dom0.h>
+ #include <asm-generic/sections.h>
  
 -typedef asmlinkage NORET_TYPE void (*relocate_new_kernel_t)(
 -					unsigned long indirection_page,
 -					unsigned long start_address,
 -					struct ia64_boot_param *boot_param,
 -					unsigned long pal_addr,
 -					unsigned long cpu_data_pa,
 -					unsigned long kernel_start,
 -					unsigned long page_offset,
 -					unsigned long vhpt)
 -					ATTRIB_NORET;
 -
  #define kexec_flush_icache_page(page)					\
  do {									\
  	unsigned long page_addr = (unsigned long)page_address(page);	\