# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxxxxx>
# Date 1172249854 0
# Node ID b6df5e64b6c48f036b4579492e929aa29c70e83d
# Parent c64aa7fb7712cd6768c52621ddc00177cf1e123e
# Parent e47738923a05d188a5cc89a26aa6028706d5de4f
merge
---
linux-2.6-xen-sparse/arch/i386/kernel/fixup.c | 1
linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c | 1
linux-2.6-xen-sparse/arch/ia64/oprofile/oprofile_perfmon.h | 2 -
linux-2.6-xen-sparse/arch/ia64/xen/hypercall.S | 1
linux-2.6-xen-sparse/arch/ia64/xen/mem.c | 1
linux-2.6-xen-sparse/arch/ia64/xen/util.c | 1
linux-2.6-xen-sparse/arch/ia64/xen/xenentry.S | 2 -
linux-2.6-xen-sparse/arch/ia64/xen/xenivt.S | 2 -
linux-2.6-xen-sparse/arch/ia64/xen/xenminstate.h | 2 -
linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S | 1
linux-2.6-xen-sparse/arch/x86_64/kernel/early_printk-xen.c | 1
linux-2.6-xen-sparse/arch/x86_64/kernel/genapic_xen.c | 1
linux-2.6-xen-sparse/arch/x86_64/kernel/x8664_ksyms-xen.c | 1
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c | 1
linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c | 1
linux-2.6-xen-sparse/drivers/xen/blkback/common.h | 1
linux-2.6-xen-sparse/drivers/xen/blkfront/block.h | 1
linux-2.6-xen-sparse/drivers/xen/blktap/common.h | 1
linux-2.6-xen-sparse/drivers/xen/char/mem.c | 1
linux-2.6-xen-sparse/drivers/xen/console/console.c | 1
linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c | 1
linux-2.6-xen-sparse/drivers/xen/core/evtchn.c | 1
linux-2.6-xen-sparse/drivers/xen/core/gnttab.c | 12
+++++-----
linux-2.6-xen-sparse/drivers/xen/core/hypervisor_sysfs.c | 1
linux-2.6-xen-sparse/drivers/xen/core/smpboot.c | 1
linux-2.6-xen-sparse/drivers/xen/core/xen_proc.c | 1
linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c | 1
linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c | 1
linux-2.6-xen-sparse/drivers/xen/netback/common.h | 1
linux-2.6-xen-sparse/drivers/xen/netback/loopback.c | 1
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c | 1
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c | 1
linux-2.6-xen-sparse/drivers/xen/tpmback/common.h | 5 +---
linux-2.6-xen-sparse/drivers/xen/util.c | 1
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c | 1
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/dma-mapping.h | 1
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h | 1
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h | 2 -
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/synch_bitops.h | 2 -
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h | 1
linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h | 2 -
linux-2.6-xen-sparse/include/asm-ia64/synch_bitops.h | 2 -
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/irq.h | 1
linux-2.6-xen-sparse/include/xen/cpu_hotplug.h | 1
linux-2.6-xen-sparse/include/xen/driver_util.h | 1
linux-2.6-xen-sparse/include/xen/evtchn.h | 1
linux-2.6-xen-sparse/include/xen/gnttab.h | 1
linux-2.6-xen-sparse/include/xen/pcifront.h | 1
linux-2.6-xen-sparse/include/xen/xen_proc.h | 1
unmodified_drivers/linux-2.6/overrides.mk | 2 +
unmodified_drivers/linux-2.6/platform-pci/evtchn.c | 1
unmodified_drivers/linux-2.6/platform-pci/platform-compat.c | 1
52 files changed, 10 insertions(+), 66 deletions(-)
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/i386/kernel/fixup.c
--- a/linux-2.6-xen-sparse/arch/i386/kernel/fixup.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/kernel/fixup.c Fri Feb 23 16:57:34
2007 +0000
@@ -27,7 +27,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/slab.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/i386/mm/hypervisor.c Fri Feb 23 16:57:34
2007 +0000
@@ -30,7 +30,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/vmalloc.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/ia64/oprofile/oprofile_perfmon.h
--- a/linux-2.6-xen-sparse/arch/ia64/oprofile/oprofile_perfmon.h Fri Feb
23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/oprofile/oprofile_perfmon.h Fri Feb
23 16:57:34 2007 +0000
@@ -1,7 +1,5 @@
#ifndef OPROFILE_PERFMON_H
#define OPROFILE_PERFMON_H
-
-#include <linux/config.h>
#ifdef CONFIG_PERFMON
int __perfmon_init(void);
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/ia64/xen/hypercall.S
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypercall.S Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypercall.S Fri Feb 23 16:57:34
2007 +0000
@@ -4,7 +4,6 @@
* Copyright (C) 2005 Dan Magenheimer <dan.magenheimer@xxxxxx>
*/
-#include <linux/config.h>
#include <asm/processor.h>
#include <asm/asmmacro.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/arch/ia64/xen/mem.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/mem.c Fri Feb 23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/mem.c Fri Feb 23 16:57:34 2007 +0000
@@ -15,7 +15,6 @@
* VA Linux Systems Japan K.K.
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/efi.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/arch/ia64/xen/util.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/util.c Fri Feb 23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/util.c Fri Feb 23 16:57:34 2007 +0000
@@ -21,7 +21,6 @@
*
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/slab.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/ia64/xen/xenentry.S
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xenentry.S Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xenentry.S Fri Feb 23 16:57:34
2007 +0000
@@ -7,8 +7,6 @@
* Copyright (C) 2005 Hewlett-Packard Co
* Dan Magenheimer <dan.magenheimer@.hp.com>
*/
-
-#include <linux/config.h>
#include <asm/asmmacro.h>
#include <asm/cache.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/arch/ia64/xen/xenivt.S
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xenivt.S Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xenivt.S Fri Feb 23 16:57:34
2007 +0000
@@ -28,8 +28,6 @@
*
* Table is based upon EAS2.6 (Oct 1999)
*/
-
-#include <linux/config.h>
#include <asm/asmmacro.h>
#include <asm/break.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/ia64/xen/xenminstate.h
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xenminstate.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xenminstate.h Fri Feb 23 16:57:34
2007 +0000
@@ -1,5 +1,3 @@
-#include <linux/config.h>
-
#include <asm/cache.h>
#ifdef CONFIG_XEN
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S
--- a/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/xensetup.S Fri Feb 23 16:57:34
2007 +0000
@@ -4,7 +4,6 @@
* Copyright (C) 2005 Dan Magenheimer <dan.magenheimer@xxxxxx>
*/
-#include <linux/config.h>
#include <asm/processor.h>
#include <asm/asmmacro.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/x86_64/kernel/early_printk-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/early_printk-xen.c Fri Feb
23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/early_printk-xen.c Fri Feb
23 16:57:34 2007 +0000
@@ -1,4 +1,3 @@
-#include <linux/config.h>
#include <linux/console.h>
#include <linux/kernel.h>
#include <linux/init.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/x86_64/kernel/genapic_xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/genapic_xen.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/genapic_xen.c Fri Feb 23
16:57:34 2007 +0000
@@ -10,7 +10,6 @@
*
* Hacked to pieces for Xen by Chris Wright.
*/
-#include <linux/config.h>
#include <linux/threads.h>
#include <linux/cpumask.h>
#include <linux/string.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/arch/x86_64/kernel/x8664_ksyms-xen.c
--- a/linux-2.6-xen-sparse/arch/x86_64/kernel/x8664_ksyms-xen.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/x8664_ksyms-xen.c Fri Feb 23
16:57:34 2007 +0000
@@ -1,7 +1,6 @@
/* Exports for assembly files.
All C exports should go in the respective C files. */
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/smp.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/balloon.c Fri Feb 23
16:57:34 2007 +0000
@@ -32,7 +32,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/sched.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c
--- a/linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/balloon/sysfs.c Fri Feb 23 16:57:34
2007 +0000
@@ -28,7 +28,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/capability.h>
#include <linux/stat.h>
#include <linux/sysdev.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/blkback/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/common.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/common.h Fri Feb 23 16:57:34
2007 +0000
@@ -27,7 +27,6 @@
#ifndef __BLKIF__BACKEND__COMMON_H__
#define __BLKIF__BACKEND__COMMON_H__
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/interrupt.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/blkfront/block.h
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/block.h Fri Feb 23 16:57:34
2007 +0000
@@ -35,7 +35,6 @@
#ifndef __XEN_DRIVERS_BLOCK_H__
#define __XEN_DRIVERS_BLOCK_H__
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/blktap/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/blktap/common.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/blktap/common.h Fri Feb 23 16:57:34
2007 +0000
@@ -27,7 +27,6 @@
#ifndef __BLKIF__BACKEND__COMMON_H__
#define __BLKIF__BACKEND__COMMON_H__
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/interrupt.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/drivers/xen/char/mem.c
--- a/linux-2.6-xen-sparse/drivers/xen/char/mem.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/char/mem.c Fri Feb 23 16:57:34
2007 +0000
@@ -8,7 +8,6 @@
* Shared /dev/zero mmaping support, Feb 2000, Kanoj Sarcar <kanoj@xxxxxxx>
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/miscdevice.h>
#include <linux/slab.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/console/console.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c Fri Feb 23
16:57:34 2007 +0000
@@ -30,7 +30,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/errno.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/cpu_hotplug.c Fri Feb 23
16:57:34 2007 +0000
@@ -1,4 +1,3 @@
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/sched.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/core/evtchn.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/evtchn.c Fri Feb 23 16:57:34
2007 +0000
@@ -30,7 +30,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/irq.h>
#include <linux/interrupt.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/core/gnttab.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/gnttab.c Fri Feb 23 16:57:34
2007 +0000
@@ -31,7 +31,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/sched.h>
#include <linux/mm.h>
@@ -518,25 +517,26 @@ static int gnttab_map(unsigned int start
static int gnttab_map(unsigned int start_idx, unsigned int end_idx)
{
struct xen_add_to_physmap xatp;
- unsigned int i;
+ unsigned int i = end_idx;
/* Loop backwards, so that the first hypercall has the largest index,
* ensuring that the table will grow only once.
*/
- for (i = end_idx; i >= start_idx; i--) {
+ do {
xatp.domid = DOMID_SELF;
xatp.idx = i;
xatp.space = XENMAPSPACE_grant_table;
xatp.gpfn = (resume_frames >> PAGE_SHIFT) + i;
if (HYPERVISOR_memory_op(XENMEM_add_to_physmap, &xatp))
BUG();
- }
+ } while (i-- > start_idx);
+
+ return 0;
}
int gnttab_resume(void)
{
- struct xen_add_to_physmap xatp;
- unsigned int i, max_nr_gframes, nr_gframes;
+ unsigned int max_nr_gframes, nr_gframes;
nr_gframes = nr_grant_frames;
max_nr_gframes = max_nr_grant_frames();
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/core/hypervisor_sysfs.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/hypervisor_sysfs.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/hypervisor_sysfs.c Fri Feb 23
16:57:34 2007 +0000
@@ -7,7 +7,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/kobject.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/core/smpboot.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/smpboot.c Fri Feb 23 16:57:34
2007 +0000
@@ -6,7 +6,6 @@
*/
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/core/xen_proc.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/xen_proc.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/xen_proc.c Fri Feb 23 16:57:34
2007 +0000
@@ -1,5 +1,4 @@
-#include <linux/config.h>
#include <linux/proc_fs.h>
#include <xen/xen_proc.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c
--- a/linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/core/xen_sysfs.c Fri Feb 23 16:57:34
2007 +0000
@@ -7,7 +7,6 @@
* published by the Free Software Foundation.
*/
-#include <linux/config.h>
#include <linux/err.h>
#include <linux/kernel.h>
#include <linux/module.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c
--- a/linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/evtchn/evtchn.c Fri Feb 23 16:57:34
2007 +0000
@@ -31,7 +31,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/sched.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/netback/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/netback/common.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/common.h Fri Feb 23 16:57:34
2007 +0000
@@ -29,7 +29,6 @@
#ifndef __NETIF__BACKEND__COMMON_H__
#define __NETIF__BACKEND__COMMON_H__
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/interrupt.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/netback/loopback.c
--- a/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/netback/loopback.c Fri Feb 23
16:57:34 2007 +0000
@@ -45,7 +45,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/netdevice.h>
#include <linux/inetdevice.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/netfront/netfront.c Fri Feb 23
16:57:34 2007 +0000
@@ -29,7 +29,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/version.h>
#include <linux/kernel.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Fri Feb 23
16:57:34 2007 +0000
@@ -6,7 +6,6 @@
* Copyright (c) 2002-2004, K A Fraser, B Dragovic
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/sched.h>
#include <linux/slab.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/tpmback/common.h
--- a/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/tpmback/common.h Fri Feb 23 16:57:34
2007 +0000
@@ -2,10 +2,9 @@
* drivers/xen/tpmback/common.h
*/
-#ifndef __NETIF__BACKEND__COMMON_H__
-#define __NETIF__BACKEND__COMMON_H__
+#ifndef __TPM__BACKEND__COMMON_H__
+#define __TPM__BACKEND__COMMON_H__
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/module.h>
#include <linux/interrupt.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/drivers/xen/util.c
--- a/linux-2.6-xen-sparse/drivers/xen/util.c Fri Feb 23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/util.c Fri Feb 23 16:57:34 2007 +0000
@@ -1,4 +1,3 @@
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/module.h>
#include <linux/slab.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/xenbus/xenbus_dev.c Fri Feb 23
16:57:34 2007 +0000
@@ -32,7 +32,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/errno.h>
#include <linux/uio.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/dma-mapping.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/dma-mapping.h Fri Feb
23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/dma-mapping.h Fri Feb
23 16:57:34 2007 +0000
@@ -6,7 +6,6 @@
* documentation.
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <asm/cache.h>
#include <asm/io.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h Fri Feb
23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/hypervisor.h Fri Feb
23 16:57:34 2007 +0000
@@ -33,7 +33,6 @@
#ifndef __HYPERVISOR_H__
#define __HYPERVISOR_H__
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/version.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h Fri Feb
23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/swiotlb.h Fri Feb
23 16:57:34 2007 +0000
@@ -1,7 +1,5 @@
#ifndef _ASM_SWIOTLB_H
#define _ASM_SWIOTLB_H 1
-
-#include <linux/config.h>
/* SWIOTLB interface */
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/synch_bitops.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/synch_bitops.h Fri Feb
23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/synch_bitops.h Fri Feb
23 16:57:34 2007 +0000
@@ -6,8 +6,6 @@
* Heavily modified to provide guaranteed strong synchronisation
* when communicating with Xen or other guest OSes running on other CPUs.
*/
-
-#include <linux/config.h>
#ifdef HAVE_XEN_PLATFORM_COMPAT_H
#include <xen/platform-compat.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-ia64/hypervisor.h Fri Feb 23
16:57:34 2007 +0000
@@ -46,7 +46,6 @@ extern int running_on_xen;
#endif /* CONFIG_XEN */
#if defined(CONFIG_XEN) || defined(CONFIG_VMX_GUEST)
-#include <linux/config.h>
#include <linux/types.h>
#include <linux/kernel.h>
#include <linux/version.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-ia64/swiotlb.h Fri Feb 23 16:57:34
2007 +0000
@@ -1,7 +1,5 @@
#ifndef _ASM_SWIOTLB_H
#define _ASM_SWIOTLB_H 1
-
-#include <linux/config.h>
/* SWIOTLB interface */
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-ia64/synch_bitops.h
--- a/linux-2.6-xen-sparse/include/asm-ia64/synch_bitops.h Fri Feb 23
16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-ia64/synch_bitops.h Fri Feb 23
16:57:34 2007 +0000
@@ -6,8 +6,6 @@
* Heavily modified to provide guaranteed strong synchronisation
* when communicating with Xen or other guest OSes running on other CPUs.
*/
-
-#include <linux/config.h>
#define ADDR (*(volatile long *) addr)
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/irq.h
--- a/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/irq.h Fri Feb
23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/asm-x86_64/mach-xen/asm/irq.h Fri Feb
23 16:57:34 2007 +0000
@@ -10,7 +10,6 @@
* <tomsoft@xxxxxxxxxxxxxxxxxxxxxxxxx>
*/
-#include <linux/config.h>
#include <linux/sched.h>
/* include comes from machine specific directory */
#include "irq_vectors.h"
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/xen/cpu_hotplug.h
--- a/linux-2.6-xen-sparse/include/xen/cpu_hotplug.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/include/xen/cpu_hotplug.h Fri Feb 23 16:57:34
2007 +0000
@@ -1,7 +1,6 @@
#ifndef __XEN_CPU_HOTPLUG_H__
#define __XEN_CPU_HOTPLUG_H__
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/cpumask.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
linux-2.6-xen-sparse/include/xen/driver_util.h
--- a/linux-2.6-xen-sparse/include/xen/driver_util.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/include/xen/driver_util.h Fri Feb 23 16:57:34
2007 +0000
@@ -2,7 +2,6 @@
#ifndef __ASM_XEN_DRIVER_UTIL_H__
#define __ASM_XEN_DRIVER_UTIL_H__
-#include <linux/config.h>
#include <linux/vmalloc.h>
/* Allocate/destroy a 'vmalloc' VM area. */
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/include/xen/evtchn.h
--- a/linux-2.6-xen-sparse/include/xen/evtchn.h Fri Feb 23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/xen/evtchn.h Fri Feb 23 16:57:34 2007 +0000
@@ -34,7 +34,6 @@
#ifndef __ASM_EVTCHN_H__
#define __ASM_EVTCHN_H__
-#include <linux/config.h>
#include <linux/interrupt.h>
#include <asm/hypervisor.h>
#include <asm/ptrace.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/include/xen/gnttab.h
--- a/linux-2.6-xen-sparse/include/xen/gnttab.h Fri Feb 23 16:55:56 2007 +0000
+++ b/linux-2.6-xen-sparse/include/xen/gnttab.h Fri Feb 23 16:57:34 2007 +0000
@@ -37,7 +37,6 @@
#ifndef __ASM_GNTTAB_H__
#define __ASM_GNTTAB_H__
-#include <linux/config.h>
#include <asm/hypervisor.h>
#include <asm/maddr.h> /* maddr_t */
#include <xen/interface/grant_table.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/include/xen/pcifront.h
--- a/linux-2.6-xen-sparse/include/xen/pcifront.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/include/xen/pcifront.h Fri Feb 23 16:57:34
2007 +0000
@@ -6,7 +6,6 @@
#ifndef __XEN_ASM_PCIFRONT_H__
#define __XEN_ASM_PCIFRONT_H__
-#include <linux/config.h>
#include <linux/spinlock.h>
#ifdef __KERNEL__
diff -r c64aa7fb7712 -r b6df5e64b6c4 linux-2.6-xen-sparse/include/xen/xen_proc.h
--- a/linux-2.6-xen-sparse/include/xen/xen_proc.h Fri Feb 23 16:55:56
2007 +0000
+++ b/linux-2.6-xen-sparse/include/xen/xen_proc.h Fri Feb 23 16:57:34
2007 +0000
@@ -2,7 +2,6 @@
#ifndef __ASM_XEN_PROC_H__
#define __ASM_XEN_PROC_H__
-#include <linux/config.h>
#include <linux/proc_fs.h>
extern struct proc_dir_entry *create_xen_proc_entry(
diff -r c64aa7fb7712 -r b6df5e64b6c4 unmodified_drivers/linux-2.6/overrides.mk
--- a/unmodified_drivers/linux-2.6/overrides.mk Fri Feb 23 16:55:56 2007 +0000
+++ b/unmodified_drivers/linux-2.6/overrides.mk Fri Feb 23 16:57:34 2007 +0000
@@ -9,3 +9,5 @@ ifeq ($(ARCH),ia64)
ifeq ($(ARCH),ia64)
EXTRA_CFLAGS += -DCONFIG_VMX_GUEST
endif
+
+EXTRA_CFLAGS += -include $(srctree)/include/linux/autoconf.h
diff -r c64aa7fb7712 -r b6df5e64b6c4
unmodified_drivers/linux-2.6/platform-pci/evtchn.c
--- a/unmodified_drivers/linux-2.6/platform-pci/evtchn.c Fri Feb 23
16:55:56 2007 +0000
+++ b/unmodified_drivers/linux-2.6/platform-pci/evtchn.c Fri Feb 23
16:57:34 2007 +0000
@@ -28,7 +28,6 @@
* IN THE SOFTWARE.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <xen/evtchn.h>
diff -r c64aa7fb7712 -r b6df5e64b6c4
unmodified_drivers/linux-2.6/platform-pci/platform-compat.c
--- a/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Fri Feb
23 16:55:56 2007 +0000
+++ b/unmodified_drivers/linux-2.6/platform-pci/platform-compat.c Fri Feb
23 16:57:34 2007 +0000
@@ -1,4 +1,3 @@
-#include <linux/config.h>
#include <linux/version.h>
#include <linux/mm.h>
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home