Update 2.6.21 patches to the latest from fedora 8, sync up with other things from our 2.6.20 patche set

svn path=/patches/; revision=71

13 files changed, 2695 insertions, 1165 deletions

diff --git a/trunk/2.6.21/01006_linux-2.6.21.7.patch b/trunk/2.6.21/01006_linux-2.6.21.7.patch
new file mode 100644
index 0000000..74c4984
--- /dev/null
+++ b/trunk/2.6.21/01006_linux-2.6.21.7.patch
@@ -0,0 +1,1110 @@
+diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
+index 18bddcb..cb1f16c 100644
+--- a/arch/i386/kernel/entry.S
++++ b/arch/i386/kernel/entry.S
+@@ -371,10 +371,6 @@ ENTRY(system_call)
+ 	CFI_ADJUST_CFA_OFFSET 4
+ 	SAVE_ALL
+ 	GET_THREAD_INFO(%ebp)
+-	testl $TF_MASK,PT_EFLAGS(%esp)
+-	jz no_singlestep
+-	orl $_TIF_SINGLESTEP,TI_flags(%ebp)
+-no_singlestep:
+ 					# system call tracing in operation / emulation
+ 	/* Note, _TIF_SECCOMP is bit number 8, and so it needs testw and not testb */
+ 	testw $(_TIF_SYSCALL_EMU|_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT),TI_flags(%ebp)
+@@ -389,6 +385,10 @@ syscall_exit:
+ 					# setting need_resched or sigpending
+ 					# between sampling and the iret
+ 	TRACE_IRQS_OFF
++	testl $TF_MASK,PT_EFLAGS(%esp)	# If tracing set singlestep flag on exit
++	jz no_singlestep
++	orl $_TIF_SINGLESTEP,TI_flags(%ebp)
++no_singlestep:
+ 	movl TI_flags(%ebp), %ecx
+ 	testw $_TIF_ALLWORK_MASK, %cx	# current->work
+ 	jne syscall_exit_work
+diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
+index f72e8e8..a84304e 100644
+--- a/arch/powerpc/kernel/signal_64.c
++++ b/arch/powerpc/kernel/signal_64.c
+@@ -177,6 +177,13 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
+ 	 */
+ 	discard_lazy_cpu_state();
+ 
++	/*
++	 * Force reload of FP/VEC.
++	 * This has to be done before copying stuff into current->thread.fpr/vr
++	 * for the reasons explained in the previous comment.
++	 */
++	regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
++
+ 	err |= __copy_from_user(&current->thread.fpr, &sc->fp_regs, FP_REGS_SIZE);
+ 
+ #ifdef CONFIG_ALTIVEC
+@@ -198,9 +205,6 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
+ 		current->thread.vrsave = 0;
+ #endif /* CONFIG_ALTIVEC */
+ 
+-	/* Force reload of FP/VEC */
+-	regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1 | MSR_VEC);
+-
+ 	return err;
+ }
+ 
+diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
+index 6fd126a..df35d6d 100644
+--- a/arch/x86_64/mm/init.c
++++ b/arch/x86_64/mm/init.c
+@@ -72,6 +72,8 @@ void show_mem(void)
+ 
+ 	for_each_online_pgdat(pgdat) {
+                for (i = 0; i < pgdat->node_spanned_pages; ++i) {
++			if (!pfn_valid(pgdat->node_start_pfn + i))
++				continue;
+ 			page = pfn_to_page(pgdat->node_start_pfn + i);
+ 			total++;
+ 			if (PageReserved(page))
+diff --git a/drivers/ide/pci/hpt366.c b/drivers/ide/pci/hpt366.c
+index cf9d344..14de1e8 100644
+--- a/drivers/ide/pci/hpt366.c
++++ b/drivers/ide/pci/hpt366.c
+@@ -1,5 +1,5 @@
+ /*
+- * linux/drivers/ide/pci/hpt366.c		Version 1.03	May 4, 2007
++ * linux/drivers/ide/pci/hpt366.c		Version 1.04	Jun 4, 2007
+  *
+  * Copyright (C) 1999-2003		Andre Hedrick <andre@linux-ide.org>
+  * Portions Copyright (C) 2001	        Sun Microsystems, Inc.
+@@ -106,7 +106,8 @@
+  *   switch  to calculating  PCI clock frequency based on the chip's base DPLL
+  *   frequency
+  * - switch to using the  DPLL clock and enable UltraATA/133 mode by default on
+- *   anything  newer than HPT370/A
++ *   anything  newer than HPT370/A (except HPT374 that is not capable of this
++ *   mode according to the manual)
+  * - fold PCI clock detection and DPLL setup code into init_chipset_hpt366(),
+  *   also fixing the interchanged 25/40 MHz PCI clock cases for HPT36x chips;
+  *   unify HPT36x/37x timing setup code and the speedproc handlers by joining
+@@ -365,7 +366,6 @@ static u32 sixty_six_base_hpt37x[] = {
+ };
+ 
+ #define HPT366_DEBUG_DRIVE_INFO		0
+-#define HPT374_ALLOW_ATA133_6		1
+ #define HPT371_ALLOW_ATA133_6		1
+ #define HPT302_ALLOW_ATA133_6		1
+ #define HPT372_ALLOW_ATA133_6		1
+@@ -450,7 +450,7 @@ static struct hpt_info hpt370a __devinitdata = {
+ 
+ static struct hpt_info hpt374 __devinitdata = {
+ 	.chip_type	= HPT374,
+-	.max_mode	= HPT374_ALLOW_ATA133_6 ? 4 : 3,
++	.max_mode	= 3,
+ 	.dpll_clk	= 48,
+ 	.settings	= hpt37x_settings
+ };
+diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
+index 4c2471e..b9ff4e3 100644
+--- a/drivers/md/dm-crypt.c
++++ b/drivers/md/dm-crypt.c
+@@ -33,7 +33,6 @@
+ struct crypt_io {
+ 	struct dm_target *target;
+ 	struct bio *base_bio;
+-	struct bio *first_clone;
+ 	struct work_struct work;
+ 	atomic_t pending;
+ 	int error;
+@@ -107,6 +106,8 @@ struct crypt_config {
+ 
+ static struct kmem_cache *_crypt_io_pool;
+ 
++static void clone_init(struct crypt_io *, struct bio *);
++
+ /*
+  * Different IV generation algorithms:
+  *
+@@ -378,25 +379,20 @@ static int crypt_convert(struct crypt_config *cc,
+  * This should never violate the device limitations
+  * May return a smaller bio when running out of pages
+  */
+-static struct bio *
+-crypt_alloc_buffer(struct crypt_config *cc, unsigned int size,
+-                   struct bio *base_bio, unsigned int *bio_vec_idx)
++static struct bio *crypt_alloc_buffer(struct crypt_io *io, unsigned int size,
++				      unsigned int *bio_vec_idx)
+ {
++	struct crypt_config *cc = io->target->private;
+ 	struct bio *clone;
+ 	unsigned int nr_iovecs = (size + PAGE_SIZE - 1) >> PAGE_SHIFT;
+ 	gfp_t gfp_mask = GFP_NOIO | __GFP_HIGHMEM;
+ 	unsigned int i;
+ 
+-	if (base_bio) {
+-		clone = bio_alloc_bioset(GFP_NOIO, base_bio->bi_max_vecs, cc->bs);
+-		__bio_clone(clone, base_bio);
+-	} else
+-		clone = bio_alloc_bioset(GFP_NOIO, nr_iovecs, cc->bs);
+-
++	clone = bio_alloc_bioset(GFP_NOIO, nr_iovecs, cc->bs);
+ 	if (!clone)
+ 		return NULL;
+ 
+-	clone->bi_destructor = dm_crypt_bio_destructor;
++	clone_init(io, clone);
+ 
+ 	/* if the last bio was not complete, continue where that one ended */
+ 	clone->bi_idx = *bio_vec_idx;
+@@ -495,9 +491,6 @@ static void dec_pending(struct crypt_io *io, int error)
+ 	if (!atomic_dec_and_test(&io->pending))
+ 		return;
+ 
+-	if (io->first_clone)
+-		bio_put(io->first_clone);
+-
+ 	bio_endio(io->base_bio, io->base_bio->bi_size, io->error);
+ 
+ 	mempool_free(io, cc->io_pool);
+@@ -562,6 +555,7 @@ static void clone_init(struct crypt_io *io, struct bio *clone)
+ 	clone->bi_end_io  = crypt_endio;
+ 	clone->bi_bdev    = cc->dev->bdev;
+ 	clone->bi_rw      = io->base_bio->bi_rw;
++	clone->bi_destructor = dm_crypt_bio_destructor;
+ }
+ 
+ static void process_read(struct crypt_io *io)
+@@ -585,7 +579,6 @@ static void process_read(struct crypt_io *io)
+ 	}
+ 
+ 	clone_init(io, clone);
+-	clone->bi_destructor = dm_crypt_bio_destructor;
+ 	clone->bi_idx = 0;
+ 	clone->bi_vcnt = bio_segments(base_bio);
+ 	clone->bi_size = base_bio->bi_size;
+@@ -615,8 +608,7 @@ static void process_write(struct crypt_io *io)
+ 	 * so repeat the whole process until all the data can be handled.
+ 	 */
+ 	while (remaining) {
+-		clone = crypt_alloc_buffer(cc, base_bio->bi_size,
+-					   io->first_clone, &bvec_idx);
++		clone = crypt_alloc_buffer(io, base_bio->bi_size, &bvec_idx);
+ 		if (unlikely(!clone)) {
+ 			dec_pending(io, -ENOMEM);
+ 			return;
+@@ -631,31 +623,23 @@ static void process_write(struct crypt_io *io)
+ 			return;
+ 		}
+ 
+-		clone_init(io, clone);
+ 		clone->bi_sector = cc->start + sector;
+-
+-		if (!io->first_clone) {
+-			/*
+-			 * hold a reference to the first clone, because it
+-			 * holds the bio_vec array and that can't be freed
+-			 * before all other clones are released
+-			 */
+-			bio_get(clone);
+-			io->first_clone = clone;
+-		}
+-
+ 		remaining -= clone->bi_size;
+ 		sector += bio_sectors(clone);
+ 
+-		/* prevent bio_put of first_clone */
++		/* Grab another reference to the io struct
++		 * before we kick off the request */
+ 		if (remaining)
+ 			atomic_inc(&io->pending);
+ 
+ 		generic_make_request(clone);
+ 
++		/* Do not reference clone after this - it
++		 * may be gone already. */
++
+ 		/* out of memory -> run queues */
+ 		if (remaining)
+-			congestion_wait(bio_data_dir(clone), HZ/100);
++			congestion_wait(WRITE, HZ/100);
+ 	}
+ }
+ 
+@@ -954,10 +938,12 @@ static int crypt_map(struct dm_target *ti, struct bio *bio,
+ 	struct crypt_config *cc = ti->private;
+ 	struct crypt_io *io;
+ 
++	if (bio_barrier(bio))
++		return -EOPNOTSUPP;
++
+ 	io = mempool_alloc(cc->io_pool, GFP_NOIO);
+ 	io->target = ti;
+ 	io->base_bio = bio;
+-	io->first_clone = NULL;
+ 	io->error = io->post_process = 0;
+ 	atomic_set(&io->pending, 0);
+ 	kcryptd_queue_io(io);
+diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
+index 3a95cc5..46677d7 100644
+--- a/drivers/md/raid1.c
++++ b/drivers/md/raid1.c
+@@ -1240,17 +1240,24 @@ static void sync_request_write(mddev_t *mddev, r1bio_t *r1_bio)
+ 			}
+ 		r1_bio->read_disk = primary;
+ 		for (i=0; i<mddev->raid_disks; i++)
+-			if (r1_bio->bios[i]->bi_end_io == end_sync_read &&
+-			    test_bit(BIO_UPTODATE, &r1_bio->bios[i]->bi_flags)) {
++			if (r1_bio->bios[i]->bi_end_io == end_sync_read) {
+ 				int j;
+ 				int vcnt = r1_bio->sectors >> (PAGE_SHIFT- 9);
+ 				struct bio *pbio = r1_bio->bios[primary];
+ 				struct bio *sbio = r1_bio->bios[i];
+-				for (j = vcnt; j-- ; )
+-					if (memcmp(page_address(pbio->bi_io_vec[j].bv_page),
+-						   page_address(sbio->bi_io_vec[j].bv_page),
+-						   PAGE_SIZE))
+-						break;
++
++				if (test_bit(BIO_UPTODATE, &sbio->bi_flags)) {
++					for (j = vcnt; j-- ; ) {
++						struct page *p, *s;
++						p = pbio->bi_io_vec[j].bv_page;
++						s = sbio->bi_io_vec[j].bv_page;
++						if (memcmp(page_address(p),
++							   page_address(s),
++							   PAGE_SIZE))
++							break;
++					}
++				} else
++					j = 0;
+ 				if (j >= 0)
+ 					mddev->resync_mismatches += r1_bio->sectors;
+ 				if (j < 0 || test_bit(MD_RECOVERY_CHECK, &mddev->recovery)) {
+diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
+index 82249a6..9eb66c1 100644
+--- a/drivers/md/raid10.c
++++ b/drivers/md/raid10.c
+@@ -1867,6 +1867,7 @@ static sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *skipped, i
+ 			int d = r10_bio->devs[i].devnum;
+ 			bio = r10_bio->devs[i].bio;
+ 			bio->bi_end_io = NULL;
++			clear_bit(BIO_UPTODATE, &bio->bi_flags);
+ 			if (conf->mirrors[d].rdev == NULL ||
+ 			    test_bit(Faulty, &conf->mirrors[d].rdev->flags))
+ 				continue;
+@@ -2037,6 +2038,11 @@ static int run(mddev_t *mddev)
+ 	/* 'size' is now the number of chunks in the array */
+ 	/* calculate "used chunks per device" in 'stride' */
+ 	stride = size * conf->copies;
++
++	/* We need to round up when dividing by raid_disks to
++	 * get the stride size.
++	 */
++	stride += conf->raid_disks - 1;
+ 	sector_div(stride, conf->raid_disks);
+ 	mddev->size = stride  << (conf->chunk_shift-1);
+ 
+diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
+index 5720b77..d4bef35 100644
+--- a/drivers/media/video/bt8xx/bttv-driver.c
++++ b/drivers/media/video/bt8xx/bttv-driver.c
+@@ -1313,7 +1313,7 @@ set_tvnorm(struct bttv *btv, unsigned int norm)
+ 
+ /* Call with btv->lock down. */
+ static void
+-set_input(struct bttv *btv, unsigned int input)
++set_input(struct bttv *btv, unsigned int input, unsigned int norm)
+ {
+ 	unsigned long flags;
+ 
+@@ -1332,7 +1332,7 @@ set_input(struct bttv *btv, unsigned int input)
+ 	}
+ 	audio_input(btv,(input == bttv_tvcards[btv->c.type].tuner ?
+ 		       TVAUDIO_INPUT_TUNER : TVAUDIO_INPUT_EXTERN));
+-	set_tvnorm(btv,btv->tvnorm);
++	set_tvnorm(btv, norm);
+ 	i2c_vidiocschan(btv);
+ }
+ 
+@@ -1423,7 +1423,7 @@ static void bttv_reinit_bt848(struct bttv *btv)
+ 
+ 	init_bt848(btv);
+ 	btv->pll.pll_current = -1;
+-	set_input(btv,btv->input);
++	set_input(btv, btv->input, btv->tvnorm);
+ }
+ 
+ static int get_control(struct bttv *btv, struct v4l2_control *c)
+@@ -1993,8 +1993,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
+ 			return 0;
+ 		}
+ 
+-		btv->tvnorm = v->norm;
+-		set_input(btv,v->channel);
++		set_input(btv, v->channel, v->norm);
+ 		mutex_unlock(&btv->lock);
+ 		return 0;
+ 	}
+@@ -2130,7 +2129,7 @@ static int bttv_common_ioctls(struct bttv *btv, unsigned int cmd, void *arg)
+ 		if (*i > bttv_tvcards[btv->c.type].video_inputs)
+ 			return -EINVAL;
+ 		mutex_lock(&btv->lock);
+-		set_input(btv,*i);
++		set_input(btv, *i, btv->tvnorm);
+ 		mutex_unlock(&btv->lock);
+ 		return 0;
+ 	}
+@@ -4762,7 +4761,7 @@ static int __devinit bttv_probe(struct pci_dev *dev,
+ 		bt848_hue(btv,32768);
+ 		bt848_sat(btv,32768);
+ 		audio_mute(btv, 1);
+-		set_input(btv,0);
++		set_input(btv, 0, btv->tvnorm);
+ 		bttv_crop_reset(&btv->crop[0], btv->tvnorm);
+ 		btv->crop[1] = btv->crop[0]; /* current = default */
+ 		disclaim_vbi_lines(btv);
+diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
+index b0466b8..a80b1cb 100644
+--- a/drivers/media/video/cx88/cx88-blackbird.c
++++ b/drivers/media/video/cx88/cx88-blackbird.c
+@@ -1034,6 +1034,8 @@ static int vidioc_g_tuner (struct file *file, void *priv,
+ 
+ 	if (unlikely(UNSET == core->tuner_type))
+ 		return -EINVAL;
++	if (0 != t->index)
++		return -EINVAL;
+ 
+ 	strcpy(t->name, "Television");
+ 	t->type       = V4L2_TUNER_ANALOG_TV;
+diff --git a/drivers/media/video/saa7134/saa7134-tvaudio.c b/drivers/media/video/saa7134/saa7134-tvaudio.c
+index dd759d6..36b3fa3 100644
+--- a/drivers/media/video/saa7134/saa7134-tvaudio.c
++++ b/drivers/media/video/saa7134/saa7134-tvaudio.c
+@@ -1006,7 +1006,7 @@ int saa7134_tvaudio_init2(struct saa7134_dev *dev)
+ int saa7134_tvaudio_fini(struct saa7134_dev *dev)
+ {
+ 	/* shutdown tvaudio thread */
+-	if (dev->thread.pid >= 0) {
++	if (dev->thread.pid > 0) {
+ 		dev->thread.shutdown = 1;
+ 		wake_up_interruptible(&dev->thread.wq);
+ 		wait_for_completion(&dev->thread.exit);
+diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
+index 5006c67..1137291 100644
+--- a/drivers/net/bnx2.c
++++ b/drivers/net/bnx2.c
+@@ -54,8 +54,8 @@
+ 
+ #define DRV_MODULE_NAME		"bnx2"
+ #define PFX DRV_MODULE_NAME	": "
+-#define DRV_MODULE_VERSION	"1.5.8.1"
+-#define DRV_MODULE_RELDATE	"May 7, 2007"
++#define DRV_MODULE_VERSION	"1.5.8.2"
++#define DRV_MODULE_RELDATE	"June 5, 2007"
+ 
+ #define RUN_AT(x) (jiffies + (x))
+ 
+@@ -1550,6 +1550,7 @@ bnx2_init_context(struct bnx2 *bp)
+ 	vcid = 96;
+ 	while (vcid) {
+ 		u32 vcid_addr, pcid_addr, offset;
++		int i;
+ 
+ 		vcid--;
+ 
+@@ -1570,16 +1571,20 @@ bnx2_init_context(struct bnx2 *bp)
+ 			pcid_addr = vcid_addr;
+ 		}
+ 
+-		REG_WR(bp, BNX2_CTX_VIRT_ADDR, 0x00);
+-		REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
++		for (i = 0; i < (CTX_SIZE / PHY_CTX_SIZE); i++) {
++			vcid_addr += (i << PHY_CTX_SHIFT);
++			pcid_addr += (i << PHY_CTX_SHIFT);
+ 
+-		/* Zero out the context. */
+-		for (offset = 0; offset < PHY_CTX_SIZE; offset += 4) {
+-			CTX_WR(bp, 0x00, offset, 0);
+-		}
++			REG_WR(bp, BNX2_CTX_VIRT_ADDR, 0x00);
++			REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
+ 
+-		REG_WR(bp, BNX2_CTX_VIRT_ADDR, vcid_addr);
+-		REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
++			/* Zero out the context. */
++			for (offset = 0; offset < PHY_CTX_SIZE; offset += 4)
++				CTX_WR(bp, 0x00, offset, 0);
++
++			REG_WR(bp, BNX2_CTX_VIRT_ADDR, vcid_addr);
++			REG_WR(bp, BNX2_CTX_PAGE_TBL, pcid_addr);
++		}
+ 	}
+ }
+ 
+diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
+index b6b444b..e525a5b 100644
+--- a/drivers/net/sky2.c
++++ b/drivers/net/sky2.c
+@@ -95,7 +95,7 @@ static int disable_msi = 0;
+ module_param(disable_msi, int, 0);
+ MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
+ 
+-static int idle_timeout = 0;
++static int idle_timeout = 100;
+ module_param(idle_timeout, int, 0);
+ MODULE_PARM_DESC(idle_timeout, "Watchdog timer for lost interrupts (ms)");
+ 
+@@ -2433,6 +2433,13 @@ static int sky2_poll(struct net_device *dev0, int *budget)
+ 
+ 	work_done = sky2_status_intr(hw, work_limit);
+ 	if (work_done < work_limit) {
++		/* Bug/Errata workaround?
++		 * Need to kick the TX irq moderation timer.
++		 */
++		if (sky2_read8(hw, STAT_TX_TIMER_CTRL) == TIM_START) {
++			sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_STOP);
++			sky2_write8(hw, STAT_TX_TIMER_CTRL, TIM_START);
++		}
+ 		netif_rx_complete(dev0);
+ 
+ 		sky2_read32(hw, B0_Y2_SP_LISR);
+diff --git a/drivers/serial/mpsc.c b/drivers/serial/mpsc.c
+index 3d2fcc5..64ed5ef 100644
+--- a/drivers/serial/mpsc.c
++++ b/drivers/serial/mpsc.c
+@@ -502,7 +502,8 @@ mpsc_sdma_intr_ack(struct mpsc_port_info *pi)
+ 
+ 	if (pi->mirror_regs)
+ 		pi->shared_regs->SDMA_INTR_CAUSE_m = 0;
+-	writel(0, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE);
++	writeb(0x00, pi->shared_regs->sdma_intr_base + SDMA_INTR_CAUSE +
++	       pi->port.line);
+ 	return;
+ }
+ 
+diff --git a/include/linux/sched.h b/include/linux/sched.h
+index 49fe299..8cf1d7f 100644
+--- a/include/linux/sched.h
++++ b/include/linux/sched.h
+@@ -1138,6 +1138,7 @@ static inline void put_task_struct(struct task_struct *t)
+ 					/* Not implemented yet, only for 486*/
+ #define PF_STARTING	0x00000002	/* being created */
+ #define PF_EXITING	0x00000004	/* getting shut down */
++#define PF_EXITPIDONE	0x00000008	/* pi exit done on shut down */
+ #define PF_FORKNOEXEC	0x00000040	/* forked but didn't exec */
+ #define PF_SUPERPRIV	0x00000100	/* used super-user privileges */
+ #define PF_DUMPCORE	0x00000200	/* dumped core */
+diff --git a/ipc/shm.c b/ipc/shm.c
+index 4fefbad..8d2672d 100644
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -254,8 +254,10 @@ struct mempolicy *shm_get_policy(struct vm_area_struct *vma, unsigned long addr)
+ 
+ 	if (sfd->vm_ops->get_policy)
+ 		pol = sfd->vm_ops->get_policy(vma, addr);
+-	else
++	else if (vma->vm_policy)
+ 		pol = vma->vm_policy;
++	else
++		pol = current->mempolicy;
+ 	return pol;
+ }
+ #endif
+diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c
+index 3749193..2b8311b 100644
+--- a/kernel/auditfilter.c
++++ b/kernel/auditfilter.c
+@@ -905,7 +905,7 @@ static void audit_update_watch(struct audit_parent *parent,
+ 
+ 		/* If the update involves invalidating rules, do the inode-based
+ 		 * filtering now, so we don't omit records. */
+-		if (invalidating &&
++		if (invalidating && current->audit_context &&
+ 		    audit_filter_inodes(current, current->audit_context) == AUDIT_RECORD_CONTEXT)
+ 			audit_set_auditable(current->audit_context);
+ 
+diff --git a/kernel/exit.c b/kernel/exit.c
+index b55ed4c..7debf34 100644
+--- a/kernel/exit.c
++++ b/kernel/exit.c
+@@ -884,13 +884,29 @@ fastcall NORET_TYPE void do_exit(long code)
+ 	if (unlikely(tsk->flags & PF_EXITING)) {
+ 		printk(KERN_ALERT
+ 			"Fixing recursive fault but reboot is needed!\n");
++		/*
++		 * We can do this unlocked here. The futex code uses
++		 * this flag just to verify whether the pi state
++		 * cleanup has been done or not. In the worst case it
++		 * loops once more. We pretend that the cleanup was
++		 * done as there is no way to return. Either the
++		 * OWNER_DIED bit is set by now or we push the blocked
++		 * task into the wait for ever nirwana as well.
++		 */
++		tsk->flags |= PF_EXITPIDONE;
+ 		if (tsk->io_context)
+ 			exit_io_context();
+ 		set_current_state(TASK_UNINTERRUPTIBLE);
+ 		schedule();
+ 	}
+ 
++	/*
++	 * tsk->flags are checked in the futex code to protect against
++	 * an exiting task cleaning up the robust pi futexes.
++	 */
++	spin_lock_irq(&tsk->pi_lock);
+ 	tsk->flags |= PF_EXITING;
++	spin_unlock_irq(&tsk->pi_lock);
+ 
+ 	if (unlikely(in_atomic()))
+ 		printk(KERN_INFO "note: %s[%d] exited with preempt_count %d\n",
+@@ -957,6 +973,12 @@ fastcall NORET_TYPE void do_exit(long code)
+ 	 * Make sure we are holding no locks:
+ 	 */
+ 	debug_check_no_locks_held(tsk);
++	/*
++	 * We can do this unlocked here. The futex code uses this flag
++	 * just to verify whether the pi state cleanup has been done
++	 * or not. In the worst case it loops once more.
++	 */
++	tsk->flags |= PF_EXITPIDONE;
+ 
+ 	if (tsk->io_context)
+ 		exit_io_context();
+diff --git a/kernel/futex.c b/kernel/futex.c
+index 5a270b5..4809436 100644
+--- a/kernel/futex.c
++++ b/kernel/futex.c
+@@ -390,18 +390,12 @@ static struct task_struct * futex_find_get_task(pid_t pid)
+ 
+ 	rcu_read_lock();
+ 	p = find_task_by_pid(pid);
+-	if (!p)
+-		goto out_unlock;
+-	if ((current->euid != p->euid) && (current->euid != p->uid)) {
+-		p = NULL;
+-		goto out_unlock;
+-	}
+-	if (p->exit_state != 0) {
+-		p = NULL;
+-		goto out_unlock;
+-	}
+-	get_task_struct(p);
+-out_unlock:
++
++	if (!p || ((current->euid != p->euid) && (current->euid != p->uid)))
++		p = ERR_PTR(-ESRCH);
++	else
++		get_task_struct(p);
++
+ 	rcu_read_unlock();
+ 
+ 	return p;
+@@ -467,7 +461,7 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb, struct futex_q *me)
+ 	struct futex_q *this, *next;
+ 	struct list_head *head;
+ 	struct task_struct *p;
+-	pid_t pid;
++	pid_t pid = uval & FUTEX_TID_MASK;
+ 
+ 	head = &hb->chain;
+ 
+@@ -485,6 +479,8 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb, struct futex_q *me)
+ 				return -EINVAL;
+ 
+ 			WARN_ON(!atomic_read(&pi_state->refcount));
++			WARN_ON(pid && pi_state->owner &&
++				pi_state->owner->pid != pid);
+ 
+ 			atomic_inc(&pi_state->refcount);
+ 			me->pi_state = pi_state;
+@@ -495,15 +491,33 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb, struct futex_q *me)
+ 
+ 	/*
+ 	 * We are the first waiter - try to look up the real owner and attach
+-	 * the new pi_state to it, but bail out when the owner died bit is set
+-	 * and TID = 0:
++	 * the new pi_state to it, but bail out when TID = 0
+ 	 */
+-	pid = uval & FUTEX_TID_MASK;
+-	if (!pid && (uval & FUTEX_OWNER_DIED))
++	if (!pid)
+ 		return -ESRCH;
+ 	p = futex_find_get_task(pid);
+-	if (!p)
+-		return -ESRCH;
++	if (IS_ERR(p))
++		return PTR_ERR(p);
++
++	/*
++	 * We need to look at the task state flags to figure out,
++	 * whether the task is exiting. To protect against the do_exit
++	 * change of the task flags, we do this protected by
++	 * p->pi_lock:
++	 */
++	spin_lock_irq(&p->pi_lock);
++	if (unlikely(p->flags & PF_EXITING)) {
++		/*
++		 * The task is on the way out. When PF_EXITPIDONE is
++		 * set, we know that the task has finished the
++		 * cleanup:
++		 */
++		int ret = (p->flags & PF_EXITPIDONE) ? -ESRCH : -EAGAIN;
++
++		spin_unlock_irq(&p->pi_lock);
++		put_task_struct(p);
++		return ret;
++	}
+ 
+ 	pi_state = alloc_pi_state();
+ 
+@@ -516,7 +530,6 @@ lookup_pi_state(u32 uval, struct futex_hash_bucket *hb, struct futex_q *me)
+ 	/* Store the key for possible exit cleanups: */
+ 	pi_state->key = me->key;
+ 
+-	spin_lock_irq(&p->pi_lock);
+ 	WARN_ON(!list_empty(&pi_state->list));
+ 	list_add(&pi_state->list, &p->pi_state_list);
+ 	pi_state->owner = p;
+@@ -583,15 +596,22 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
+ 	 * preserve the owner died bit.)
+ 	 */
+ 	if (!(uval & FUTEX_OWNER_DIED)) {
++		int ret = 0;
++
+ 		newval = FUTEX_WAITERS | new_owner->pid;
+ 
+ 		pagefault_disable();
+ 		curval = futex_atomic_cmpxchg_inatomic(uaddr, uval, newval);
+ 		pagefault_enable();
++
+ 		if (curval == -EFAULT)
+-			return -EFAULT;
++			ret = -EFAULT;
+ 		if (curval != uval)
+-			return -EINVAL;
++			ret = -EINVAL;
++		if (ret) {
++			spin_unlock(&pi_state->pi_mutex.wait_lock);
++			return ret;
++		}
+ 	}
+ 
+ 	spin_lock_irq(&pi_state->owner->pi_lock);
+@@ -1149,6 +1169,7 @@ static int futex_lock_pi(u32 __user *uaddr, int detect, unsigned long sec,
+ 	if (unlikely(ret != 0))
+ 		goto out_release_sem;
+ 
++ retry_unlocked:
+ 	hb = queue_lock(&q, -1, NULL);
+ 
+  retry_locked:
+@@ -1200,34 +1221,58 @@ static int futex_lock_pi(u32 __user *uaddr, int detect, unsigned long sec,
+ 	ret = lookup_pi_state(uval, hb, &q);
+ 
+ 	if (unlikely(ret)) {
+-		/*
+-		 * There were no waiters and the owner task lookup
+-		 * failed. When the OWNER_DIED bit is set, then we
+-		 * know that this is a robust futex and we actually
+-		 * take the lock. This is safe as we are protected by
+-		 * the hash bucket lock. We also set the waiters bit
+-		 * unconditionally here, to simplify glibc handling of
+-		 * multiple tasks racing to acquire the lock and
+-		 * cleanup the problems which were left by the dead
+-		 * owner.
+-		 */
+-		if (curval & FUTEX_OWNER_DIED) {
+-			uval = newval;
+-			newval = current->pid |
+-				FUTEX_OWNER_DIED | FUTEX_WAITERS;
++		switch (ret) {
+ 
+-			pagefault_disable();
+-			curval = futex_atomic_cmpxchg_inatomic(uaddr,
+-							       uval, newval);
+-			pagefault_enable();
++		case -EAGAIN:
++			/*
++			 * Task is exiting and we just wait for the
++			 * exit to complete.
++			 */
++			queue_unlock(&q, hb);
++			up_read(&curr->mm->mmap_sem);
++			cond_resched();
++			goto retry;
+ 
+-			if (unlikely(curval == -EFAULT))
++		case -ESRCH:
++			/*
++			 * No owner found for this futex. Check if the
++			 * OWNER_DIED bit is set to figure out whether
++			 * this is a robust futex or not.
++			 */
++			if (get_futex_value_locked(&curval, uaddr))
+ 				goto uaddr_faulted;
+-			if (unlikely(curval != uval))
+-				goto retry_locked;
+-			ret = 0;
++
++			/*
++			 * There were no waiters and the owner task lookup
++			 * failed. When the OWNER_DIED bit is set, then we
++			 * know that this is a robust futex and we actually
++			 * take the lock. This is safe as we are protected by
++			 * the hash bucket lock. We also set the waiters bit
++			 * unconditionally here, to simplify glibc handling of
++			 * multiple tasks racing to acquire the lock and
++			 * cleanup the problems which were left by the dead
++			 * owner.
++			 */
++			if (curval & FUTEX_OWNER_DIED) {
++				uval = newval;
++				newval = current->pid |
++					FUTEX_OWNER_DIED | FUTEX_WAITERS;
++
++				pagefault_disable();
++				curval = futex_atomic_cmpxchg_inatomic(uaddr,
++								       uval,
++								       newval);
++				pagefault_enable();
++
++				if (unlikely(curval == -EFAULT))
++					goto uaddr_faulted;
++				if (unlikely(curval != uval))
++					goto retry_locked;
++				ret = 0;
++			}
++		default:
++			goto out_unlock_release_sem;
+ 		}
+-		goto out_unlock_release_sem;
+ 	}
+ 
+ 	/*
+@@ -1279,39 +1324,52 @@ static int futex_lock_pi(u32 __user *uaddr, int detect, unsigned long sec,
+ 		list_add(&q.pi_state->list, &current->pi_state_list);
+ 		spin_unlock_irq(&current->pi_lock);
+ 
+-		/* Unqueue and drop the lock */
+-		unqueue_me_pi(&q, hb);
+-		up_read(&curr->mm->mmap_sem);
+ 		/*
+ 		 * We own it, so we have to replace the pending owner
+-		 * TID. This must be atomic as we have preserve the
++		 * TID. This must be atomic as we have to preserve the
+ 		 * owner died bit here.
+ 		 */
+-		ret = get_user(uval, uaddr);
++		ret = get_futex_value_locked(&uval, uaddr);
+ 		while (!ret) {
+ 			newval = (uval & FUTEX_OWNER_DIED) | newtid;
++
++			pagefault_disable();
+ 			curval = futex_atomic_cmpxchg_inatomic(uaddr,
+ 							       uval, newval);
++			pagefault_enable();
++
+ 			if (curval == -EFAULT)
+ 				ret = -EFAULT;
+ 			if (curval == uval)
+ 				break;
+ 			uval = curval;
+ 		}
+-	} else {
++	} else if (ret) {
+ 		/*
+ 		 * Catch the rare case, where the lock was released
+ 		 * when we were on the way back before we locked
+ 		 * the hash bucket.
+ 		 */
+-		if (ret && q.pi_state->owner == curr) {
+-			if (rt_mutex_trylock(&q.pi_state->pi_mutex))
+-				ret = 0;
++		if (q.pi_state->owner == curr &&
++		    rt_mutex_trylock(&q.pi_state->pi_mutex)) {
++			ret = 0;
++		} else {
++			/*
++			 * Paranoia check. If we did not take the lock
++			 * in the trylock above, then we should not be
++			 * the owner of the rtmutex, neither the real
++			 * nor the pending one:
++			 */
++			if (rt_mutex_owner(&q.pi_state->pi_mutex) == curr)
++				printk(KERN_ERR "futex_lock_pi: ret = %d "
++				       "pi-mutex: %p pi-state %p\n", ret,
++				       q.pi_state->pi_mutex.owner,
++				       q.pi_state->owner);
+ 		}
+-		/* Unqueue and drop the lock */
+-		unqueue_me_pi(&q, hb);
+-		up_read(&curr->mm->mmap_sem);
+ 	}
++	/* Unqueue and drop the lock */
++	unqueue_me_pi(&q, hb);
++	up_read(&curr->mm->mmap_sem);
+ 
+ 	if (!detect && ret == -EDEADLK && 0)
+ 		force_sig(SIGKILL, current);
+@@ -1331,16 +1389,18 @@ static int futex_lock_pi(u32 __user *uaddr, int detect, unsigned long sec,
+ 	 * non-atomically.  Therefore, if get_user below is not
+ 	 * enough, we need to handle the fault ourselves, while
+ 	 * still holding the mmap_sem.
++	 *
++	 * ... and hb->lock. :-) --ANK
+ 	 */
++	queue_unlock(&q, hb);
++
+ 	if (attempt++) {
+-		if (futex_handle_fault((unsigned long)uaddr, attempt)) {
+-			ret = -EFAULT;
+-			goto out_unlock_release_sem;
+-		}
+-		goto retry_locked;
++		ret = futex_handle_fault((unsigned long)uaddr, attempt);
++		if (ret)
++			goto out_release_sem;
++		goto retry_unlocked;
+ 	}
+ 
+-	queue_unlock(&q, hb);
+ 	up_read(&curr->mm->mmap_sem);
+ 
+ 	ret = get_user(uval, uaddr);
+@@ -1382,9 +1442,9 @@ retry:
+ 		goto out;
+ 
+ 	hb = hash_futex(&key);
++retry_unlocked:
+ 	spin_lock(&hb->lock);
+ 
+-retry_locked:
+ 	/*
+ 	 * To avoid races, try to do the TID -> 0 atomic transition
+ 	 * again. If it succeeds then we can return without waking
+@@ -1446,16 +1506,17 @@ pi_faulted:
+ 	 * non-atomically.  Therefore, if get_user below is not
+ 	 * enough, we need to handle the fault ourselves, while
+ 	 * still holding the mmap_sem.
++	 *
++	 * ... and hb->lock. :-) --ANK
+ 	 */
++	spin_unlock(&hb->lock);
++
+ 	if (attempt++) {
+-		if (futex_handle_fault((unsigned long)uaddr, attempt)) {
+-			ret = -EFAULT;
+-			goto out_unlock;
+-		}
+-		goto retry_locked;
++		ret = futex_handle_fault((unsigned long)uaddr, attempt);
++		if (ret)
++			goto out;
++		goto retry_unlocked;
+ 	}
+-
+-	spin_unlock(&hb->lock);
+ 	up_read(&current->mm->mmap_sem);
+ 
+ 	ret = get_user(uval, uaddr);
+diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c
+index 44318ca..9577ac8 100644
+--- a/kernel/posix-timers.c
++++ b/kernel/posix-timers.c
+@@ -354,9 +354,40 @@ static enum hrtimer_restart posix_timer_fn(struct hrtimer *timer)
+ 		 * it should be restarted.
+ 		 */
+ 		if (timr->it.real.interval.tv64 != 0) {
++			ktime_t now = hrtimer_cb_get_time(timer);
++
++			/*
++			 * FIXME: What we really want, is to stop this
++			 * timer completely and restart it in case the
++			 * SIG_IGN is removed. This is a non trivial
++			 * change which involves sighand locking
++			 * (sigh !), which we don't want to do late in
++			 * the release cycle.
++			 *
++			 * For now we just let timers with an interval
++			 * less than a jiffie expire every jiffie to
++			 * avoid softirq starvation in case of SIG_IGN
++			 * and a very small interval, which would put
++			 * the timer right back on the softirq pending
++			 * list. By moving now ahead of time we trick
++			 * hrtimer_forward() to expire the timer
++			 * later, while we still maintain the overrun
++			 * accuracy, but have some inconsistency in
++			 * the timer_gettime() case. This is at least
++			 * better than a starved softirq. A more
++			 * complex fix which solves also another related
++			 * inconsistency is already in the pipeline.
++			 */
++#ifdef CONFIG_HIGH_RES_TIMERS
++			{
++				ktime_t kj = ktime_set(0, NSEC_PER_SEC / HZ);
++
++				if (timr->it.real.interval.tv64 < kj.tv64)
++					now = ktime_add(now, kj);
++			}
++#endif
+ 			timr->it_overrun +=
+-				hrtimer_forward(timer,
+-						hrtimer_cb_get_time(timer),
++				hrtimer_forward(timer, now,
+ 						timr->it.real.interval);
+ 			ret = HRTIMER_RESTART;
+ 			++timr->it_requeue_pending;
+diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
+index 180978c..17d28ce 100644
+--- a/kernel/rtmutex.c
++++ b/kernel/rtmutex.c
+@@ -212,6 +212,19 @@ static int rt_mutex_adjust_prio_chain(struct task_struct *task,
+ 	if (!waiter || !waiter->task)
+ 		goto out_unlock_pi;
+ 
++	/*
++	 * Check the orig_waiter state. After we dropped the locks,
++	 * the previous owner of the lock might have released the lock
++	 * and made us the pending owner:
++	 */
++	if (orig_waiter && !orig_waiter->task)
++		goto out_unlock_pi;
++
++	/*
++	 * Drop out, when the task has no waiters. Note,
++	 * top_waiter can be NULL, when we are in the deboosting
++	 * mode!
++	 */
+ 	if (top_waiter && (!task_has_pi_waiters(task) ||
+ 			   top_waiter != task_top_pi_waiter(task)))
+ 		goto out_unlock_pi;
+@@ -659,9 +672,16 @@ rt_mutex_slowlock(struct rt_mutex *lock, int state,
+ 			 * all over without going into schedule to try
+ 			 * to get the lock now:
+ 			 */
+-			if (unlikely(!waiter.task))
++			if (unlikely(!waiter.task)) {
++				/*
++				 * Reset the return value. We might
++				 * have returned with -EDEADLK and the
++				 * owner released the lock while we
++				 * were walking the pi chain.
++				 */
++				ret = 0;
+ 				continue;
+-
++			}
+ 			if (unlikely(ret))
+ 				break;
+ 		}
+diff --git a/kernel/sched.c b/kernel/sched.c
+index a3993b9..f745a44 100644
+--- a/kernel/sched.c
++++ b/kernel/sched.c
+@@ -2831,17 +2831,21 @@ static void idle_balance(int this_cpu, struct rq *this_rq)
+ 	unsigned long next_balance = jiffies + 60 *  HZ;
+ 
+ 	for_each_domain(this_cpu, sd) {
+-		if (sd->flags & SD_BALANCE_NEWIDLE) {
++		unsigned long interval;
++
++		if (!(sd->flags & SD_LOAD_BALANCE))
++			continue;
++
++		if (sd->flags & SD_BALANCE_NEWIDLE)
+ 			/* If we've pulled tasks over stop searching: */
+ 			pulled_task = load_balance_newidle(this_cpu,
+-							this_rq, sd);
+-			if (time_after(next_balance,
+-				  sd->last_balance + sd->balance_interval))
+-				next_balance = sd->last_balance
+-						+ sd->balance_interval;
+-			if (pulled_task)
+-				break;
+-		}
++								this_rq, sd);
++
++		interval = msecs_to_jiffies(sd->balance_interval);
++		if (time_after(next_balance, sd->last_balance + interval))
++			next_balance = sd->last_balance + interval;
++		if (pulled_task)
++			break;
+ 	}
+ 	if (!pulled_task)
+ 		/*
+diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c
+index cb25649..c6b6f35 100644
+--- a/kernel/time/ntp.c
++++ b/kernel/time/ntp.c
+@@ -120,7 +120,6 @@ void second_overflow(void)
+ 			 */
+ 			time_interpolator_update(-NSEC_PER_SEC);
+ 			time_state = TIME_OOP;
+-			clock_was_set();
+ 			printk(KERN_NOTICE "Clock: inserting leap second "
+ 					"23:59:60 UTC\n");
+ 		}
+@@ -135,7 +134,6 @@ void second_overflow(void)
+ 			 */
+ 			time_interpolator_update(NSEC_PER_SEC);
+ 			time_state = TIME_WAIT;
+-			clock_was_set();
+ 			printk(KERN_NOTICE "Clock: deleting leap second "
+ 					"23:59:59 UTC\n");
+ 		}
+diff --git a/mm/rmap.c b/mm/rmap.c
+index b82146e..6e35d11 100644
+--- a/mm/rmap.c
++++ b/mm/rmap.c
+@@ -53,24 +53,6 @@
+ 
+ struct kmem_cache *anon_vma_cachep;
+ 
+-static inline void validate_anon_vma(struct vm_area_struct *find_vma)
+-{
+-#ifdef CONFIG_DEBUG_VM
+-	struct anon_vma *anon_vma = find_vma->anon_vma;
+-	struct vm_area_struct *vma;
+-	unsigned int mapcount = 0;
+-	int found = 0;
+-
+-	list_for_each_entry(vma, &anon_vma->head, anon_vma_node) {
+-		mapcount++;
+-		BUG_ON(mapcount > 100000);
+-		if (vma == find_vma)
+-			found = 1;
+-	}
+-	BUG_ON(!found);
+-#endif
+-}
+-
+ /* This must be called under the mmap_sem. */
+ int anon_vma_prepare(struct vm_area_struct *vma)
+ {
+@@ -121,10 +103,8 @@ void __anon_vma_link(struct vm_area_struct *vma)
+ {
+ 	struct anon_vma *anon_vma = vma->anon_vma;
+ 
+-	if (anon_vma) {
++	if (anon_vma)
+ 		list_add_tail(&vma->anon_vma_node, &anon_vma->head);
+-		validate_anon_vma(vma);
+-	}
+ }
+ 
+ void anon_vma_link(struct vm_area_struct *vma)
+@@ -134,7 +114,6 @@ void anon_vma_link(struct vm_area_struct *vma)
+ 	if (anon_vma) {
+ 		spin_lock(&anon_vma->lock);
+ 		list_add_tail(&vma->anon_vma_node, &anon_vma->head);
+-		validate_anon_vma(vma);
+ 		spin_unlock(&anon_vma->lock);
+ 	}
+ }
+@@ -148,7 +127,6 @@ void anon_vma_unlink(struct vm_area_struct *vma)
+ 		return;
+ 
+ 	spin_lock(&anon_vma->lock);
+-	validate_anon_vma(vma);
+ 	list_del(&vma->anon_vma_node);
+ 
+ 	/* We must garbage collect the anon_vma if it's empty */
diff --git a/trunk/2.6.21/20950_linux-2.6.21.6-xen-3.1.0.patch b/trunk/2.6.21/20950_linux-2.6.21.7-xen-3.1.0.patch
index 9a92224..f0c1f95 100644
--- a/trunk/2.6.21/20950_linux-2.6.21.6-xen-3.1.0.patch
+++ b/trunk/2.6.21/20950_linux-2.6.21.7-xen-3.1.0.patch
@@ -1,6 +1,6 @@
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Kconfig
---- a/arch/i386/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/Kconfig
+--- a/arch/i386/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -16,6 +16,7 @@ config X86_32
  
  config GENERIC_TIME
@@ -273,9 +273,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Kconfig
  config KTIME_SCALAR
  	bool
  	default y
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Kconfig.cpu
---- a/arch/i386/Kconfig.cpu	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/Kconfig.cpu	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/Kconfig.cpu
+--- a/arch/i386/Kconfig.cpu	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/Kconfig.cpu	Thu Sep 13 18:36:53 2007 -0300
 @@ -262,7 +262,7 @@ config X86_PPRO_FENCE
  
  config X86_F00F_BUG
@@ -293,9 +293,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Kconfig.cpu
 -	default y
 +	depends on (MWINCHIP3D || MWINCHIP2 || MCRUSOE || MEFFICEON || MCYRIXIII || MK7 || MK6 || MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || MK8 || MVIAC3_2 || MGEODEGX1 || MGEODE_LX || MCORE2) && !X86_NUMAQ && !X86_XEN
 +	default y
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Kconfig.debug
---- a/arch/i386/Kconfig.debug	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/Kconfig.debug	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/Kconfig.debug
+--- a/arch/i386/Kconfig.debug	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/Kconfig.debug	Thu Sep 13 18:36:53 2007 -0300
 @@ -79,6 +79,7 @@ config DOUBLEFAULT
  config DOUBLEFAULT
  	default y
@@ -304,9 +304,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Kconfig.debug
  	help
            This option allows trapping of rare doublefault exceptions that
            would otherwise cause a system to silently reboot. Disabling this
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Makefile
---- a/arch/i386/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/Makefile
+--- a/arch/i386/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -60,6 +60,11 @@ AFLAGS += $(call as-instr,.cfi_startproc
  
  CFLAGS += $(cflags-y)
@@ -363,9 +363,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/Makefile
  	       arch/$(ARCH)/boot/image.iso \
  	       arch/$(ARCH)/boot/mtools.conf
 +CLEAN_FILES += vmlinuz vmlinux-stripped
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/boot-xen/Makefile
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/boot-xen/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/boot-xen/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/boot-xen/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,21 @@
 +
 +OBJCOPYFLAGS := -g --strip-unneeded
@@ -388,9 +388,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/boot-xen/Makefile
 +	install -m0664 .config $(INSTALL_ROOT)/boot/config-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	install -m0664 System.map $(INSTALL_ROOT)/boot/System.map-$(XINSTALL_NAME)$(INSTALL_SUFFIX)
 +	ln -f -s vmlinuz-$(XINSTALL_NAME)$(INSTALL_SUFFIX) $(INSTALL_ROOT)/boot/vmlinuz-$(VERSION).$(PATCHLEVEL)$(XENGUEST)$(INSTALL_SUFFIX)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/Makefile
---- a/arch/i386/kernel/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/Makefile
+--- a/arch/i386/kernel/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -47,6 +47,12 @@ EXTRA_AFLAGS   := -traditional
  
  obj-$(CONFIG_SCx200)		+= scx200.o
@@ -436,17 +436,17 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/Makefile
 +extra-y := $(call cherrypickxen, $(extra-y))
 +%/head-xen.o %/head-xen.s: EXTRA_AFLAGS :=
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/acpi/Makefile
---- a/arch/i386/kernel/acpi/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/acpi/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/acpi/Makefile
+--- a/arch/i386/kernel/acpi/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/acpi/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -7,4 +7,3 @@ ifneq ($(CONFIG_ACPI_PROCESSOR),)
  ifneq ($(CONFIG_ACPI_PROCESSOR),)
  obj-y				+= cstate.o processor.o
  endif
 -
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/acpi/boot.c
---- a/arch/i386/kernel/acpi/boot.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/acpi/boot.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/acpi/boot.c
+--- a/arch/i386/kernel/acpi/boot.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/acpi/boot.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -103,7 +103,7 @@ static u64 acpi_lapic_addr __initdata = 
   */
  enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
@@ -490,9 +490,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/acpi/boot.c
  	/* detect the location of the ACPI PM Timer */
  	if (acpi_gbl_FADT.header.revision >= FADT2_REVISION_ID) {
  		/* FADT rev. 2 */
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/apic-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/apic-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/apic-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/apic-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1560 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -2054,9 +2054,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/apic-xen.c
 +
 +#endif	/* CONFIG_PM */
 +#endif /* !CONFIG_XEN */
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/asm-offsets.c
---- a/arch/i386/kernel/asm-offsets.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/asm-offsets.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/asm-offsets.c
+--- a/arch/i386/kernel/asm-offsets.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/asm-offsets.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -89,9 +89,14 @@ void foo(void)
  	OFFSET(pbe_orig_address, pbe, orig_address);
  	OFFSET(pbe_next, pbe, next);
@@ -2084,9 +2084,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/asm-offsets.c
 +	OFFSET(XEN_START_mfn_list, start_info, mfn_list);
 +#endif
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/cpu/common.c
---- a/arch/i386/kernel/cpu/common.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/cpu/common.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/cpu/common.c
+--- a/arch/i386/kernel/cpu/common.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/cpu/common.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -19,6 +19,10 @@
  #include <mach_apic.h>
  #endif
@@ -2193,9 +2193,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/cpu/common.c
  	load_LDT(&init_mm.context);
  
  #ifdef CONFIG_DOUBLEFAULT
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/cpu/mtrr/Makefile
---- a/arch/i386/kernel/cpu/mtrr/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/cpu/mtrr/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/cpu/mtrr/Makefile
+--- a/arch/i386/kernel/cpu/mtrr/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/cpu/mtrr/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -1,3 +1,10 @@ obj-y		:= main.o if.o generic.o state.o
  obj-y		:= main.o if.o generic.o state.o
  obj-$(CONFIG_X86_32) += amd.o cyrix.o centaur.o
@@ -2207,9 +2207,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/cpu/mtrr/Makefile
 +obj-y := $(call filterxen, $(obj-y), $(n-obj-xen))
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/cpu/mtrr/main-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/cpu/mtrr/main-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/cpu/mtrr/main-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/cpu/mtrr/main-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,198 @@
 +#include <linux/init.h>
 +#include <linux/proc_fs.h>
@@ -2409,9 +2409,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/cpu/mtrr/main-xen.c
 +}
 +
 +subsys_initcall(mtrr_init);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/crash.c
---- a/arch/i386/kernel/crash.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/crash.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/crash.c
+--- a/arch/i386/kernel/crash.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/crash.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -31,6 +31,7 @@
  /* This keeps a track of which one is crashing cpu. */
  static int crashing_cpu;
@@ -2441,9 +2441,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/crash.c
 +#endif /* CONFIG_XEN */
  	crash_save_cpu(regs, safe_smp_processor_id());
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/e820.c
---- a/arch/i386/kernel/e820.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/e820.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/e820.c
+--- a/arch/i386/kernel/e820.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/e820.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -16,10 +16,24 @@
  #include <asm/e820.h>
  #include <asm/setup.h>
@@ -2689,9 +2689,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/e820.c
  		if (type && ei->type != type)
  			continue;
  		/* is the region (part) in overlap with the current region ?*/
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/entry-xen.S
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/entry-xen.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/entry-xen.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/entry-xen.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1302 @@
 +/*
 + *  linux/arch/i386/entry.S
@@ -3995,9 +3995,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/entry-xen.S
 +#include "syscall_table.S"
 +
 +syscall_table_size=(.-sys_call_table)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/entry.S
---- a/arch/i386/kernel/entry.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/entry.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/entry.S
+--- a/arch/i386/kernel/entry.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/entry.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -287,7 +287,7 @@ ENTRY(sysenter_entry)
  	CFI_SIGNAL_FRAME
  	CFI_DEF_CFA esp, 0
@@ -4025,9 +4025,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/entry.S
  	CFI_DEF_CFA esp, 0;			\
  	CFI_UNDEFINED eip;			\
  	pushfl;					\
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/fixup.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/fixup.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/fixup.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/fixup.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,95 @@
 +/******************************************************************************
 + * fixup.c
@@ -4124,9 +4124,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/fixup.c
 +	return 0;
 +}
 +__initcall(fixup_init);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/head-xen.S
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/head-xen.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/head-xen.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/head-xen.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,299 @@
 +
 +
@@ -4427,9 +4427,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/head-xen.S
 +#endif
 +	ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz, "generic")
 +	ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long,  1)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/init_task.c
---- a/arch/i386/kernel/init_task.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/init_task.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/init_task.c
+--- a/arch/i386/kernel/init_task.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/init_task.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -14,7 +14,14 @@ static struct files_struct init_files = 
  static struct files_struct init_files = INIT_FILES;
  static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
@@ -4457,9 +4457,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/init_task.c
  DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_internodealigned_in_smp = INIT_TSS;
 +#endif
  
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/io_apic-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/io_apic-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/io_apic-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/io_apic-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2976 @@
 +/*
 + *	Intel IO-APIC support for multi-Pentium hosts.
@@ -7437,9 +7437,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/io_apic-xen.c
 +	return 0;
 +}
 +early_param("noapic", parse_noapic);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/ioport-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/ioport-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/ioport-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/ioport-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,122 @@
 +/*
 + *	linux/arch/i386/kernel/ioport.c
@@ -7563,9 +7563,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/ioport-xen.c
 +	set_iopl_mask(t->iopl);
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/irq.c
---- a/arch/i386/kernel/irq.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/irq.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/irq.c
+--- a/arch/i386/kernel/irq.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/irq.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -302,7 +302,9 @@ skip:
  }
  
@@ -7586,9 +7586,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/irq.c
  			mask = map;
  		}
  		if (irq_desc[irq].chip->set_affinity)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/ldt-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/ldt-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/ldt-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/ldt-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,268 @@
 +/*
 + * linux/arch/i386/kernel/ldt.c
@@ -7858,9 +7858,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/ldt-xen.c
 +	}
 +	return ret;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/machine_kexec.c
---- a/arch/i386/kernel/machine_kexec.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/machine_kexec.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/machine_kexec.c
+--- a/arch/i386/kernel/machine_kexec.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/machine_kexec.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -20,6 +20,10 @@
  #include <asm/desc.h>
  #include <asm/system.h>
@@ -7937,9 +7937,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/machine_kexec.c
  
  /* crashkernel=size@addr specifies the location to reserve for
   * a crash kernel.  By reserving this memory we guarantee
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/microcode-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/microcode-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/microcode-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/microcode-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,144 @@
 +/*
 + *	Intel CPU Microcode Update Driver for Linux
@@ -8085,9 +8085,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/microcode-xen.c
 +module_init(microcode_init)
 +module_exit(microcode_exit)
 +MODULE_ALIAS_MISCDEV(MICROCODE_MINOR);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/mpparse.c
---- a/arch/i386/kernel/mpparse.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/mpparse.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/mpparse.c
+--- a/arch/i386/kernel/mpparse.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/mpparse.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -106,6 +106,7 @@ static struct mpc_config_translation *tr
  
  static void __cpuinit MP_processor_info (struct mpc_config_processor *m)
@@ -8222,9 +8222,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/mpparse.c
  	if ((boot_cpu_data.x86_vendor == X86_VENDOR_INTEL)
  		&& !APIC_XAPIC(apic_version[boot_cpu_physical_apicid]))
  		tmpid = io_apic_get_unique_id(idx, id);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/pci-dma-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/pci-dma-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/pci-dma-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/pci-dma-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,395 @@
 +/*
 + * Dynamic DMA mapping support.
@@ -8621,9 +8621,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/pci-dma-xen.c
 +		swiotlb_sync_single_for_device(dev, dma_handle, size, direction);
 +}
 +EXPORT_SYMBOL(dma_sync_single_for_device);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/process-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/process-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/process-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/process-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,905 @@
 +/*
 + *  linux/arch/i386/kernel/process.c
@@ -9530,9 +9530,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/process-xen.c
 +		sp -= get_random_int() % 8192;
 +	return sp & ~0xf;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/quirks.c
---- a/arch/i386/kernel/quirks.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/quirks.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/quirks.c
+--- a/arch/i386/kernel/quirks.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/quirks.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -7,7 +7,7 @@
  #include <asm/genapic.h>
  #include <asm/cpu.h>
@@ -9577,9 +9577,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/quirks.c
  	}
  
  	/* put back the original value for config space */
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/setup-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/setup-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/setup-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/setup-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,825 @@
 +/*
 + *  linux/arch/i386/kernel/setup.c
@@ -10406,9 +10406,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/setup-xen.c
 +	/* we're never actually going to get here... */
 +	return NOTIFY_DONE;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/smp-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/smp-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/smp-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/smp-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,697 @@
 +/*
 + *	Intel SMP support routines.
@@ -11107,9 +11107,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/smp-xen.c
 +{
 +	return smp_processor_id();
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/swiotlb.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/swiotlb.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/swiotlb.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/swiotlb.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,716 @@
 +/*
 + * Dynamic DMA mapping support.
@@ -11827,9 +11827,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/swiotlb.c
 +EXPORT_SYMBOL(swiotlb_sync_sg_for_device);
 +EXPORT_SYMBOL(swiotlb_dma_mapping_error);
 +EXPORT_SYMBOL(swiotlb_dma_supported);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/sysenter.c
---- a/arch/i386/kernel/sysenter.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/sysenter.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/sysenter.c
+--- a/arch/i386/kernel/sysenter.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/sysenter.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -22,6 +22,10 @@
  #include <asm/msr.h>
  #include <asm/pgtable.h>
@@ -11884,9 +11884,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/sysenter.c
  #endif
  
  	if (!boot_cpu_has(X86_FEATURE_SEP)) {
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/time-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/time-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/time-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/time-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1074 @@
 +/*
 + *  linux/arch/i386/kernel/time.c
@@ -12962,9 +12962,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/time-xen.c
 +	return 0;
 +}
 +__initcall(xen_sysctl_init);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/traps-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/traps-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/traps-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/traps-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1145 @@
 +/*
 + *  linux/arch/i386/traps.c
@@ -14111,9 +14111,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/traps-xen.c
 +	return 1;
 +}
 +__setup("code_bytes=", code_bytes_setup);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/traps.c
---- a/arch/i386/kernel/traps.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/traps.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/traps.c
+--- a/arch/i386/kernel/traps.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/traps.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -405,7 +405,6 @@ void die(const char * str, struct pt_reg
  		unsigned short ss;
  
@@ -14122,9 +14122,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/traps.c
  		printk(KERN_EMERG "%s: %04lx [#%d]\n", str, err & 0xffff, ++die_counter);
  #ifdef CONFIG_PREEMPT
  		printk(KERN_EMERG "PREEMPT ");
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/vm86.c
---- a/arch/i386/kernel/vm86.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/vm86.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/vm86.c
+--- a/arch/i386/kernel/vm86.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/vm86.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -126,7 +126,9 @@ struct pt_regs * FASTCALL(save_v86_state
  struct pt_regs * FASTCALL(save_v86_state(struct kernel_vm86_regs * regs));
  struct pt_regs * fastcall save_v86_state(struct kernel_vm86_regs * regs)
@@ -14179,9 +14179,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/vm86.c
  
  	tsk->thread.screen_bitmap = info->screen_bitmap;
  	if (info->flags & VM86_SCREEN_BITMAP)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/vmlinux.lds.S
---- a/arch/i386/kernel/vmlinux.lds.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/kernel/vmlinux.lds.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/vmlinux.lds.S
+--- a/arch/i386/kernel/vmlinux.lds.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/kernel/vmlinux.lds.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -35,7 +35,13 @@ PHDRS {
  }
  SECTIONS
@@ -14196,9 +14196,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/vmlinux.lds.S
    phys_startup_32 = startup_32 - LOAD_OFFSET;
  
    .text.head : AT(ADDR(.text.head) - LOAD_OFFSET) {
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/vsyscall-note-xen.S
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/kernel/vsyscall-note-xen.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/kernel/vsyscall-note-xen.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/kernel/vsyscall-note-xen.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,32 @@
 +/*
 + * This supplies .note.* sections to go into the PT_NOTE inside the vDSO text.
@@ -14232,18 +14232,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/kernel/vsyscall-note-xen.S
 +NOTE_KERNELCAP_BEGIN(1, 1)
 +NOTE_KERNELCAP(0, "nosegneg")
 +NOTE_KERNELCAP_END
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mach-xen/Makefile
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mach-xen/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mach-xen/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mach-xen/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,5 @@
 +#
 +# Makefile for the linux kernel.
 +#
 +
 +obj-y				:= setup.o
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mach-xen/setup.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mach-xen/setup.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mach-xen/setup.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mach-xen/setup.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,168 @@
 +/*
 + *	Machine specific setup for generic
@@ -14413,9 +14413,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mach-xen/setup.c
 +	/* Save unparsed command line copy for /proc/cmdline */
 +	boot_command_line[max_cmdline-1] = '\0';
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/Makefile
---- a/arch/i386/mm/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/mm/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/Makefile
+--- a/arch/i386/mm/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/mm/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -8,3 +8,11 @@ obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpag
  obj-$(CONFIG_HUGETLB_PAGE) += hugetlbpage.o
  obj-$(CONFIG_HIGHMEM) += highmem.o
@@ -14428,9 +14428,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/Makefile
 +
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/fault-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/fault-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mm/fault-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mm/fault-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,732 @@
 +/*
 + *  linux/arch/i386/mm/fault.c
@@ -15164,9 +15164,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/fault-xen.c
 +	}
 +}
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/highmem-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/highmem-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mm/highmem-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mm/highmem-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,123 @@
 +#include <linux/highmem.h>
 +#include <linux/module.h>
@@ -15291,9 +15291,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/highmem-xen.c
 +EXPORT_SYMBOL(kmap_atomic_pte);
 +EXPORT_SYMBOL(kunmap_atomic);
 +EXPORT_SYMBOL(kmap_atomic_to_page);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/hypervisor.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/hypervisor.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mm/hypervisor.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mm/hypervisor.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,451 @@
 +/******************************************************************************
 + * mm/hypervisor.c
@@ -15746,9 +15746,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/hypervisor.c
 +		mach_lp, (u64)entry_a | ((u64)entry_b<<32));
 +}
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/init-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/init-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mm/init-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mm/init-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,873 @@
 +/*
 + *  linux/arch/i386/mm/init.c
@@ -16623,9 +16623,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/init-xen.c
 +}
 +#endif
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/ioremap-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/ioremap-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mm/ioremap-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mm/ioremap-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,443 @@
 +/*
 + * arch/i386/mm/ioremap.c
@@ -17070,9 +17070,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/ioremap-xen.c
 +		--nrpages;
 +	}
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/pageattr.c
---- a/arch/i386/mm/pageattr.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/mm/pageattr.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/pageattr.c
+--- a/arch/i386/mm/pageattr.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/mm/pageattr.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -91,7 +91,7 @@ static void set_pmd_pte(pte_t *kpte, uns
  	unsigned long flags;
  
@@ -17082,9 +17082,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/pageattr.c
  		return;
  
  	spin_lock_irqsave(&pgd_lock, flags);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/pgtable-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/mm/pgtable-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/mm/pgtable-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/mm/pgtable-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,761 @@
 +/*
 + *  linux/arch/i386/mm/pgtable.c
@@ -17847,9 +17847,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/mm/pgtable-xen.c
 +	    !mm->context.has_foreign_mappings)
 +		mm_unpin(mm);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/oprofile/Makefile
---- a/arch/i386/oprofile/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/oprofile/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/oprofile/Makefile
+--- a/arch/i386/oprofile/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/oprofile/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -6,7 +6,14 @@ DRIVER_OBJS = $(addprefix ../../../drive
  		oprofilefs.o oprofile_stats.o  \
  		timer_int.o )
@@ -17865,9 +17865,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/oprofile/Makefile
  					   op_model_ppro.o op_model_p4.o
  oprofile-$(CONFIG_X86_IO_APIC)		+= nmi_timer_int.o
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/oprofile/xenoprof.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/oprofile/xenoprof.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/oprofile/xenoprof.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/oprofile/xenoprof.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,179 @@
 +/**
 + * @file xenoprof.c
@@ -18048,9 +18048,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/oprofile/xenoprof.c
 +{
 +	xenoprofile_exit();
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/pci/Makefile
---- a/arch/i386/pci/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/pci/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/pci/Makefile
+--- a/arch/i386/pci/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/pci/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -3,6 +3,10 @@ obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
  obj-$(CONFIG_PCI_BIOS)		+= pcbios.o
  obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig.o direct.o mmconfig-shared.o
@@ -18062,9 +18062,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/pci/Makefile
  
  pci-y				:= fixup.o
  pci-$(CONFIG_ACPI)		+= acpi.o
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/pci/irq.c
---- a/arch/i386/pci/irq.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/pci/irq.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/pci/irq.c
+--- a/arch/i386/pci/irq.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/pci/irq.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -94,13 +94,25 @@ static struct irq_routing_table * __init
  	u8 *addr;
  	struct irq_routing_table *rt;
@@ -18091,9 +18091,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/pci/irq.c
  		rt = pirq_check_routing_table(addr);
  		if (rt)
  			return rt;
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/pci/pcifront.c
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/pci/pcifront.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/i386/pci/pcifront.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/i386/pci/pcifront.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,55 @@
 +/*
 + * PCI Frontend Stub - puts some "dummy" functions in to the Linux x86 PCI core
@@ -18150,18 +18150,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/pci/pcifront.c
 +}
 +
 +arch_initcall(pcifront_x86_stub_init);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/i386/power/Makefile
---- a/arch/i386/power/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/i386/power/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/i386/power/Makefile
+--- a/arch/i386/power/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/i386/power/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -1,2 +1,4 @@ obj-$(CONFIG_PM)		+= cpu.o
 -obj-$(CONFIG_PM)		+= cpu.o
 +obj-$(CONFIG_PM_LEGACY)		+= cpu.o
 +obj-$(CONFIG_SOFTWARE_SUSPEND)	+= cpu.o
 +obj-$(CONFIG_ACPI_SLEEP)	+= cpu.o
  obj-$(CONFIG_SOFTWARE_SUSPEND)	+= swsusp.o suspend.o
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/Kconfig
---- a/arch/ia64/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/Kconfig
+--- a/arch/ia64/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -72,6 +72,34 @@ config GENERIC_IOMAP
  config GENERIC_IOMAP
  	bool
@@ -18233,9 +18233,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/Kconfig
 +endif
 +
 +source "drivers/xen/Kconfig"
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/Makefile
---- a/arch/ia64/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/Makefile
+--- a/arch/ia64/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -45,6 +45,12 @@ endif
  endif
  
@@ -18276,9 +18276,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/Makefile
  
  define archhelp
    echo '* compressed	- Build compressed kernel image'
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/dig/setup.c
---- a/arch/ia64/dig/setup.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/dig/setup.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/dig/setup.c
+--- a/arch/ia64/dig/setup.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/dig/setup.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -23,6 +23,8 @@
  #include <asm/io.h>
  #include <asm/machvec.h>
@@ -18308,8 +18308,8 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/dig/setup.c
 +	xen_start_info->console.domU.evtchn = 0;
 +#endif
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/hp/sim/Makefile
---- a/arch/ia64/hp/sim/Makefile	Fri Jul 20 11:42:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/hp/sim/Makefile
+--- a/arch/ia64/hp/sim/Makefile	Thu Sep 13 18:35:01 2007 -0300
 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
 @@ -1,16 +0,0 @@
 -#
@@ -18328,9 +18328,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/hp/sim/Makefile
 -obj-$(CONFIG_HP_SIMSERIAL) += simserial.o
 -obj-$(CONFIG_HP_SIMSERIAL_CONSOLE) += hpsim_console.o
 -obj-$(CONFIG_HP_SIMSCSI) += simscsi.o
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/asm-offsets.c
---- a/arch/ia64/kernel/asm-offsets.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/asm-offsets.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/asm-offsets.c
+--- a/arch/ia64/kernel/asm-offsets.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/asm-offsets.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -269,4 +269,29 @@ void foo(void)
  	DEFINE(IA64_TIME_SOURCE_MMIO64, TIME_SOURCE_MMIO64);
  	DEFINE(IA64_TIME_SOURCE_MMIO32, TIME_SOURCE_MMIO32);
@@ -18361,9 +18361,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/asm-offsets.c
 +	DEFINE_MAPPED_REG_OFS(XSI_B1NATS_OFS, vnat);    
 +#endif /* CONFIG_XEN */
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/entry.S
---- a/arch/ia64/kernel/entry.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/entry.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/entry.S
+--- a/arch/ia64/kernel/entry.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/entry.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -180,7 +180,7 @@ END(sys_clone)
   *	called.  The code starting at .map relies on this.  The rest of the code
   *	doesn't care about the interrupt masking status.
@@ -18512,9 +18512,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/entry.S
  	data8 sys_sync_file_range		// 1300
  	data8 sys_tee
  	data8 sys_vmsplice
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/fsys.S
---- a/arch/ia64/kernel/fsys.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/fsys.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/fsys.S
+--- a/arch/ia64/kernel/fsys.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/fsys.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -571,11 +571,34 @@ ENTRY(fsys_fallback_syscall)
  	adds r17=-1024,r15
  	movl r14=sys_call_table
@@ -18576,9 +18576,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/fsys.S
  	cmp.eq p8,p0=r3,r0			// A
  (p10)	br.cond.spnt.many ia64_ret_from_syscall	// B    return if bad call-frame or r15 is a NaT
  
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/gate.S
---- a/arch/ia64/kernel/gate.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/gate.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/gate.S
+--- a/arch/ia64/kernel/gate.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/gate.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -6,13 +6,15 @@
   * 	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -18739,9 +18739,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/gate.S
  (p9)	mov r8=ENOSYS
  	FSYS_RETURN
  END(__kernel_syscall_via_epc)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/gate.lds.S
---- a/arch/ia64/kernel/gate.lds.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/gate.lds.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/gate.lds.S
+--- a/arch/ia64/kernel/gate.lds.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/gate.lds.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -43,6 +43,20 @@ SECTIONS
  				    __start_gate_brl_fsys_bubble_down_patchlist = .;
  				    *(.data.patch.brl_fsys_bubble_down)
@@ -18763,9 +18763,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/gate.lds.S
    }									:readable
    .IA_64.unwind_info		: { *(.IA_64.unwind_info*) }
    .IA_64.unwind			: { *(.IA_64.unwind*) }			:readable :unwind
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/head.S
---- a/arch/ia64/kernel/head.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/head.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/head.S
+--- a/arch/ia64/kernel/head.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/head.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -366,6 +366,12 @@ 1:	// now we are in virtual mode
  (isBP)	movl r2=ia64_boot_param
  	;;
@@ -18779,9 +18779,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/head.S
  
  #ifdef CONFIG_SMP
  (isAP)	br.call.sptk.many rp=start_secondary
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/iosapic.c
---- a/arch/ia64/kernel/iosapic.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/iosapic.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/iosapic.c
+--- a/arch/ia64/kernel/iosapic.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/iosapic.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -159,6 +159,75 @@ static int iosapic_kmalloc_ok;
  static int iosapic_kmalloc_ok;
  static LIST_HEAD(free_rte_list);
@@ -18878,9 +18878,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/iosapic.c
  	if (pcat_compat) {
  		/*
  		 * Disable the compatibility mode interrupts (8259 style),
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/irq_ia64.c
---- a/arch/ia64/kernel/irq_ia64.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/irq_ia64.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/irq_ia64.c
+--- a/arch/ia64/kernel/irq_ia64.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/irq_ia64.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -31,6 +31,10 @@
  #include <linux/threads.h>
  #include <linux/bitops.h>
@@ -19257,9 +19257,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/irq_ia64.c
  #ifdef CONFIG_SMP
  	phys_cpu_id = cpu_physical_id(cpu);
  #else
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/pal.S
---- a/arch/ia64/kernel/pal.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/pal.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/pal.S
+--- a/arch/ia64/kernel/pal.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/pal.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -16,6 +16,7 @@
  #include <asm/processor.h>
  
@@ -19277,9 +19277,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/pal.S
  
  /*
   * Make a PAL call using the stacked registers calling convention.
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/patch.c
---- a/arch/ia64/kernel/patch.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/patch.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/patch.c
+--- a/arch/ia64/kernel/patch.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/patch.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -184,6 +184,69 @@ patch_brl_fsys_bubble_down (unsigned lon
  	ia64_srlz_i();
  }
@@ -19361,9 +19361,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/patch.c
  	ia64_patch_vtop(START(vtop), END(vtop));
  	ia64_patch_mckinley_e9(START(mckinley_e9), END(mckinley_e9));
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/perfmon.c
---- a/arch/ia64/kernel/perfmon.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/perfmon.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/perfmon.c
+--- a/arch/ia64/kernel/perfmon.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/perfmon.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -53,6 +53,28 @@
  #include <asm/delay.h>
  
@@ -19558,9 +19558,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/perfmon.c
  	DPRINT(("ctx_state=%d task [%d]\n", ctx->ctx_state, task ? task->pid : -1));
  
  	prev_state = ctx->ctx_state;
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/setup.c
---- a/arch/ia64/kernel/setup.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/setup.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/setup.c
+--- a/arch/ia64/kernel/setup.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/setup.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -61,6 +61,12 @@
  #include <asm/system.h>
  #include <asm/unistd.h>
@@ -19815,9 +19815,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/setup.c
  	pm_idle = default_idle;
  }
  
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/time.c
---- a/arch/ia64/kernel/time.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/kernel/time.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/kernel/time.c
+--- a/arch/ia64/kernel/time.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/kernel/time.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -29,6 +29,13 @@
  #include <asm/sections.h>
  #include <asm/system.h>
@@ -20002,9 +20002,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/kernel/time.c
  	/* Setup the CPU local timer tick */
  	ia64_cpu_local_tick();
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/mm/ioremap.c
---- a/arch/ia64/mm/ioremap.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/mm/ioremap.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/mm/ioremap.c
+--- a/arch/ia64/mm/ioremap.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/mm/ioremap.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -16,6 +16,9 @@ static inline void __iomem *
  static inline void __iomem *
  __ioremap (unsigned long offset, unsigned long size)
@@ -20015,9 +20015,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/mm/ioremap.c
  	return (void __iomem *) (__IA64_UNCACHED_OFFSET | offset);
  }
  
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/Makefile
---- a/arch/ia64/oprofile/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/oprofile/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/oprofile/Makefile
+--- a/arch/ia64/oprofile/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/oprofile/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -8,3 +8,7 @@ DRIVER_OBJS := $(addprefix ../../../driv
  
  oprofile-y := $(DRIVER_OBJS) init.o backtrace.o
@@ -20026,9 +20026,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/Makefile
 +oprofile-$(CONFIG_PERFMON) += xenoprof.o \
 +	../../../drivers/xen/xenoprof/xenoprofile.o
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/init.c
---- a/arch/ia64/oprofile/init.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/oprofile/init.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/oprofile/init.c
+--- a/arch/ia64/oprofile/init.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/oprofile/init.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -11,6 +11,7 @@
  #include <linux/oprofile.h>
  #include <linux/init.h>
@@ -20064,9 +20064,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/init.c
  #ifdef CONFIG_PERFMON
  	perfmon_exit();
  #endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/oprofile_perfmon.h
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/oprofile/oprofile_perfmon.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/oprofile/oprofile_perfmon.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/oprofile/oprofile_perfmon.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,28 @@
 +#ifndef OPROFILE_PERFMON_H
 +#define OPROFILE_PERFMON_H
@@ -20096,9 +20096,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/oprofile_perfmon.h
 +#endif /* CONFIG_XEN */
 +
 +#endif /* OPROFILE_PERFMON_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/perfmon.c
---- a/arch/ia64/oprofile/perfmon.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/oprofile/perfmon.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/oprofile/perfmon.c
+--- a/arch/ia64/oprofile/perfmon.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/oprofile/perfmon.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -13,6 +13,7 @@
  #include <asm/perfmon.h>
  #include <asm/ptrace.h>
@@ -20174,9 +20174,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/perfmon.c
 -	pfm_unregister_buffer_fmt(oprofile_fmt.fmt_uuid);
 +	__perfmon_exit();
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/xenoprof.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/oprofile/xenoprof.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/oprofile/xenoprof.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/oprofile/xenoprof.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,142 @@
 +/******************************************************************************
 + * xenoprof ia64 specific part
@@ -20320,9 +20320,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/oprofile/xenoprof.c
 +
 +	return ret;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/pci/pci.c
---- a/arch/ia64/pci/pci.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/ia64/pci/pci.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/pci/pci.c
+--- a/arch/ia64/pci/pci.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/ia64/pci/pci.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -612,6 +612,14 @@ pci_mmap_page_range (struct pci_dev *dev
  	else
  		vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
@@ -20353,9 +20353,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/pci/pci.c
  	if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
  			    size, vma->vm_page_prot))
  		return -EAGAIN;
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/Makefile
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,9 @@
 +#
 +# Makefile for Xen components
@@ -20366,9 +20366,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/Makefile
 +	 xcom_mini.o xcom_privcmd.o mem.o
 +
 +pci-dma-xen-y := ../../i386/kernel/pci-dma-xen.o
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/hypercall.S
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/hypercall.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/hypercall.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/hypercall.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,170 @@
 +/*
 + * Support routines for Xen hypercalls
@@ -20540,9 +20540,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/hypercall.S
 +	;; 
 +END(__hypercall)
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/hypervisor.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/hypervisor.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/hypervisor.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/hypervisor.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1183 @@
 +/******************************************************************************
 + * include/asm-ia64/shadow.h
@@ -21727,9 +21727,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/hypervisor.c
 +	xen_ia64_release_resource(res);
 +}
 +EXPORT_SYMBOL_GPL(xen_ia64_unmap_resource);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/mem.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/mem.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/mem.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/mem.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,75 @@
 +/*
 + *  Originally from linux/drivers/char/mem.c
@@ -21806,9 +21806,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/mem.c
 +                return -EAGAIN;
 +        return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/util.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/util.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/util.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/util.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,105 @@
 +/******************************************************************************
 + * arch/ia64/xen/util.c
@@ -21915,9 +21915,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/util.c
 + *  tab-width: 8
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xcom_hcall.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xcom_hcall.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xcom_hcall.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xcom_hcall.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,383 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
@@ -22302,9 +22302,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xcom_hcall.c
 +	return xencomm_arch_hypercall_vcpu_op(cmd, cpu,
 +					      xencomm_create_inline(arg));
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xcom_mini.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xcom_mini.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xcom_mini.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xcom_mini.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,456 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
@@ -22762,9 +22762,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xcom_mini.c
 +	return xencomm_arch_hypercall_sched_op(cmd, desc);
 +}
 +EXPORT_SYMBOL_GPL(xencomm_mini_hypercall_sched_op);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xcom_privcmd.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xcom_privcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xcom_privcmd.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xcom_privcmd.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,664 @@
 +/*
 + * This program is free software; you can redistribute it and/or modify
@@ -23430,9 +23430,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xcom_privcmd.c
 +	}
 +}
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xencomm.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xencomm.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xencomm.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xencomm.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,263 @@
 +/*
 + * Copyright (C) 2006 Hollis Blanchard <hollisb@us.ibm.com>, IBM Corporation
@@ -23697,9 +23697,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xencomm.c
 +	*ret = (struct xencomm_handle*)res;
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenentry.S
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xenentry.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xenentry.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xenentry.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,931 @@
 +/*
 + * ia64/xen/entry.S
@@ -24632,9 +24632,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenentry.S
 +#else
 +END(ia64_leave_kernel)
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenhpski.c
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xenhpski.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xenhpski.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xenhpski.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,19 @@
 +
 +extern unsigned long xen_get_cpuid(int);
@@ -24655,9 +24655,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenhpski.c
 +	return 1;
 +}
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenivt.S
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xenivt.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xenivt.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xenivt.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2177 @@
 +/*
 + * arch/ia64/xen/ivt.S
@@ -26836,9 +26836,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenivt.S
 +
 +   
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenminstate.h
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xenminstate.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xenminstate.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xenminstate.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,359 @@
 +
 +#include <asm/cache.h>
@@ -27199,9 +27199,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenminstate.h
 +#else
 +#define SAVE_MIN		DO_SAVE_MIN(     , mov r30=r0, )
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenpal.S
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xenpal.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xenpal.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xenpal.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,85 @@
 +/*
 + * ia64/xen/xenpal.S
@@ -27288,9 +27288,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xenpal.S
 +	srlz.d				// seralize restoration of psr.l
 +	br.ret.sptk.many b0
 +END(xen_pal_call_static)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xensetup.S
+diff -r d91e11100fb0 -r d610071e6045 arch/ia64/xen/xensetup.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/ia64/xen/xensetup.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/ia64/xen/xensetup.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,52 @@
 +/*
 + * Support routines for Xen
@@ -27344,9 +27344,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/ia64/xen/xensetup.S
 +	;; 
 +	br.ret.sptk.many b0
 +END(xencomm_arch_hypercall_suspend)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/um/kernel/physmem.c
---- a/arch/um/kernel/physmem.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/um/kernel/physmem.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/um/kernel/physmem.c
+--- a/arch/um/kernel/physmem.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/um/kernel/physmem.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -226,7 +226,7 @@ EXPORT_SYMBOL(physmem_remove_mapping);
  EXPORT_SYMBOL(physmem_remove_mapping);
  EXPORT_SYMBOL(physmem_subst_mapping);
@@ -27365,9 +27365,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/um/kernel/physmem.c
  }
  
  int is_remapped(void *virt)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/Kconfig
---- a/arch/x86_64/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/Kconfig
+--- a/arch/x86_64/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -27,6 +27,7 @@ config GENERIC_TIME
  config GENERIC_TIME
  	bool
@@ -27567,9 +27567,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/Kconfig
 +source "drivers/xen/Kconfig"
 +
  source "lib/Kconfig"
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/Makefile
---- a/arch/x86_64/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/Makefile
+--- a/arch/x86_64/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -35,6 +35,10 @@ cflags-$(CONFIG_MCORE2) += \
  cflags-$(CONFIG_MCORE2) += \
  	$(call cc-option,-march=core2,$(call cc-option,-mtune=generic))
@@ -27611,9 +27611,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/Makefile
  
  archclean:
  	$(Q)$(MAKE) $(clean)=$(boot)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/Makefile
---- a/arch/x86_64/ia32/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/ia32/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/ia32/Makefile
+--- a/arch/x86_64/ia32/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/ia32/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -14,11 +14,19 @@ audit-class-$(CONFIG_AUDIT) := audit.o
  audit-class-$(CONFIG_AUDIT) := audit.o
  obj-$(CONFIG_IA32_EMULATION) += $(audit-class-y)
@@ -27655,9 +27655,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/Makefile
 +
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/ia32entry-xen.S
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/ia32/ia32entry-xen.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/ia32/ia32entry-xen.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/ia32/ia32entry-xen.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,749 @@
 +/*
 + * Compatibility mode system call entry point for x86-64. 
@@ -28408,9 +28408,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/ia32entry-xen.S
 +	.quad sys_getcpu
 +	.quad sys_epoll_pwait
 +ia32_syscall_end:		
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/syscall32.c
---- a/arch/x86_64/ia32/syscall32.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/ia32/syscall32.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/ia32/syscall32.c
+--- a/arch/x86_64/ia32/syscall32.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/ia32/syscall32.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -14,12 +14,17 @@
  #include <asm/tlbflush.h>
  #include <asm/ia32_unistd.h>
@@ -28474,9 +28474,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/syscall32.c
  	wrmsrl(MSR_CSTAR, ia32_cstar_target);
 +#endif
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/syscall32_syscall.S
---- a/arch/x86_64/ia32/syscall32_syscall.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/ia32/syscall32_syscall.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/ia32/syscall32_syscall.S
+--- a/arch/x86_64/ia32/syscall32_syscall.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/ia32/syscall32_syscall.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -1,6 +1,17 @@
  /* 32bit VDSOs mapped into user space. */
  
@@ -28495,9 +28495,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/syscall32_syscall.S
  
  	.globl syscall32_syscall
  	.globl syscall32_syscall_end
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/vsyscall-int80.S
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/ia32/vsyscall-int80.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/ia32/vsyscall-int80.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/ia32/vsyscall-int80.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,58 @@
 +/*
 + * Code for the vsyscall page.  This version uses the old int $0x80 method.
@@ -28557,9 +28557,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/ia32/vsyscall-int80.S
 + */
 +#define SYSCALL_ENTER_KERNEL    int $0x80
 +#include "vsyscall-sigreturn.S"
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/Makefile
---- a/arch/x86_64/kernel/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/Makefile
+--- a/arch/x86_64/kernel/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -21,11 +21,13 @@ obj-$(CONFIG_X86_CPUID)		+= cpuid.o
  obj-$(CONFIG_X86_CPUID)		+= cpuid.o
  obj-$(CONFIG_SMP)		+= smp.o smpboot.o trampoline.o tsc_sync.o
@@ -28593,9 +28593,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/Makefile
 +extra-y := $(call cherrypickxen, $(extra-y))
 +%/head-xen.o %/head-xen.s: EXTRA_AFLAGS :=
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/apic-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/apic-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/apic-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/apic-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1262 @@
 +/*
 + *	Local APIC handling, local APIC timers
@@ -29859,9 +29859,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/apic-xen.c
 +__setup("noapictimer", setup_noapictimer); 
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/asm-offsets.c
---- a/arch/x86_64/kernel/asm-offsets.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/asm-offsets.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/asm-offsets.c
+--- a/arch/x86_64/kernel/asm-offsets.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/asm-offsets.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -67,8 +67,10 @@ int main(void)
  	DEFINE(pbe_address, offsetof(struct pbe, address));
  	DEFINE(pbe_orig_address, offsetof(struct pbe, orig_address));
@@ -29873,9 +29873,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/asm-offsets.c
  	BLANK();
  	DEFINE(crypto_tfm_ctx_offset, offsetof(struct crypto_tfm, __crt_ctx));
  	return 0;
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/crash.c
---- a/arch/x86_64/kernel/crash.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/crash.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/crash.c
+--- a/arch/x86_64/kernel/crash.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/crash.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -28,6 +28,7 @@
  /* This keeps a track of which one is crashing cpu. */
  static int crashing_cpu;
@@ -29908,9 +29908,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/crash.c
 +#endif /* CONFIG_XEN */
  	crash_save_cpu(regs, smp_processor_id());
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/e820-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/e820-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/e820-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/e820-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,780 @@
 +/* 
 + * Handle the memory map.
@@ -30692,9 +30692,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/e820-xen.c
 +	printk(KERN_INFO "Allocating PCI resources starting at %lx (gap: %lx:%lx)\n",
 +		pci_mem_start, gapstart, gapsize);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/early_printk.c
---- a/arch/x86_64/kernel/early_printk.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/early_printk.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/early_printk.c
+--- a/arch/x86_64/kernel/early_printk.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/early_printk.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -17,6 +17,7 @@
  #define VGABASE		((void __iomem *)0xffffffff800b8000UL)
  #endif
@@ -30752,9 +30752,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/early_printk.c
  		early_console = &early_vga_console;
   	} else if (!strncmp(buf, "simnow", 6)) {
   		simnow_init(buf + 6);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/entry-xen.S
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/entry-xen.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/entry-xen.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/entry-xen.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1209 @@
 +/*
 + *  linux/arch/x86_64/entry.S
@@ -31965,9 +31965,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/entry-xen.S
 +	ret
 +	CFI_ENDPROC
 +ENDPROC(call_softirq)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/genapic.c
---- a/arch/x86_64/kernel/genapic.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/genapic.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/genapic.c
+--- a/arch/x86_64/kernel/genapic.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/genapic.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -32,14 +32,20 @@ extern struct genapic apic_flat;
  extern struct genapic apic_flat;
  extern struct genapic apic_physflat;
@@ -32014,9 +32014,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/genapic.c
 +	xen_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL);
 +#endif
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/genapic_xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/genapic_xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/genapic_xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/genapic_xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,190 @@
 +/*
 + * Copyright 2004 James Cleverdon, IBM.
@@ -32208,9 +32208,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/genapic_xen.c
 +	.cpu_mask_to_apicid = xen_cpu_mask_to_apicid,
 +	.phys_pkg_id = phys_pkg_id,
 +};
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/head-xen.S
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/head-xen.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/head-xen.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/head-xen.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,206 @@
 +/*
 + *  linux/arch/x86_64/kernel/head.S -- start in 32bit and switch to 64bit
@@ -32418,9 +32418,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/head-xen.S
 +	ELFNOTE(Xen, XEN_ELFNOTE_FEATURES,       .asciz, "writable_page_tables|writable_descriptor_tables|auto_translated_physmap|pae_pgdir_above_4gb|supervisor_mode_kernel")
 +	ELFNOTE(Xen, XEN_ELFNOTE_LOADER,         .asciz, "generic")
 +	ELFNOTE(Xen, XEN_ELFNOTE_SUSPEND_CANCEL, .long,  1)
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/head64.c
---- a/arch/x86_64/kernel/head64.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/head64.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/head64.c
+--- a/arch/x86_64/kernel/head64.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/head64.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -2,6 +2,9 @@
   *  linux/arch/x86_64/kernel/head64.c -- prepare to run common code
   *
@@ -32537,9 +32537,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/head64.c
  
   	for (i = 0; i < NR_CPUS; i++)
   		cpu_pda(i) = &boot_cpu_pda[i];
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/init_task.c
---- a/arch/x86_64/kernel/init_task.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/init_task.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/init_task.c
+--- a/arch/x86_64/kernel/init_task.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/init_task.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -37,6 +37,8 @@ struct task_struct init_task = INIT_TASK
  struct task_struct init_task = INIT_TASK(init_task);
  
@@ -32556,9 +32556,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/init_task.c
 +#endif
  
  #define ALIGN_TO_4K __attribute__((section(".data.init_task")))
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/io_apic-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/io_apic-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/io_apic-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/io_apic-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2317 @@
 +/*
 + *	Intel IO-APIC support for multi-Pentium hosts.
@@ -34877,9 +34877,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/io_apic-xen.c
 +}
 +#endif
 +#endif /* !CONFIG_XEN */
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/ioport-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/ioport-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/ioport-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/ioport-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,100 @@
 +/*
 + *	linux/arch/x86_64/kernel/ioport.c
@@ -34981,9 +34981,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/ioport-xen.c
 +
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/irq.c
---- a/arch/x86_64/kernel/irq.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/irq.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/irq.c
+--- a/arch/x86_64/kernel/irq.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/irq.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -113,7 +113,11 @@ asmlinkage unsigned int do_IRQ(struct pt
  
  	exit_idle();
@@ -34996,9 +34996,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/irq.c
  
  #ifdef CONFIG_DEBUG_STACKOVERFLOW
  	stack_overflow_check(regs);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/ldt-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/ldt-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/ldt-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/ldt-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,283 @@
 +/*
 + * linux/arch/x86_64/kernel/ldt.c
@@ -35283,9 +35283,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/ldt-xen.c
 +	}
 +	return ret;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/machine_kexec.c
---- a/arch/x86_64/kernel/machine_kexec.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/machine_kexec.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/machine_kexec.c
+--- a/arch/x86_64/kernel/machine_kexec.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/machine_kexec.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -24,6 +24,104 @@ static u64 kexec_pmd1[512] PAGE_ALIGNED;
  static u64 kexec_pmd1[512] PAGE_ALIGNED;
  static u64 kexec_pte1[512] PAGE_ALIGNED;
@@ -35480,9 +35480,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/machine_kexec.c
  }
  early_param("crashkernel", setup_crashkernel);
 -
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/mpparse.c
---- a/arch/x86_64/kernel/mpparse.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/mpparse.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/mpparse.c
+--- a/arch/x86_64/kernel/mpparse.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/mpparse.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -88,8 +88,10 @@ static int __init mpf_checksum(unsigned 
  	return sum & 0xFF;
  }
@@ -35596,9 +35596,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/mpparse.c
  	mp_ioapics[idx].mpc_apicid = id;
  	mp_ioapics[idx].mpc_apicver = 0;
  	
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/pci-swiotlb.c
---- a/arch/x86_64/kernel/pci-swiotlb.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/pci-swiotlb.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/pci-swiotlb.c
+--- a/arch/x86_64/kernel/pci-swiotlb.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/pci-swiotlb.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -9,10 +9,13 @@
  #include <asm/swiotlb.h>
  #include <asm/dma.h>
@@ -35638,9 +35638,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/pci-swiotlb.c
  	}
 +#endif /* CONFIG_XEN */
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/process-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/process-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/process-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/process-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,904 @@
 +/*
 + *  linux/arch/x86-64/kernel/process.c
@@ -36546,9 +36546,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/process-xen.c
 +{
 +}
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/setup-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/setup-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/setup-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/setup-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1346 @@
 +/*
 + *  linux/arch/x86-64/kernel/setup.c
@@ -37896,9 +37896,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/setup-xen.c
 +	.stop =	c_stop,
 +	.show =	show_cpuinfo,
 +};
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/setup64-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/setup64-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/setup64-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/setup64-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,356 @@
 +/* 
 + * X86-64 specific CPU setup.
@@ -38256,9 +38256,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/setup64-xen.c
 +
 +	raw_local_save_flags(kernel_eflags);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/smp.c
---- a/arch/x86_64/kernel/smp.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/smp.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/smp.c
+--- a/arch/x86_64/kernel/smp.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/smp.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -28,7 +28,11 @@
  #include <asm/proto.h>
  #include <asm/apicdef.h>
@@ -38403,9 +38403,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/smp.c
 +	return IRQ_HANDLED;
 +#endif
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/time-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/time-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/time-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/time-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1065 @@
 +/*
 + *  linux/arch/i386/kernel/time.c
@@ -39472,9 +39472,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/time-xen.c
 +	return 0;
 +}
 +__initcall(xen_sysctl_init);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/traps-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/traps-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/traps-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/traps-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1156 @@
 +/*
 + *  linux/arch/x86-64/traps.c
@@ -40632,9 +40632,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/traps-xen.c
 +	return 0;
 +}
 +early_param("kstack", kstack_setup);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/vmlinux.lds.S
---- a/arch/x86_64/kernel/vmlinux.lds.S	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/vmlinux.lds.S	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/vmlinux.lds.S
+--- a/arch/x86_64/kernel/vmlinux.lds.S	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/vmlinux.lds.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -121,7 +121,7 @@ SECTIONS
    . = ALIGN(8192);		/* init_task */
    .data.init_task : AT(ADDR(.data.init_task) - LOAD_OFFSET) {
@@ -40651,9 +40651,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/vmlinux.lds.S
 +
 +  NOTES
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/vsyscall.c
---- a/arch/x86_64/kernel/vsyscall.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/kernel/vsyscall.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/vsyscall.c
+--- a/arch/x86_64/kernel/vsyscall.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/kernel/vsyscall.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -42,6 +42,9 @@
  #include <asm/segment.h>
  #include <asm/desc.h>
@@ -40721,9 +40721,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/vsyscall.c
  #ifdef CONFIG_SYSCTL
  	register_sysctl_table(kernel_root_table2);
  #endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/xen_entry.S
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/kernel/xen_entry.S
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/kernel/xen_entry.S	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/kernel/xen_entry.S	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,40 @@
 +/*
 + * Copied from arch/xen/i386/kernel/entry.S
@@ -40765,9 +40765,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/kernel/xen_entry.S
 +VGCF_IN_SYSCALL = (1<<8)
 +        
 +	
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/Makefile
---- a/arch/x86_64/mm/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/mm/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/mm/Makefile
+--- a/arch/x86_64/mm/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/mm/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -9,3 +9,13 @@ obj-$(CONFIG_ACPI_NUMA) += srat.o
  obj-$(CONFIG_ACPI_NUMA) += srat.o
  
@@ -40782,9 +40782,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/Makefile
 +
 +obj-y := $(call cherrypickxen, $(obj-y))
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/fault.c
---- a/arch/x86_64/mm/fault.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/mm/fault.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/mm/fault.c
+--- a/arch/x86_64/mm/fault.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/mm/fault.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -159,9 +159,7 @@ void dump_pagetable(unsigned long addres
  	pmd_t *pmd;
  	pte_t *pte;
@@ -40906,9 +40906,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/fault.c
  		if (notify_page_fault(regs, error_code) == NOTIFY_STOP)
  			return;
  		/*
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/init-xen.c
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/mm/init-xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/arch/x86_64/mm/init-xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/arch/x86_64/mm/init-xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1215 @@
 +/*
 + *  linux/arch/x86_64/mm/init.c
@@ -42125,9 +42125,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/init-xen.c
 +{
 +	return (addr >= VSYSCALL_START) && (addr < VSYSCALL_END);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/pageattr.c
---- a/arch/x86_64/mm/pageattr.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/mm/pageattr.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/mm/pageattr.c
+--- a/arch/x86_64/mm/pageattr.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/mm/pageattr.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -12,6 +12,201 @@
  #include <asm/processor.h>
  #include <asm/tlbflush.h>
@@ -42350,9 +42350,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/mm/pageattr.c
  	if (page_private(kpte_page) == 0) {
  		save_page(kpte_page);
  		revert_page(address, ref_prot);
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/oprofile/Makefile
---- a/arch/x86_64/oprofile/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/oprofile/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/oprofile/Makefile
+--- a/arch/x86_64/oprofile/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/oprofile/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -11,9 +11,15 @@ DRIVER_OBJS = $(addprefix ../../../drive
  	oprofilefs.o oprofile_stats.o \
  	timer_int.o )
@@ -42371,9 +42371,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/oprofile/Makefile
 +endif
 +oprofile-y = $(DRIVER_OBJS) $(XENOPROF_COMMON_OBJS) \
 +	     $(addprefix ../../i386/oprofile/, $(OPROFILE-y))
-diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/pci/Makefile
---- a/arch/x86_64/pci/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/arch/x86_64/pci/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 arch/x86_64/pci/Makefile
+--- a/arch/x86_64/pci/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/arch/x86_64/pci/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -15,8 +15,13 @@ obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
  
  obj-$(CONFIG_NUMA)	+= k8-bus.o
@@ -42388,9 +42388,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 arch/x86_64/pci/Makefile
  legacy-y += ../../i386/pci/legacy.o
  irq-y    += ../../i386/pci/irq.o
  common-y += ../../i386/pci/common.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/Makefile
---- a/drivers/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/Makefile
+--- a/drivers/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -31,6 +31,7 @@ obj-$(CONFIG_NUBUS)		+= nubus/
  obj-$(CONFIG_NUBUS)		+= nubus/
  obj-$(CONFIG_ATM)		+= atm/
@@ -42399,9 +42399,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/Makefile
  obj-$(CONFIG_IDE)		+= ide/
  obj-$(CONFIG_FC4)		+= fc4/
  obj-$(CONFIG_SCSI)		+= scsi/
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/acpi/Kconfig
---- a/drivers/acpi/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/acpi/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/acpi/Kconfig
+--- a/drivers/acpi/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/acpi/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -7,13 +7,13 @@ menu "ACPI (Advanced Configuration and P
  	depends on !X86_VISWS
  	depends on !IA64_HP_SIM
@@ -42435,9 +42435,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/acpi/Kconfig
  	default y
  	help
  	  The Power Management Timer is available on all ACPI-capable,
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/hangcheck-timer.c
---- a/drivers/char/hangcheck-timer.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/char/hangcheck-timer.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/hangcheck-timer.c
+--- a/drivers/char/hangcheck-timer.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/char/hangcheck-timer.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -117,7 +117,7 @@ __setup("hcheck_dump_tasks", hangcheck_p
  __setup("hcheck_dump_tasks", hangcheck_parse_dump_tasks);
  #endif /* not MODULE */
@@ -42447,9 +42447,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/hangcheck-timer.c
  # define HAVE_MONOTONIC
  # define TIMER_FREQ 1000000000ULL
  #elif defined(CONFIG_IA64)
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/mem.c
---- a/drivers/char/mem.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/char/mem.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/mem.c
+--- a/drivers/char/mem.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/char/mem.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -102,6 +102,7 @@ static inline int valid_mmap_phys_addr_r
  }
  #endif
@@ -42484,9 +42484,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/mem.c
  
  static const struct file_operations kmem_fops = {
  	.llseek		= memory_lseek,
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/Kconfig
---- a/drivers/char/tpm/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/char/tpm/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/tpm/Kconfig
+--- a/drivers/char/tpm/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/char/tpm/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -58,5 +58,13 @@ config TCG_INFINEON
  	  Further information on this driver and the supported hardware
  	  can be found at http://www.prosec.rub.de/tpm
@@ -42502,18 +42502,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/Kconfig
 +
  endmenu
 -
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/Makefile
---- a/drivers/char/tpm/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/char/tpm/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/tpm/Makefile
+--- a/drivers/char/tpm/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/char/tpm/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -9,3 +9,5 @@ obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
  obj-$(CONFIG_TCG_NSC) += tpm_nsc.o
  obj-$(CONFIG_TCG_ATMEL) += tpm_atmel.o
  obj-$(CONFIG_TCG_INFINEON) += tpm_infineon.o
 +obj-$(CONFIG_TCG_XEN) += tpm_xenu.o
 +tpm_xenu-y = tpm_xen.o tpm_vtpm.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm.h
---- a/drivers/char/tpm/tpm.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/char/tpm/tpm.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/tpm/tpm.h
+--- a/drivers/char/tpm/tpm.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/char/tpm/tpm.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -106,6 +106,9 @@ struct tpm_chip {
  	struct dentry **bios_dir;
  
@@ -42543,9 +42543,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm.h
  
  extern void tpm_get_timeouts(struct tpm_chip *);
  extern void tpm_gen_interrupt(struct tpm_chip *);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm_vtpm.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/tpm/tpm_vtpm.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/char/tpm/tpm_vtpm.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/char/tpm/tpm_vtpm.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,542 @@
 +/*
 + * Copyright (C) 2006 IBM Corporation
@@ -43089,9 +43089,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm_vtpm.c
 +	tpm_remove_hardware(dev);
 +	kfree(vtpms);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm_vtpm.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/tpm/tpm_vtpm.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/char/tpm/tpm_vtpm.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/char/tpm/tpm_vtpm.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,55 @@
 +#ifndef TPM_VTPM_H
 +#define TPM_VTPM_H
@@ -43148,9 +43148,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm_vtpm.h
 +}
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm_xen.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/char/tpm/tpm_xen.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/char/tpm/tpm_xen.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/char/tpm/tpm_xen.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,720 @@
 +/*
 + * Copyright (c) 2005, IBM Corporation
@@ -43872,9 +43872,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/char/tpm/tpm_xen.c
 +module_init(tpmif_init);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/firmware/Kconfig
---- a/drivers/firmware/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/firmware/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/firmware/Kconfig
+--- a/drivers/firmware/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/firmware/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -8,6 +8,7 @@ config EDD
  config EDD
  	tristate "BIOS Enhanced Disk Drive calls determine boot disk"
@@ -43883,9 +43883,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/firmware/Kconfig
  	help
  	  Say Y or M here if you want to enable BIOS Enhanced Disk Drive
  	  Services real mode BIOS calls to determine which disk
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/ide/ide-lib.c
---- a/drivers/ide/ide-lib.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/ide/ide-lib.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/ide/ide-lib.c
+--- a/drivers/ide/ide-lib.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/ide/ide-lib.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -435,10 +435,10 @@ void ide_toggle_bounce(ide_drive_t *driv
  {
  	u64 addr = BLK_BOUNCE_HIGH;	/* dma64_addr_t */
@@ -43901,9 +43901,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/ide/ide-lib.c
  			addr = HWIF(drive)->pci_dev->dma_mask;
  	}
  
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/net/e1000/e1000_main.c
---- a/drivers/net/e1000/e1000_main.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/net/e1000/e1000_main.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/net/e1000/e1000_main.c
+--- a/drivers/net/e1000/e1000_main.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/net/e1000/e1000_main.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -2965,7 +2965,8 @@ e1000_tx_csum(struct e1000_adapter *adap
  
  		context_desc->lower_setup.ip_config = 0;
@@ -43914,9 +43914,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/net/e1000/e1000_main.c
  		context_desc->upper_setup.tcp_fields.tucse = 0;
  		context_desc->tcp_seg_setup.data = 0;
  		context_desc->cmd_and_length = cpu_to_le32(E1000_TXD_CMD_DEXT);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/buffer_sync.c
---- a/drivers/oprofile/buffer_sync.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/oprofile/buffer_sync.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/oprofile/buffer_sync.c
+--- a/drivers/oprofile/buffer_sync.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/oprofile/buffer_sync.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -5,6 +5,10 @@
   * @remark Read the file COPYING
   *
@@ -44041,9 +44041,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/buffer_sync.c
  				}
  			}
  		}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/cpu_buffer.c
---- a/drivers/oprofile/cpu_buffer.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/oprofile/cpu_buffer.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/oprofile/cpu_buffer.c
+--- a/drivers/oprofile/cpu_buffer.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/oprofile/cpu_buffer.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -5,6 +5,10 @@
   * @remark Read the file COPYING
   *
@@ -44154,9 +44154,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/cpu_buffer.c
  /*
   * This serves to avoid cpu buffer overflow, and makes sure
   * the task mortuary progresses
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/cpu_buffer.h
---- a/drivers/oprofile/cpu_buffer.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/oprofile/cpu_buffer.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/oprofile/cpu_buffer.h
+--- a/drivers/oprofile/cpu_buffer.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/oprofile/cpu_buffer.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -36,7 +36,7 @@ struct oprofile_cpu_buffer {
  	volatile unsigned long tail_pos;
  	unsigned long buffer_size;
@@ -44179,9 +44179,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/cpu_buffer.h
 +#define CPU_DOMAIN_SWITCH       4
  
  #endif /* OPROFILE_CPU_BUFFER_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/event_buffer.h
---- a/drivers/oprofile/event_buffer.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/oprofile/event_buffer.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/oprofile/event_buffer.h
+--- a/drivers/oprofile/event_buffer.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/oprofile/event_buffer.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -29,14 +29,19 @@ void wake_up_buffer_waiter(void);
  #define CPU_SWITCH_CODE 		2
  #define COOKIE_SWITCH_CODE 		3
@@ -44203,9 +44203,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/event_buffer.h
  
  /* add data to the event buffer */
  void add_event_entry(unsigned long data);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/oprof.c
---- a/drivers/oprofile/oprof.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/oprofile/oprof.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/oprofile/oprof.c
+--- a/drivers/oprofile/oprof.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/oprofile/oprof.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -5,6 +5,10 @@
   * @remark Read the file COPYING
   *
@@ -44259,9 +44259,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/oprof.c
  
  int oprofile_setup(void)
  {
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/oprof.h
---- a/drivers/oprofile/oprof.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/oprofile/oprof.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/oprofile/oprof.h
+--- a/drivers/oprofile/oprof.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/oprofile/oprof.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -35,5 +35,8 @@ void oprofile_timer_init(struct oprofile
  void oprofile_timer_init(struct oprofile_operations * ops);
  
@@ -44271,9 +44271,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/oprof.h
 +int oprofile_set_passive(int passive_domains[], unsigned int pdomains);
   
  #endif /* OPROF_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/oprofile_files.c
---- a/drivers/oprofile/oprofile_files.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/oprofile/oprofile_files.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/oprofile/oprofile_files.c
+--- a/drivers/oprofile/oprofile_files.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/oprofile/oprofile_files.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -5,15 +5,21 @@
   * @remark Read the file COPYING
   *
@@ -44507,9 +44507,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/oprofile/oprofile_files.c
  	oprofilefs_create_file(sb, root, "buffer", &event_buffer_fops);
  	oprofilefs_create_ulong(sb, root, "buffer_size", &fs_buffer_size);
  	oprofilefs_create_ulong(sb, root, "buffer_watershed", &fs_buffer_watershed);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/pci/Kconfig
---- a/drivers/pci/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/pci/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/pci/Kconfig
+--- a/drivers/pci/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/pci/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -5,6 +5,7 @@ config PCI_MSI
  	bool "Message Signaled Interrupts (MSI and MSI-X)"
  	depends on PCI
@@ -44527,9 +44527,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/pci/Kconfig
  	help
  	   This allows native hypertransport devices to use interrupts.
  
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/serial/Kconfig
---- a/drivers/serial/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/serial/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/serial/Kconfig
+--- a/drivers/serial/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/serial/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -11,6 +11,7 @@ config SERIAL_8250
  config SERIAL_8250
  	tristate "8250/16550 and compatible serial support"
@@ -44538,9 +44538,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/serial/Kconfig
  	select SERIAL_CORE
  	---help---
  	  This selects whether you want to include the driver for the standard
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/video/console/Kconfig
---- a/drivers/video/console/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/drivers/video/console/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 drivers/video/console/Kconfig
+--- a/drivers/video/console/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/drivers/video/console/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -53,6 +53,7 @@ config VIDEO_SELECT
  config VIDEO_SELECT
  	bool "Video mode selection support"
@@ -44549,9 +44549,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/video/console/Kconfig
  	---help---
  	  This enables support for text mode selection on kernel startup. If
  	  you want to take advantage of some high-resolution text mode your
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/Kconfig
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/Kconfig
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/Kconfig	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,260 @@
 +#
 +# This Kconfig describe xen options
@@ -44813,9 +44813,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/Kconfig
 +	depends on SMP
 +
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,20 @@
 +obj-y	+= core/
 +obj-y	+= console/
@@ -44837,15 +44837,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/Makefile
 +obj-$(CONFIG_XEN_PCIDEV_FRONTEND)	+= pcifront/
 +obj-$(CONFIG_XEN_FRAMEBUFFER)		+= fbfront/
 +obj-$(CONFIG_XEN_KEYBOARD)		+= fbfront/
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/balloon/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/balloon/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/balloon/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/balloon/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +
 +obj-y := balloon.o sysfs.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/balloon/balloon.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/balloon/balloon.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/balloon/balloon.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/balloon/balloon.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,663 @@
 +/******************************************************************************
 + * balloon.c
@@ -45510,9 +45510,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/balloon/balloon.c
 +EXPORT_SYMBOL_GPL(balloon_release_driver_page);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/balloon/common.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/balloon/common.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/balloon/common.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/balloon/common.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,58 @@
 +/******************************************************************************
 + * balloon/common.h
@@ -45572,9 +45572,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/balloon/common.h
 +void balloon_set_new_target(unsigned long target);
 +
 +#endif /* __XEN_BALLOON_COMMON_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/balloon/sysfs.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/balloon/sysfs.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/balloon/sysfs.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/balloon/sysfs.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,171 @@
 +/******************************************************************************
 + * balloon/sysfs.c
@@ -45747,16 +45747,16 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/balloon/sysfs.c
 +{
 +	unregister_balloon(&balloon_sysdev);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkback/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkback/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkback/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,3 @@
 +obj-$(CONFIG_XEN_BLKDEV_BACKEND) := blkbk.o
 +
 +blkbk-y	:= blkback.o xenbus.o interface.o vbd.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/blkback.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkback/blkback.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkback/blkback.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkback/blkback.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,614 @@
 +/******************************************************************************
 + * arch/xen/drivers/blkif/backend/main.c
@@ -46372,9 +46372,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/blkback.c
 +module_init(blkif_init);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/common.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkback/common.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkback/common.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkback/common.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,139 @@
 +/* 
 + * This program is free software; you can redistribute it and/or
@@ -46515,9 +46515,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/common.h
 +		    struct backend_info *be, int state);
 +
 +#endif /* __BLKIF__BACKEND__COMMON_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/interface.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkback/interface.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkback/interface.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkback/interface.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,181 @@
 +/******************************************************************************
 + * arch/xen/drivers/blkif/backend/interface.c
@@ -46700,9 +46700,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/interface.c
 +	blkif_cachep = kmem_cache_create("blkif_cache", sizeof(blkif_t), 
 +					 0, 0, NULL, NULL);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/vbd.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkback/vbd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkback/vbd.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkback/vbd.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,118 @@
 +/******************************************************************************
 + * blkback/vbd.c
@@ -46822,9 +46822,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/vbd.c
 + out:
 +	return rc;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/xenbus.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkback/xenbus.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkback/xenbus.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkback/xenbus.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,533 @@
 +/*  Xenbus code for blkif backend
 +    Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au>
@@ -47359,18 +47359,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkback/xenbus.c
 +{
 +	xenbus_register_backend(&blkback);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkfront/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkfront/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkfront/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkfront/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,5 @@
 +
 +obj-$(CONFIG_XEN_BLKDEV_FRONTEND)	:= xenblk.o
 +
 +xenblk-objs := blkfront.o vbd.o
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkfront/blkfront.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkfront/blkfront.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkfront/blkfront.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkfront/blkfront.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,903 @@
 +/******************************************************************************
 + * blkfront.c
@@ -48275,9 +48275,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkfront/blkfront.c
 +module_exit(xlblk_exit);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkfront/block.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkfront/block.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkfront/block.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkfront/block.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,142 @@
 +/******************************************************************************
 + * block.h
@@ -48421,9 +48421,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkfront/block.h
 +int xlvbd_barrier(struct blkfront_info *info);
 +
 +#endif /* __XEN_DRIVERS_BLOCK_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkfront/vbd.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blkfront/vbd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blkfront/vbd.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blkfront/vbd.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,372 @@
 +/******************************************************************************
 + * vbd.c
@@ -48797,18 +48797,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blkfront/vbd.c
 +	return -ENOSYS;
 +}
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blktap/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blktap/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blktap/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,5 @@
 +LINUXINCLUDE += -I../xen/include/public/io
 +
 +obj-$(CONFIG_XEN_BLKDEV_TAP) := xenblktap.o
 +
 +xenblktap-y := xenbus.o interface.o blktap.o 
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/blktap.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blktap/blktap.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blktap/blktap.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blktap/blktap.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1524 @@
 +/******************************************************************************
 + * drivers/xen/blktap/blktap.c
@@ -50334,9 +50334,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/blktap.c
 +module_init(blkif_init);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/common.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blktap/common.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blktap/common.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blktap/common.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,121 @@
 +/* 
 + * This program is free software; you can redistribute it and/or
@@ -50459,9 +50459,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/common.h
 +void signal_tapdisk(int idx);
 +
 +#endif /* __BLKIF__BACKEND__COMMON_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/interface.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blktap/interface.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blktap/interface.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blktap/interface.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,174 @@
 +/******************************************************************************
 + * drivers/xen/blktap/interface.c
@@ -50637,9 +50637,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/interface.c
 +	blkif_cachep = kmem_cache_create("blktapif_cache", sizeof(blkif_t), 
 +					 0, 0, NULL, NULL);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/xenbus.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/blktap/xenbus.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/blktap/xenbus.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/blktap/xenbus.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,473 @@
 +/* drivers/xen/blktap/xenbus.c
 + *
@@ -51114,15 +51114,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/blktap/xenbus.c
 +{
 +	xenbus_register_backend(&blktap);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/char/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/char/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/char/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/char/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +
 +obj-y	:= mem.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/char/mem.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/char/mem.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/char/mem.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/char/mem.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,203 @@
 +/*
 + *  Originally from linux/drivers/char/mem.c
@@ -51327,15 +51327,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/char/mem.c
 +	.mmap		= xen_mmap_mem,
 +	.open		= open_mem,
 +};
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/console/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/console/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/console/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/console/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +
 +obj-y	:= console.o xencons_ring.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/console/console.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/console/console.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/console/console.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/console/console.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,712 @@
 +/******************************************************************************
 + * console.c
@@ -52049,9 +52049,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/console/console.c
 +module_init(xencons_init);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/console/xencons_ring.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/console/xencons_ring.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/console/xencons_ring.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/console/xencons_ring.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,143 @@
 +/* 
 + * This program is free software; you can redistribute it and/or
@@ -52196,9 +52196,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/console/xencons_ring.c
 +{
 +	(void)xencons_ring_init();
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,12 @@
 +#
 +# Makefile for the linux kernel.
@@ -52212,9 +52212,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/Makefile
 +obj-$(CONFIG_XEN_SYSFS)		+= xen_sysfs.o
 +obj-$(CONFIG_XEN_SMPBOOT)	+= smpboot.o
 +obj-$(CONFIG_KEXEC)		+= machine_kexec.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/cpu_hotplug.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/cpu_hotplug.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/cpu_hotplug.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/cpu_hotplug.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,172 @@
 +#include <linux/init.h>
 +#include <linux/kernel.h>
@@ -52388,9 +52388,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/cpu_hotplug.c
 +{
 +	xenbus_allowed_cpumask = cpu_present_map;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/evtchn.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/evtchn.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/evtchn.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/evtchn.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,988 @@
 +/******************************************************************************
 + * evtchn.c
@@ -53380,9 +53380,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/evtchn.c
 +					      handle_level_irq, "level");
 +	}
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/features.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/features.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/features.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/features.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,34 @@
 +/******************************************************************************
 + * features.c
@@ -53418,9 +53418,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/features.c
 +			xen_features[i*32+j] = !!(fi.submap & 1<<j);
 +	}
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/gnttab.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/gnttab.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/gnttab.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/gnttab.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,631 @@
 +/******************************************************************************
 + * gnttab.c
@@ -54053,9 +54053,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/gnttab.c
 +#ifdef CONFIG_XEN
 +core_initcall(gnttab_init);
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/hypervisor_sysfs.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/hypervisor_sysfs.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/hypervisor_sysfs.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/hypervisor_sysfs.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,59 @@
 +/*
 + *  copyright (c) 2006 IBM Corporation
@@ -54116,9 +54116,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/hypervisor_sysfs.c
 +
 +device_initcall(hypervisor_subsys_init);
 +EXPORT_SYMBOL_GPL(hypervisor_subsys);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/machine_kexec.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/machine_kexec.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/machine_kexec.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/machine_kexec.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,189 @@
 +/*
 + * drivers/xen/core/machine_kexec.c 
@@ -54309,9 +54309,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/machine_kexec.c
 + *  tab-width: 8
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/machine_reboot.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/machine_reboot.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/machine_reboot.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/machine_reboot.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,241 @@
 +#include <linux/version.h>
 +#include <linux/kernel.h>
@@ -54554,9 +54554,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/machine_reboot.c
 +
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/reboot.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/reboot.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/reboot.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/reboot.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,249 @@
 +#define __KERNEL_SYSCALLS__
 +#include <linux/version.h>
@@ -54807,9 +54807,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/reboot.c
 +}
 +
 +#endif /* !defined(CONFIG_XEN) */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/smpboot.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/smpboot.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/smpboot.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/smpboot.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,511 @@
 +/*
 + *	Xen SMP booting functions
@@ -55322,9 +55322,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/smpboot.c
 +	return -EINVAL;
 +}
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/xen_proc.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/xen_proc.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/xen_proc.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/xen_proc.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,23 @@
 +
 +#include <linux/module.h>
@@ -55349,9 +55349,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/xen_proc.c
 +}
 +
 +EXPORT_SYMBOL_GPL(remove_xen_proc_entry); 
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/xen_sysfs.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/core/xen_sysfs.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/core/xen_sysfs.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/core/xen_sysfs.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,378 @@
 +/*
 + *  copyright (c) 2006 IBM Corporation
@@ -55731,15 +55731,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/core/xen_sysfs.c
 +
 +module_init(hyper_sysfs_init);
 +module_exit(hyper_sysfs_exit);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/evtchn/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/evtchn/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/evtchn/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/evtchn/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +
 +obj-y	:= evtchn.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/evtchn/evtchn.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/evtchn/evtchn.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/evtchn/evtchn.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/evtchn/evtchn.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,469 @@
 +/******************************************************************************
 + * evtchn.c
@@ -56210,15 +56210,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/evtchn/evtchn.c
 +module_exit(evtchn_cleanup);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/fbfront/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/fbfront/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/fbfront/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/fbfront/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +obj-$(CONFIG_XEN_FRAMEBUFFER)	:= xenfb.o
 +obj-$(CONFIG_XEN_KEYBOARD)	+= xenkbd.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/fbfront/xenfb.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/fbfront/xenfb.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/fbfront/xenfb.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/fbfront/xenfb.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,752 @@
 +/*
 + * linux/drivers/video/xenfb.c -- Xen para-virtual frame buffer device
@@ -56972,9 +56972,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/fbfront/xenfb.c
 +module_exit(xenfb_cleanup);
 +
 +MODULE_LICENSE("GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/fbfront/xenkbd.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/fbfront/xenkbd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/fbfront/xenkbd.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/fbfront/xenkbd.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,333 @@
 +/*
 + * linux/drivers/input/keyboard/xenkbd.c -- Xen para-virtual input device
@@ -57309,14 +57309,14 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/fbfront/xenkbd.c
 +module_exit(xenkbd_cleanup);
 +
 +MODULE_LICENSE("GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/gntdev/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/gntdev/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/gntdev/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/gntdev/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1 @@
 +obj-y	:= gntdev.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/gntdev/gntdev.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/gntdev/gntdev.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/gntdev/gntdev.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/gntdev/gntdev.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,973 @@
 +/******************************************************************************
 + * gntdev.c
@@ -58291,18 +58291,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/gntdev/gntdev.c
 +
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netback/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netback/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netback/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,5 @@
 +obj-$(CONFIG_XEN_NETDEV_BACKEND) := netbk.o
 +obj-$(CONFIG_XEN_NETDEV_LOOPBACK) += netloop.o
 +
 +netbk-y   := netback.o xenbus.o interface.o
 +netloop-y := loopback.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/common.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netback/common.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netback/common.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netback/common.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,157 @@
 +/******************************************************************************
 + * arch/xen/drivers/netif/backend/common.h
@@ -58461,9 +58461,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/common.h
 +}
 +
 +#endif /* __NETIF__BACKEND__COMMON_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/interface.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netback/interface.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netback/interface.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netback/interface.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,336 @@
 +/******************************************************************************
 + * arch/xen/drivers/netif/backend/interface.c
@@ -58801,9 +58801,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/interface.c
 +
 +	free_netdev(netif->dev);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/loopback.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netback/loopback.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netback/loopback.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netback/loopback.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,312 @@
 +/******************************************************************************
 + * netback/loopback.c
@@ -59117,9 +59117,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/loopback.c
 +module_exit(loopback_exit);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/netback.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netback/netback.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netback/netback.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netback/netback.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1493 @@
 +/******************************************************************************
 + * drivers/xen/netback/netback.c
@@ -60614,9 +60614,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/netback.c
 +module_init(netback_init);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/xenbus.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netback/xenbus.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netback/xenbus.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netback/xenbus.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,448 @@
 +/*  Xenbus code for netif backend
 +    Copyright (C) 2005 Rusty Russell <rusty@rustcorp.com.au>
@@ -61066,17 +61066,17 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netback/xenbus.c
 +{
 +	xenbus_register_backend(&netback);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netfront/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netfront/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netfront/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netfront/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,4 @@
 +
 +obj-$(CONFIG_XEN_NETDEV_FRONTEND)	:= xennet.o
 +
 +xennet-objs := netfront.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netfront/netfront.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/netfront/netfront.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/netfront/netfront.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/netfront/netfront.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2128 @@
 +/******************************************************************************
 + * Virtual network driver for conversing with remote driver backends.
@@ -63206,9 +63206,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/netfront/netfront.c
 +module_exit(netif_exit);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,15 @@
 +obj-$(CONFIG_XEN_PCIDEV_BACKEND) += pciback.o
 +
@@ -63225,9 +63225,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/Makefile
 +ifeq ($(CONFIG_XEN_PCIDEV_BE_DEBUG),y)
 +EXTRA_CFLAGS += -DDEBUG
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,426 @@
 +/*
 + * PCI Backend - Functions for creating a virtual configuration space for
@@ -63655,9 +63655,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space.c
 +{
 +	return pciback_config_capability_init();
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,126 @@
 +/*
 + * PCI Backend - Common data structures for overriding the configuration space
@@ -63785,9 +63785,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space.h
 +int pciback_config_capability_add_fields(struct pci_dev *dev);
 +
 +#endif				/* __XEN_PCIBACK_CONF_SPACE_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space_capability.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space_capability.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space_capability.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,71 @@
 +/*
 + * PCI Backend - Handles the virtual fields found on the capability lists
@@ -63860,9 +63860,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability.c
 +
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space_capability.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space_capability.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space_capability.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,23 @@
 +/*
 + * PCI Backend - Data structures for special overlays for structures on
@@ -63887,9 +63887,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability.h
 +};
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability_pm.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space_capability_pm.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space_capability_pm.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space_capability_pm.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,128 @@
 +/*
 + * PCI Backend - Configuration space overlay for power management
@@ -64019,9 +64019,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability_p
 +	.capability = PCI_CAP_ID_PM,
 +	.fields = caplist_pm,
 +};
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability_vpd.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space_capability_vpd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space_capability_vpd.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space_capability_vpd.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,42 @@
 +/*
 + * PCI Backend - Configuration space overlay for Vital Product Data
@@ -64065,9 +64065,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_capability_v
 +	.capability = PCI_CAP_ID_VPD,
 +	.fields = caplist_vpd,
 +};
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_header.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space_header.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space_header.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space_header.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,309 @@
 +/*
 + * PCI Backend - Handles the virtual fields in the configuration space headers.
@@ -64378,9 +64378,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_header.c
 +      out:
 +	return err;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_quirks.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space_quirks.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space_quirks.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space_quirks.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,126 @@
 +/*
 + * PCI Backend - Handle special overlays for broken devices.
@@ -64508,9 +64508,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_quirks.c
 +      out:
 +	return ret;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_quirks.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/conf_space_quirks.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/conf_space_quirks.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/conf_space_quirks.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,35 @@
 +/*
 + * PCI Backend - Data structures for special overlays for broken devices.
@@ -64547,9 +64547,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/conf_space_quirks.h
 +int pciback_field_is_dup(struct pci_dev *dev, unsigned int reg);
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/passthrough.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/passthrough.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/passthrough.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/passthrough.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,157 @@
 +/*
 + * PCI Backend - Provides restricted access to the real PCI bus topology
@@ -64708,9 +64708,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/passthrough.c
 +	kfree(dev_data);
 +	pdev->pci_dev_data = NULL;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/pci_stub.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/pci_stub.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/pci_stub.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/pci_stub.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,929 @@
 +/*
 + * PCI Stub Driver - Grabs devices in backend to be exported later
@@ -65641,9 +65641,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/pci_stub.c
 +module_exit(pciback_cleanup);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/pciback.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/pciback.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/pciback.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/pciback.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,93 @@
 +/*
 + * PCI Backend Common Data Structures & Function Declarations
@@ -65738,9 +65738,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/pciback.h
 +
 +extern int verbose_request;
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/pciback_ops.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/pciback_ops.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/pciback_ops.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/pciback_ops.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,94 @@
 +/*
 + * PCI Backend Operations - respond to PCI requests from Frontend
@@ -65836,9 +65836,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/pciback_ops.c
 +
 +	return IRQ_HANDLED;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/slot.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/slot.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/slot.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/slot.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,151 @@
 +/*
 + * PCI Backend - Provides a Virtual PCI bus (with real devices)
@@ -65991,9 +65991,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/slot.c
 +	kfree(slot_dev);
 +	pdev->pci_dev_data = NULL;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/vpci.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/vpci.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/vpci.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/vpci.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,204 @@
 +/*
 + * PCI Backend - Provides a Virtual PCI bus (with real devices)
@@ -66199,9 +66199,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/vpci.c
 +	kfree(vpci_dev);
 +	pdev->pci_dev_data = NULL;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/xenbus.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pciback/xenbus.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pciback/xenbus.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pciback/xenbus.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,454 @@
 +/*
 + * PCI Backend Xenbus Setup - handles setup with frontend and xend
@@ -66657,9 +66657,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pciback/xenbus.c
 +{
 +	xenbus_unregister_driver(&xenbus_pciback_driver);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pcifront/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pcifront/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pcifront/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,7 @@
 +obj-y += pcifront.o
 +
@@ -66668,9 +66668,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/Makefile
 +ifeq ($(CONFIG_XEN_PCIDEV_FE_DEBUG),y)
 +EXTRA_CFLAGS += -DDEBUG
 +endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/pci.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pcifront/pci.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pcifront/pci.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pcifront/pci.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,46 @@
 +/*
 + * PCI Frontend Operations - ensure only one PCI frontend runs at a time
@@ -66718,9 +66718,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/pci.c
 +
 +	spin_unlock(&pcifront_dev_lock);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/pci_op.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pcifront/pci_op.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pcifront/pci_op.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pcifront/pci_op.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,268 @@
 +/*
 + * PCI Frontend Operations - Communicates with frontend
@@ -66990,9 +66990,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/pci_op.c
 +		kfree(bus_entry);
 +	}
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/pcifront.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pcifront/pcifront.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pcifront/pcifront.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pcifront/pcifront.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,40 @@
 +/*
 + * PCI Frontend - Common data structures & function declarations
@@ -67034,9 +67034,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/pcifront.h
 +void pcifront_free_roots(struct pcifront_device *pdev);
 +
 +#endif	/* __XEN_PCIFRONT_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/xenbus.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/pcifront/xenbus.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/pcifront/xenbus.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/pcifront/xenbus.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,295 @@
 +/*
 + * PCI Frontend Xenbus Setup - handles setup with backend (imports page/evtchn)
@@ -67333,15 +67333,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/pcifront/xenbus.c
 +
 +/* Initialize after the Xen PCI Frontend Stub is initialized */
 +subsys_initcall(pcifront_init);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/privcmd/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/privcmd/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/privcmd/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/privcmd/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +
 +obj-$(CONFIG_XEN_PRIVCMD)	:= privcmd.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/privcmd/privcmd.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/privcmd/privcmd.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/privcmd/privcmd.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/privcmd/privcmd.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,284 @@
 +/******************************************************************************
 + * privcmd.c
@@ -67627,17 +67627,17 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/privcmd/privcmd.c
 +}
 +
 +__initcall(privcmd_init);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/tpmback/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/tpmback/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/tpmback/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,4 @@
 +
 +obj-$(CONFIG_XEN_TPMDEV_BACKEND)	+= tpmbk.o
 +
 +tpmbk-y += tpmback.o interface.o xenbus.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/common.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/tpmback/common.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/tpmback/common.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/tpmback/common.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,85 @@
 +/******************************************************************************
 + * drivers/xen/tpmback/common.h
@@ -67724,9 +67724,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/common.h
 +}
 +
 +#endif /* __TPMIF__BACKEND__COMMON_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/interface.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/tpmback/interface.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/tpmback/interface.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/tpmback/interface.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,167 @@
 + /*****************************************************************************
 + * drivers/xen/tpmback/interface.c
@@ -67895,9 +67895,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/interface.c
 +{
 +	kmem_cache_destroy(tpmif_cachep);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/tpmback.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/tpmback/tpmback.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/tpmback/tpmback.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/tpmback/tpmback.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,944 @@
 +/******************************************************************************
 + * drivers/xen/tpmback/tpmback.c
@@ -68843,9 +68843,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/tpmback.c
 +}
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/xenbus.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/tpmback/xenbus.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/tpmback/xenbus.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/tpmback/xenbus.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,289 @@
 +/*  Xenbus code for tpmif backend
 +    Copyright (C) 2005 IBM Corporation
@@ -69136,9 +69136,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/tpmback/xenbus.c
 +{
 +	xenbus_unregister_driver(&tpmback);
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/util.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/util.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/util.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/util.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,70 @@
 +#include <linux/mm.h>
 +#include <linux/module.h>
@@ -69210,9 +69210,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/util.c
 +EXPORT_SYMBOL_GPL(free_vm_area);
 +
 +#endif /* !__ia64__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/Makefile
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,9 @@
 +obj-y += xenbus_client.o xenbus_comms.o xenbus_xs.o xenbus_probe.o
 +obj-$(CONFIG_XEN_BACKEND) += xenbus_be.o
@@ -69223,9 +69223,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/Makefile
 +xenbus-$(CONFIG_XEN_BACKEND) += xenbus_probe_backend.o
 +obj-y += $(xenbus-y) $(xenbus-m)
 +obj-$(CONFIG_XEN_XENBUS_DEV) += xenbus_dev.o
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_backend_client.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_backend_client.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_backend_client.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_backend_client.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,147 @@
 +/******************************************************************************
 + * Backend-client-facing interface for the Xenbus driver.  In other words, the
@@ -69374,9 +69374,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_backend_client.c
 +EXPORT_SYMBOL_GPL(xenbus_dev_is_online);
 +
 +MODULE_LICENSE("Dual BSD/GPL");
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_client.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_client.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_client.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_client.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,283 @@
 +/******************************************************************************
 + * Client-facing interface for the Xenbus driver.  In other words, the
@@ -69661,9 +69661,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_client.c
 +	return result;
 +}
 +EXPORT_SYMBOL_GPL(xenbus_read_driver_state);
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_comms.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_comms.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_comms.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_comms.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,232 @@
 +/******************************************************************************
 + * xenbus_comms.c
@@ -69897,9 +69897,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_comms.c
 +
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_comms.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_comms.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_comms.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_comms.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,46 @@
 +/*
 + * Private include for xenbus communications.
@@ -69947,9 +69947,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_comms.h
 +extern int xen_store_evtchn;
 +
 +#endif /* _XENBUS_COMMS_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_dev.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_dev.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_dev.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_dev.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,404 @@
 +/*
 + * xenbus_dev.c
@@ -70355,9 +70355,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_dev.c
 +
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_probe.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_probe.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_probe.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_probe.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1089 @@
 +/******************************************************************************
 + * Talks to Xen Store to figure out what devices we have.
@@ -71448,9 +71448,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_probe.c
 +
 +late_initcall(boot_wait_for_devices);
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_probe.h
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_probe.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_probe.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_probe.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,74 @@
 +/******************************************************************************
 + * xenbus_probe.h
@@ -71526,9 +71526,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_probe.h
 +extern void dev_changed(const char *node, struct xen_bus_type *bus);
 +#endif
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_probe_backend.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_probe_backend.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_probe_backend.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_probe_backend.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,286 @@
 +/******************************************************************************
 + * Talks to Xen Store to figure out what devices we have (backend half).
@@ -71816,9 +71816,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_probe_backend.c
 +		       xenbus_backend.error);
 +	}
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_xs.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenbus/xenbus_xs.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenbus/xenbus_xs.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenbus/xenbus_xs.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,880 @@
 +/******************************************************************************
 + * xenbus_xs.c
@@ -72700,9 +72700,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenbus/xenbus_xs.c
 +
 +	return 0;
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenoprof/xenoprofile.c
+diff -r d91e11100fb0 -r d610071e6045 drivers/xen/xenoprof/xenoprofile.c
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/drivers/xen/xenoprof/xenoprofile.c	Fri Jul 20 11:56:41 2007 -0300
++++ b/drivers/xen/xenoprof/xenoprofile.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,500 @@
 +/**
 + * @file xenoprofile.c
@@ -73204,9 +73204,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 drivers/xen/xenoprof/xenoprofile.c
 +		HYPERVISOR_xenoprof_op(XENOPROF_shutdown, NULL);
 +        }
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 fs/Kconfig
---- a/fs/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/fs/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 fs/Kconfig
+--- a/fs/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/fs/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -996,6 +996,7 @@ config HUGETLBFS
  config HUGETLBFS
  	bool "HugeTLB file system support"
@@ -73215,9 +73215,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 fs/Kconfig
  	help
  	  hugetlbfs is a filesystem backing for HugeTLB pages, based on
  	  ramfs. For architectures that support it, say Y here and read
-diff -r 4edbf98e9507 -r 3990a07432f0 fs/proc/vmcore.c
---- a/fs/proc/vmcore.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/fs/proc/vmcore.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 fs/proc/vmcore.c
+--- a/fs/proc/vmcore.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/fs/proc/vmcore.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -514,7 +514,7 @@ static int __init parse_crash_elf64_head
  	/* Do some basic Verification. */
  	if (memcmp(ehdr.e_ident, ELFMAG, SELFMAG) != 0 ||
@@ -73227,9 +73227,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 fs/proc/vmcore.c
  		ehdr.e_ident[EI_CLASS] != ELFCLASS64 ||
  		ehdr.e_ident[EI_VERSION] != EV_CURRENT ||
  		ehdr.e_version != EV_CURRENT ||
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/desc.h
---- a/include/asm-i386/desc.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/desc.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/desc.h
+--- a/include/asm-i386/desc.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/desc.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -76,12 +76,20 @@ static inline void pack_gate(__u32 *a, _
  
  static inline void load_TLS(struct thread_struct *t, unsigned int cpu)
@@ -73279,9 +73279,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/desc.h
  
  
  #define set_tss_desc(cpu,addr) __set_tss_desc(cpu, GDT_ENTRY_TSS, addr)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/fixmap.h
---- a/include/asm-i386/fixmap.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/fixmap.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/fixmap.h
+--- a/include/asm-i386/fixmap.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/fixmap.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -88,6 +88,12 @@ enum fixed_addresses {
  #ifdef CONFIG_PCI_MMCONFIG
  	FIX_PCIE_MCFG,
@@ -73311,9 +73311,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/fixmap.h
  extern void reserve_top_address(unsigned long reserve);
  
  #define set_fixmap(idx, phys) \
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/highmem.h
---- a/include/asm-i386/highmem.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/highmem.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/highmem.h
+--- a/include/asm-i386/highmem.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/highmem.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -68,6 +68,9 @@ void *kmap(struct page *page);
  void *kmap(struct page *page);
  void kunmap(struct page *page);
@@ -73324,9 +73324,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/highmem.h
  void kunmap_atomic(void *kvaddr, enum km_type type);
  void *kmap_atomic_pfn(unsigned long pfn, enum km_type type);
  struct page *kmap_atomic_to_page(void *ptr);
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/kexec.h
---- a/include/asm-i386/kexec.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/kexec.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/kexec.h
+--- a/include/asm-i386/kexec.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/kexec.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -46,6 +46,9 @@
  
  /* The native architecture */
@@ -73358,9 +73358,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/kexec.h
  #endif /* __ASSEMBLY__ */
  
  #endif /* _I386_KEXEC_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/kmap_types.h
---- a/include/asm-i386/kmap_types.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/kmap_types.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/kmap_types.h
+--- a/include/asm-i386/kmap_types.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/kmap_types.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -22,7 +22,12 @@ D(10)	KM_IRQ1,
  D(10)	KM_IRQ1,
  D(11)	KM_SOFTIRQ0,
@@ -73374,9 +73374,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/kmap_types.h
  };
  
  #undef D
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-default/mach_traps.h
---- a/include/asm-i386/mach-default/mach_traps.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/mach-default/mach_traps.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-default/mach_traps.h
+--- a/include/asm-i386/mach-default/mach_traps.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/mach-default/mach_traps.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -12,6 +12,18 @@ static inline void clear_mem_error(unsig
  static inline void clear_mem_error(unsigned char reason)
  {
@@ -73396,9 +73396,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-default/mach_traps.h
  	outb(reason, 0x61);
  }
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/agp.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/agp.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/agp.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/agp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,37 @@
 +#ifndef AGP_H
 +#define AGP_H 1
@@ -73437,9 +73437,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/agp.h
 +	dma_free_coherent(NULL,PAGE_SIZE<<(order),(table),virt_to_bus(table))
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/dma-mapping.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/dma-mapping.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/dma-mapping.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/dma-mapping.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,157 @@
 +#ifndef _ASM_I386_DMA_MAPPING_H
 +#define _ASM_I386_DMA_MAPPING_H
@@ -73598,9 +73598,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/dma-mapping.h
 +				  dma_addr_t device_addr, size_t size);
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/floppy.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/floppy.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/floppy.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/floppy.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,147 @@
 +/*
 + * Architecture specific parts of the Floppy driver
@@ -73749,9 +73749,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/floppy.h
 +#define EXTRA_FLOPPY_PARAMS
 +
 +#endif /* __ASM_XEN_I386_FLOPPY_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/hypercall.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/hypercall.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/hypercall.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/hypercall.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,407 @@
 +/******************************************************************************
 + * hypercall.h
@@ -74160,9 +74160,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/hypercall.h
 +
 +
 +#endif /* __HYPERCALL_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/hypervisor.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/hypervisor.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/hypervisor.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/hypervisor.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,258 @@
 +/******************************************************************************
 + * hypervisor.h
@@ -74422,9 +74422,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/hypervisor.h
 +}
 +
 +#endif /* __HYPERVISOR_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/io.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/io.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/io.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/io.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,363 @@
 +#ifndef _ASM_IO_H
 +#define _ASM_IO_H
@@ -74789,9 +74789,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/io.h
 +#define ARCH_HAS_DEV_MEM
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/irqflags.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/irqflags.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/irqflags.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/irqflags.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,129 @@
 +/*
 + * include/asm-i386/irqflags.h
@@ -74922,9 +74922,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/irqflags.h
 +#endif
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/maddr.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/maddr.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/maddr.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/maddr.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,193 @@
 +#ifndef _I386_MADDR_H
 +#define _I386_MADDR_H
@@ -75119,9 +75119,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/maddr.h
 +#define mfn_to_virt(m)		(__va(mfn_to_pfn(m) << PAGE_SHIFT))
 +
 +#endif /* _I386_MADDR_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/mmu_context.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/mmu_context.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/mmu_context.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/mmu_context.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,107 @@
 +#ifndef __I386_SCHED_H
 +#define __I386_SCHED_H
@@ -75230,9 +75230,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/mmu_context.h
 +}
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/page.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/page.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/page.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/page.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,233 @@
 +#ifndef _I386_PAGE_H
 +#define _I386_PAGE_H
@@ -75467,9 +75467,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/page.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _I386_PAGE_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/pgtable-2level.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/pgtable-2level.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/pgtable-2level.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/pgtable-2level.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,110 @@
 +#ifndef _I386_PGTABLE_2LEVEL_H
 +#define _I386_PGTABLE_2LEVEL_H
@@ -75581,9 +75581,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/pgtable-2leve
 +void vmalloc_sync_all(void);
 +
 +#endif /* _I386_PGTABLE_2LEVEL_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/pgtable-3level.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/pgtable-3level.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/pgtable-3level.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/pgtable-3level.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,216 @@
 +#ifndef _I386_PGTABLE_3LEVEL_H
 +#define _I386_PGTABLE_3LEVEL_H
@@ -75801,9 +75801,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/pgtable-3leve
 +void vmalloc_sync_all(void);
 +
 +#endif /* _I386_PGTABLE_3LEVEL_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/pgtable.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/pgtable.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/pgtable.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/pgtable.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,588 @@
 +#ifndef _I386_PGTABLE_H
 +#define _I386_PGTABLE_H
@@ -76393,9 +76393,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/pgtable.h
 +#include <asm-generic/pgtable.h>
 +
 +#endif /* _I386_PGTABLE_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/processor.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/processor.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/processor.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/processor.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,759 @@
 +/*
 + * include/asm-i386/processor.h
@@ -77156,9 +77156,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/processor.h
 +extern void secondary_cpu_init(void);
 +
 +#endif /* __ASM_I386_PROCESSOR_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/scatterlist.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/scatterlist.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/scatterlist.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/scatterlist.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,22 @@
 +#ifndef _I386_SCATTERLIST_H
 +#define _I386_SCATTERLIST_H
@@ -77182,9 +77182,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/scatterlist.h
 +#define ISA_DMA_THRESHOLD (0x00ffffff)
 +
 +#endif /* !(_I386_SCATTERLIST_H) */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/swiotlb.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/swiotlb.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/swiotlb.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/swiotlb.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,43 @@
 +#ifndef _ASM_SWIOTLB_H
 +#define _ASM_SWIOTLB_H 1
@@ -77229,9 +77229,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/swiotlb.h
 +#endif
 +
 +#endif /* _ASM_SWIOTLB_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/synch_bitops.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/synch_bitops.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/synch_bitops.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/synch_bitops.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,145 @@
 +#ifndef __XEN_SYNCH_BITOPS_H__
 +#define __XEN_SYNCH_BITOPS_H__
@@ -77378,9 +77378,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/synch_bitops.
 +#define synch_cmpxchg_subword synch_cmpxchg
 +
 +#endif /* __XEN_SYNCH_BITOPS_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/xenoprof.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/asm/xenoprof.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/asm/xenoprof.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/asm/xenoprof.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,48 @@
 +/******************************************************************************
 + * asm-i386/mach-xen/asm/xenoprof.h
@@ -77430,9 +77430,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/asm/xenoprof.h
 +
 +#endif /* CONFIG_XEN */
 +#endif /* __ASM_XENOPROF_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/irq_vectors.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/irq_vectors.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/irq_vectors.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/irq_vectors.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,125 @@
 +/*
 + * This file should contain #defines for all of the interrupt vector
@@ -77559,9 +77559,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/irq_vectors.h
 +#define irq_to_dynirq(_x)	((_x) - DYNIRQ_BASE)
 +
 +#endif /* _ASM_IRQ_VECTORS_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/mach_traps.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/mach_traps.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/mach_traps.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/mach_traps.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,33 @@
 +/*
 + *  include/asm-xen/asm-i386/mach-xen/mach_traps.h
@@ -77596,18 +77596,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/mach_traps.h
 +static inline void reassert_nmi(void) {}
 +
 +#endif /* !_MACH_TRAPS_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mach-xen/setup_arch.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mach-xen/setup_arch.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-i386/mach-xen/setup_arch.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-i386/mach-xen/setup_arch.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,5 @@
 +/* Hook to call BIOS initialisation function */
 +
 +#define ARCH_SETUP machine_specific_arch_setup();
 +
 +void __init machine_specific_arch_setup(void);
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mmu.h
---- a/include/asm-i386/mmu.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/mmu.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/mmu.h
+--- a/include/asm-i386/mmu.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/mmu.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -13,6 +13,19 @@ typedef struct {
  	struct semaphore sem;
  	void *ldt;
@@ -77628,9 +77628,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/mmu.h
 +#endif /* CONFIG_XEN */
 +
  #endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pci.h
---- a/include/asm-i386/pci.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/pci.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/pci.h
+--- a/include/asm-i386/pci.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/pci.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -42,6 +42,27 @@ int pcibios_set_irq_routing(struct pci_d
  
  struct pci_dev;
@@ -77679,9 +77679,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pci.h
  /* implement the pci_ DMA API in terms of the generic device dma_ one */
  #include <asm-generic/pci-dma-compat.h>
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pgalloc.h
---- a/include/asm-i386/pgalloc.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/pgalloc.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/pgalloc.h
+--- a/include/asm-i386/pgalloc.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/pgalloc.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -4,6 +4,9 @@
  #include <asm/fixmap.h>
  #include <linux/threads.h>
@@ -77746,9 +77746,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pgalloc.h
  
  #define __pte_free_tlb(tlb,pte) 					\
  do {									\
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pgtable-2level-defs.h
---- a/include/asm-i386/pgtable-2level-defs.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/pgtable-2level-defs.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/pgtable-2level-defs.h
+--- a/include/asm-i386/pgtable-2level-defs.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/pgtable-2level-defs.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -1,5 +1,7 @@
  #ifndef _I386_PGTABLE_2LEVEL_DEFS_H
  #define _I386_PGTABLE_2LEVEL_DEFS_H
@@ -77757,9 +77757,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pgtable-2level-defs.h
  
  /*
   * traditional i386 two-level paging structure:
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pgtable-3level-defs.h
---- a/include/asm-i386/pgtable-3level-defs.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/pgtable-3level-defs.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/pgtable-3level-defs.h
+--- a/include/asm-i386/pgtable-3level-defs.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/pgtable-3level-defs.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -1,5 +1,11 @@
  #ifndef _I386_PGTABLE_3LEVEL_DEFS_H
  #define _I386_PGTABLE_3LEVEL_DEFS_H
@@ -77772,9 +77772,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/pgtable-3level-defs.h
  
  /*
   * PGDIR_SHIFT determines what a top-level page table entry can map
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/segment.h
---- a/include/asm-i386/segment.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/segment.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/segment.h
+--- a/include/asm-i386/segment.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/segment.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -126,7 +126,11 @@
  #define SEGMENT_GDT		0x0
  
@@ -77799,9 +77799,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/segment.h
  
  /* Matches PNP_CS32 and PNP_CS16 (they must be consecutive) */
  #define SEGMENT_IS_PNP_CODE(x)   (((x) & 0xf4) == GDT_ENTRY_PNPBIOS_BASE * 8)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/setup.h
---- a/include/asm-i386/setup.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/setup.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/setup.h
+--- a/include/asm-i386/setup.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/setup.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -53,9 +53,15 @@ extern unsigned char boot_params[PARAM_S
  #define AUX_DEVICE_INFO (*(unsigned char *) (PARAM+0x1FF))
  #define LOADER_TYPE (*(unsigned char *) (PARAM+0x210))
@@ -77818,9 +77818,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/setup.h
  #define EDD_NR     (*(unsigned char *) (PARAM+EDDNR))
  #define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF))
  #define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/smp.h
---- a/include/asm-i386/smp.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/smp.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/smp.h
+--- a/include/asm-i386/smp.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/smp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -64,14 +64,22 @@ do { } while (0)
   */
  #define raw_smp_processor_id() (read_pda(cpu_number))
@@ -77854,9 +77854,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/smp.h
  #endif /* !__ASSEMBLY__ */
  
  #else /* CONFIG_SMP */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/system.h
---- a/include/asm-i386/system.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/system.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/system.h
+--- a/include/asm-i386/system.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/system.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -5,6 +5,10 @@
  #include <asm/segment.h>
  #include <asm/cpufeature.h>
@@ -77933,9 +77933,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/system.h
  
  #endif	/* __KERNEL__ */
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/tlbflush.h
---- a/include/asm-i386/tlbflush.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/tlbflush.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/tlbflush.h
+--- a/include/asm-i386/tlbflush.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/tlbflush.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -7,10 +7,23 @@
  #ifdef CONFIG_PARAVIRT
  #include <asm/paravirt.h>
@@ -77979,9 +77979,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/tlbflush.h
  /*
   * TLB flushing:
   *
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/vga.h
---- a/include/asm-i386/vga.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-i386/vga.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-i386/vga.h
+--- a/include/asm-i386/vga.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-i386/vga.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -11,8 +11,11 @@
   *	On the PC, we can just recalculate addresses and then
   *	access the videoram directly without any black magic.
@@ -77995,9 +77995,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-i386/vga.h
  
  #define vga_readb(x) (*(x))
  #define vga_writeb(x,y) (*(y) = (x))
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/agp.h
---- a/include/asm-ia64/agp.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/agp.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/agp.h
+--- a/include/asm-ia64/agp.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/agp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -19,13 +19,44 @@
  #define flush_agp_cache()		mb()
  
@@ -78043,9 +78043,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/agp.h
 +#endif /* CONFIG_XEN */
  
  #endif /* _ASM_IA64_AGP_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/dma-mapping.h
---- a/include/asm-ia64/dma-mapping.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/dma-mapping.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/dma-mapping.h
+--- a/include/asm-ia64/dma-mapping.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/dma-mapping.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -6,8 +6,9 @@
   *	David Mosberger-Tang <davidm@hpl.hp.com>
   */
@@ -78175,15 +78175,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/dma-mapping.h
 +}
 +
  #endif /* _ASM_IA64_DMA_MAPPING_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/fixmap.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/fixmap.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/fixmap.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/fixmap.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +#define clear_fixmap(x)	do {} while (0)
 +#define	set_fixmap(x,y)	do {} while (0)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/gcc_intrin.h
---- a/include/asm-ia64/gcc_intrin.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/gcc_intrin.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/gcc_intrin.h
+--- a/include/asm-ia64/gcc_intrin.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/gcc_intrin.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -26,7 +26,7 @@ extern void ia64_bad_param_for_getreg (v
  
  register unsigned long ia64_r13 asm ("r13") __attribute_used__;
@@ -78377,9 +78377,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/gcc_intrin.h
 +#define __ia64_get_psr_i()	(__ia64_getreg(_IA64_REG_PSR) & 0x4000UL)
 +
  #endif /* _ASM_IA64_GCC_INTRIN_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/hw_irq.h
---- a/include/asm-ia64/hw_irq.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/hw_irq.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/hw_irq.h
+--- a/include/asm-ia64/hw_irq.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/hw_irq.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -15,7 +15,11 @@
  #include <asm/ptrace.h>
  #include <asm/smp.h>
@@ -78405,9 +78405,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/hw_irq.h
  	platform_send_ipi(smp_processor_id(), vector, IA64_IPI_DM_INT, 0);
  }
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/hypercall.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/hypercall.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/hypercall.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/hypercall.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,416 @@
 +/******************************************************************************
 + * hypercall.h
@@ -78825,9 +78825,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/hypercall.h
 +#define HYPERVISOR_vcpu_op xencomm_hypercall_vcpu_op
 +
 +#endif /* __HYPERCALL_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/hypervisor.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/hypervisor.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/hypervisor.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/hypervisor.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,225 @@
 +/******************************************************************************
 + * hypervisor.h
@@ -79054,9 +79054,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/hypervisor.h
 +#endif
 +
 +#endif /* __HYPERVISOR_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/intel_intrin.h
---- a/include/asm-ia64/intel_intrin.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/intel_intrin.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/intel_intrin.h
+--- a/include/asm-ia64/intel_intrin.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/intel_intrin.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -16,8 +16,11 @@
  		 	 * intrinsic
  		 	 */
@@ -79180,9 +79180,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/intel_intrin.h
  
  #define __builtin_trap()	__break(0);
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/io.h
---- a/include/asm-ia64/io.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/io.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/io.h
+--- a/include/asm-ia64/io.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/io.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -66,9 +66,11 @@ extern unsigned int num_io_spaces;
  #define PIO_RESERVED		__IA64_UNCACHED_OFFSET
  #define HAVE_ARCH_PIO_SIZE
@@ -79250,9 +79250,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/io.h
  extern void __iomem * ioremap(unsigned long offset, unsigned long size);
  extern void __iomem * ioremap_nocache (unsigned long offset, unsigned long size);
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/iosapic.h
---- a/include/asm-ia64/iosapic.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/iosapic.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/iosapic.h
+--- a/include/asm-ia64/iosapic.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/iosapic.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -53,6 +53,7 @@
  
  #define NR_IOSAPICS			256
@@ -79269,9 +79269,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/iosapic.h
  
  static inline void iosapic_eoi(char __iomem *iosapic, u32 vector)
  {
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/irq.h
---- a/include/asm-ia64/irq.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/irq.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/irq.h
+--- a/include/asm-ia64/irq.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/irq.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -11,8 +11,41 @@
   * 02/29/00     D.Mosberger	moved most things into hw_irq.h
   */
@@ -79314,9 +79314,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/irq.h
  
  static __inline__ int
  irq_canonicalize (int irq)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/machvec_dig.h
---- a/include/asm-ia64/machvec_dig.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/machvec_dig.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/machvec_dig.h
+--- a/include/asm-ia64/machvec_dig.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/machvec_dig.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -13,4 +13,19 @@ extern ia64_mv_setup_t dig_setup;
  #define platform_name		"dig"
  #define platform_setup		dig_setup
@@ -79337,9 +79337,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/machvec_dig.h
 +#endif
 +
  #endif /* _ASM_IA64_MACHVEC_DIG_h */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/maddr.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/maddr.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/maddr.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/maddr.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,98 @@
 +#ifndef _ASM_IA64_MADDR_H
 +#define _ASM_IA64_MADDR_H
@@ -79439,9 +79439,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/maddr.h
 +typedef unsigned long maddr_t;	// to compile netback, netfront
 +
 +#endif /* _ASM_IA64_MADDR_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/meminit.h
---- a/include/asm-ia64/meminit.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/meminit.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/meminit.h
+--- a/include/asm-ia64/meminit.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/meminit.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -18,10 +18,15 @@
   * 	- crash dumping code reserved region
   * 	- Kernel memory map built from EFI memory map
@@ -79458,9 +79458,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/meminit.h
  
  struct rsvd_region {
  	unsigned long start;	/* virtual address of beginning of element */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/page.h
---- a/include/asm-ia64/page.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/page.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/page.h
+--- a/include/asm-ia64/page.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/page.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -118,6 +118,7 @@ extern struct page *vmem_map;
  #endif
  
@@ -79505,9 +79505,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/page.h
 +#endif /* __ASSEMBLY__ */
 +#endif /* __KERNEL__ */
  #endif /* _ASM_IA64_PAGE_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/pal.h
---- a/include/asm-ia64/pal.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/pal.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/pal.h
+--- a/include/asm-ia64/pal.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/pal.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -92,6 +92,7 @@
  #ifndef __ASSEMBLY__
  
@@ -79516,9 +79516,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/pal.h
  #include <asm/fpu.h>
  
  /*
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/pgalloc.h
---- a/include/asm-ia64/pgalloc.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/pgalloc.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/pgalloc.h
+--- a/include/asm-ia64/pgalloc.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/pgalloc.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -125,7 +125,11 @@ static inline void
  static inline void
  pmd_populate(struct mm_struct *mm, pmd_t * pmd_entry, struct page *pte)
@@ -79531,9 +79531,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/pgalloc.h
  }
  
  static inline void
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/privop.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/privop.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/privop.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/privop.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,60 @@
 +#ifndef _ASM_IA64_PRIVOP_H
 +#define _ASM_IA64_PRIVOP_H
@@ -79595,9 +79595,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/privop.h
 +#endif /* !__ASSEMBLY */
 +
 +#endif /* _ASM_IA64_PRIVOP_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/processor.h
---- a/include/asm-ia64/processor.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/processor.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/processor.h
+--- a/include/asm-ia64/processor.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/processor.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -18,6 +18,7 @@
  #include <asm/kregs.h>
  #include <asm/ptrace.h>
@@ -79606,9 +79606,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/processor.h
  
  #define IA64_NUM_DBG_REGS	8
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/sal.h
---- a/include/asm-ia64/sal.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/sal.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/sal.h
+--- a/include/asm-ia64/sal.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/sal.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -42,6 +42,9 @@
  #include <asm/pal.h>
  #include <asm/system.h>
@@ -79648,9 +79648,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/sal.h
  	SAL_CALL_REENTRANT(isrv, SAL_GET_STATE_INFO, sal_info_type, 0,
  	              sal_info, 0, 0, 0, 0);
  	if (isrv.status)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/swiotlb.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/swiotlb.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/swiotlb.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/swiotlb.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,41 @@
 +#ifndef _ASM_SWIOTLB_H
 +#define _ASM_SWIOTLB_H 1
@@ -79693,9 +79693,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/swiotlb.h
 +#endif
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/synch_bitops.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/synch_bitops.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/synch_bitops.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/synch_bitops.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,61 @@
 +#ifndef __XEN_SYNCH_BITOPS_H__
 +#define __XEN_SYNCH_BITOPS_H__
@@ -79758,9 +79758,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/synch_bitops.h
 +#define synch_cmpxchg_subword synch_cmpxchg
 +
 +#endif /* __XEN_SYNCH_BITOPS_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/system.h
---- a/include/asm-ia64/system.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/system.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/system.h
+--- a/include/asm-ia64/system.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/system.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -123,7 +123,7 @@ extern struct ia64_boot_param {
  #define __local_irq_save(x)			\
  do {						\
@@ -79779,9 +79779,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/system.h
  
  #define irqs_disabled()				\
  ({						\
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/uaccess.h
---- a/include/asm-ia64/uaccess.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-ia64/uaccess.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/uaccess.h
+--- a/include/asm-ia64/uaccess.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-ia64/uaccess.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -365,6 +365,7 @@ ia64_done_with_exception (struct pt_regs
  }
  
@@ -79816,9 +79816,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/uaccess.h
  
  /*
   * Convert a virtual cached kernel memory pointer to an uncached pointer
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xen/privop.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/xen/privop.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/xen/privop.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/xen/privop.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,310 @@
 +#ifndef _ASM_IA64_XEN_PRIVOP_H
 +#define _ASM_IA64_XEN_PRIVOP_H
@@ -80130,9 +80130,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xen/privop.h
 +#define	ia64_pal_call_static		xen_pal_call_static
 +
 +#endif /* _ASM_IA64_XEN_PRIVOP_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xen/xcom_hcall.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/xen/xcom_hcall.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/xen/xcom_hcall.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/xen/xcom_hcall.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,88 @@
 +/*
 + * Copyright (C) 2006 Tristan Gingold <tristan.gingold@bull.net>, Bull SAS
@@ -80222,9 +80222,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xen/xcom_hcall.h
 +extern int privcmd_hypercall(struct privcmd_hypercall *hypercall);
 +
 +#endif /* _LINUX_XENCOMM_HCALL_H_ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xen/xencomm.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/xen/xencomm.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/xen/xencomm.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/xen/xencomm.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,60 @@
 +/*
 + * Copyright (C) 2006 Hollis Blanchard <hollisb@us.ibm.com>, IBM Corporation
@@ -80286,9 +80286,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xen/xencomm.h
 +#define xen_guest_handle(hnd)  ((hnd).p)
 +
 +#endif /* _LINUX_XENCOMM_H_ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xenoprof.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-ia64/xenoprof.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-ia64/xenoprof.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-ia64/xenoprof.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,48 @@
 +/******************************************************************************
 + * asm-ia64/xenoprof.h
@@ -80338,9 +80338,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-ia64/xenoprof.h
 +
 +#endif /* CONFIG_XEN */
 +#endif /* __ASM_XENOPROF_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-um/page.h
---- a/include/asm-um/page.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-um/page.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-um/page.h
+--- a/include/asm-um/page.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-um/page.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -114,7 +114,7 @@ extern struct page *arch_validate(struct
  extern struct page *arch_validate(struct page *page, gfp_t mask, int order);
  #define HAVE_ARCH_VALIDATE
@@ -80350,9 +80350,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-um/page.h
  #define HAVE_ARCH_FREE_PAGE
  
  #include <asm-generic/memory_model.h>
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/apic.h
---- a/include/asm-x86_64/apic.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/apic.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/apic.h
+--- a/include/asm-x86_64/apic.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/apic.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -95,11 +95,13 @@ extern void setup_APIC_extened_lvt(unsig
  #define K8_APIC_EXT_INT_MSG_EXT 0x7
  #define K8_APIC_EXT_LVT_ENTRY_THRESHOLD    0
@@ -80367,9 +80367,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/apic.h
  
  extern unsigned boot_cpu_id;
  extern int local_apic_timer_c2_ok;
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/bootsetup.h
---- a/include/asm-x86_64/bootsetup.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/bootsetup.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/bootsetup.h
+--- a/include/asm-x86_64/bootsetup.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/bootsetup.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -24,9 +24,15 @@ extern char x86_boot_params[BOOT_PARAM_S
  #define AUX_DEVICE_INFO (*(unsigned char *) (PARAM+0x1FF))
  #define LOADER_TYPE (*(unsigned char *) (PARAM+0x210))
@@ -80386,9 +80386,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/bootsetup.h
  #define EDD_NR     (*(unsigned char *) (PARAM+EDDNR))
  #define EDD_MBR_SIG_NR (*(unsigned char *) (PARAM+EDD_MBR_SIG_NR_BUF))
  #define EDD_MBR_SIGNATURE ((unsigned int *) (PARAM+EDD_MBR_SIG_BUF))
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/desc.h
---- a/include/asm-x86_64/desc.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/desc.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/desc.h
+--- a/include/asm-x86_64/desc.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/desc.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -18,14 +18,31 @@ extern struct desc_struct cpu_gdt_table[
  
  #define load_TR_desc() asm volatile("ltr %w0"::"r" (GDT_ENTRY_TSS*8))
@@ -80496,9 +80496,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/desc.h
  }
  
  static inline void load_LDT(mm_context_t *pc)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/dma-mapping.h
---- a/include/asm-x86_64/dma-mapping.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/dma-mapping.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/dma-mapping.h
+--- a/include/asm-x86_64/dma-mapping.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/dma-mapping.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -55,6 +55,7 @@ extern struct dma_mapping_ops* dma_ops;
  extern struct dma_mapping_ops* dma_ops;
  extern int iommu_merge;
@@ -80518,9 +80518,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/dma-mapping.h
  extern int panic_on_overflow;
  
  #endif /* _X8664_DMA_MAPPING_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/dmi.h
---- a/include/asm-x86_64/dmi.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/dmi.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/dmi.h
+--- a/include/asm-x86_64/dmi.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/dmi.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -5,6 +5,10 @@
  
  extern void *dmi_ioremap(unsigned long addr, unsigned long size);
@@ -80545,9 +80545,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/dmi.h
 +#endif
  
  #endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/dwarf2.h
---- a/include/asm-x86_64/dwarf2.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/dwarf2.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/dwarf2.h
+--- a/include/asm-x86_64/dwarf2.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/dwarf2.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -13,7 +13,7 @@
     away for older version. 
   */
@@ -80557,9 +80557,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/dwarf2.h
  
  #define CFI_STARTPROC .cfi_startproc
  #define CFI_ENDPROC .cfi_endproc
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/e820.h
---- a/include/asm-x86_64/e820.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/e820.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/e820.h
+--- a/include/asm-x86_64/e820.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/e820.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -41,14 +41,22 @@ extern void setup_memory_region(void);
  extern void setup_memory_region(void);
  extern void contig_e820_setup(void); 
@@ -80583,9 +80583,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/e820.h
  extern void e820_register_active_regions(int nid,
  				unsigned long start_pfn, unsigned long end_pfn);
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/hw_irq.h
---- a/include/asm-x86_64/hw_irq.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/hw_irq.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/hw_irq.h
+--- a/include/asm-x86_64/hw_irq.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/hw_irq.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -64,6 +64,7 @@
   *  into a single vector (CALL_FUNCTION_VECTOR) to save vector space.
   *  TLB, reschedule and local APIC vectors are performance-critical.
@@ -80602,9 +80602,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/hw_irq.h
  
  /*
   * Local APIC timer IRQ vector is on a different priority level,
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/ipi.h
---- a/include/asm-x86_64/ipi.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/ipi.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/ipi.h
+--- a/include/asm-x86_64/ipi.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/ipi.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -49,8 +49,12 @@ static inline int __prepare_ICR2 (unsign
  	return SET_APIC_DEST_FIELD(mask);
  }
@@ -80626,9 +80626,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/ipi.h
  }
  
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/kexec.h
---- a/include/asm-x86_64/kexec.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/kexec.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/kexec.h
+--- a/include/asm-x86_64/kexec.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/kexec.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -91,6 +91,19 @@ relocate_kernel(unsigned long indirectio
  		unsigned long page_list,
  		unsigned long start_address) ATTRIB_NORET;
@@ -80649,9 +80649,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/kexec.h
  #endif /* __ASSEMBLY__ */
  
  #endif /* _X86_64_KEXEC_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/agp.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/agp.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/agp.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/agp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,35 @@
 +#ifndef AGP_H
 +#define AGP_H 1
@@ -80688,9 +80688,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/agp.h
 +	dma_free_coherent(NULL,PAGE_SIZE<<(order),(table),virt_to_bus(table))
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/fixmap.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/fixmap.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/fixmap.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/fixmap.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,108 @@
 +/*
 + * fixmap.h: compile-time virtual memory allocation
@@ -80800,9 +80800,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/fixmap.h
 +}
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/floppy.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/floppy.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/floppy.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/floppy.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,206 @@
 +/*
 + * Architecture specific parts of the Floppy driver
@@ -81010,9 +81010,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/floppy.h
 +#define EXTRA_FLOPPY_PARAMS
 +
 +#endif /* __ASM_XEN_X86_64_FLOPPY_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/hypercall.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/hypercall.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/hypercall.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/hypercall.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,406 @@
 +/******************************************************************************
 + * hypercall.h
@@ -81420,15 +81420,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/hypercall.h
 +}
 +
 +#endif /* __HYPERCALL_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/hypervisor.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/hypervisor.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/hypervisor.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/hypervisor.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +
 +#include <asm-i386/mach-xen/asm/hypervisor.h>
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/io.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/io.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/io.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/io.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,297 @@
 +#ifndef _ASM_IO_H
 +#define _ASM_IO_H
@@ -81727,9 +81727,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/io.h
 +#define ARCH_HAS_DEV_MEM
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/irq.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/irq.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/irq.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/irq.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,34 @@
 +#ifndef _ASM_IRQ_H
 +#define _ASM_IRQ_H
@@ -81765,9 +81765,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/irq.h
 +#define __ARCH_HAS_DO_SOFTIRQ 1
 +
 +#endif /* _ASM_IRQ_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/irqflags.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/irqflags.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/irqflags.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/irqflags.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,131 @@
 +/*
 + * include/asm-x86_64/irqflags.h
@@ -81900,9 +81900,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/irqflags.h
 +#endif
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/maddr.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/maddr.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/maddr.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/maddr.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,161 @@
 +#ifndef _X86_64_MADDR_H
 +#define _X86_64_MADDR_H
@@ -82065,9 +82065,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/maddr.h
 +
 +#endif /* _X86_64_MADDR_H */
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/mmu_context.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/mmu_context.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/mmu_context.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/mmu_context.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,136 @@
 +#ifndef __X86_64_MMU_CONTEXT_H
 +#define __X86_64_MMU_CONTEXT_H
@@ -82205,9 +82205,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/mmu_context
 +}
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/page.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/page.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/page.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/page.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,219 @@
 +#ifndef _X86_64_PAGE_H
 +#define _X86_64_PAGE_H
@@ -82428,9 +82428,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/page.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* _X86_64_PAGE_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/pgalloc.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/pgalloc.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/pgalloc.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/pgalloc.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,205 @@
 +#ifndef _X86_64_PGALLOC_H
 +#define _X86_64_PGALLOC_H
@@ -82637,9 +82637,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/pgalloc.h
 +#define __pud_free_tlb(tlb,x)   tlb_remove_page((tlb),virt_to_page(x))
 +
 +#endif /* _X86_64_PGALLOC_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/pgtable.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/pgtable.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/pgtable.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/pgtable.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,560 @@
 +#ifndef _X86_64_PGTABLE_H
 +#define _X86_64_PGTABLE_H
@@ -83201,15 +83201,15 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/pgtable.h
 +#include <asm-generic/pgtable.h>
 +
 +#endif /* _X86_64_PGTABLE_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/synch_bitops.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/synch_bitops.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/synch_bitops.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/synch_bitops.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,2 @@
 +
 +#include <asm-i386/mach-xen/asm/synch_bitops.h>
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/timer.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/timer.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/timer.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/timer.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,11 @@
 +#ifndef _ASMi386_TIMER_H
 +#define _ASMi386_TIMER_H
@@ -83222,14 +83222,14 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/timer.h
 +extern int timer_ack;
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/asm/xenoprof.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/asm/xenoprof.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/asm/xenoprof.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/asm/xenoprof.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,1 @@
 +#include <asm-i386/mach-xen/asm/xenoprof.h>
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/irq_vectors.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/irq_vectors.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/irq_vectors.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/irq_vectors.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,122 @@
 +/*
 + * This file should contain #defines for all of the interrupt vector
@@ -83353,9 +83353,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/irq_vectors.h
 +#define irq_to_dynirq(_x)	((_x) - DYNIRQ_BASE)
 +
 +#endif /* _ASM_IRQ_VECTORS_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/mach_time.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/mach_time.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/mach_time.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/mach_time.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,111 @@
 +/*
 + *  include/asm-i386/mach-default/mach_time.h
@@ -83468,9 +83468,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/mach_time.h
 +}
 +
 +#endif /* !_MACH_TIME_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/mach_timer.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/mach_timer.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/mach_timer.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/mach_timer.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,50 @@
 +/*
 + *  include/asm-i386/mach-default/mach_timer.h
@@ -83522,9 +83522,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/mach_timer.h
 +}
 +
 +#endif /* !_MACH_TIMER_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/setup_arch_post.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/setup_arch_post.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/setup_arch_post.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/setup_arch_post.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,63 @@
 +/**
 + * machine_specific_* - Hooks for machine specific setup.
@@ -83589,18 +83589,18 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/setup_arch_post
 +#endif
 +#endif
 +}
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mach-xen/setup_arch_pre.h
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mach-xen/setup_arch_pre.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/asm-x86_64/mach-xen/setup_arch_pre.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/asm-x86_64/mach-xen/setup_arch_pre.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,5 @@
 +/* Hook to call BIOS initialisation function */
 +
 +#define ARCH_SETUP machine_specific_arch_setup();
 +
 +static void __init machine_specific_arch_setup(void);
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mmu.h
---- a/include/asm-x86_64/mmu.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/mmu.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/mmu.h
+--- a/include/asm-x86_64/mmu.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/mmu.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -15,6 +15,24 @@ typedef struct {
  	rwlock_t ldtlock; 
  	int size;
@@ -83626,9 +83626,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/mmu.h
  #endif
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/msr.h
---- a/include/asm-x86_64/msr.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/msr.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/msr.h
+--- a/include/asm-x86_64/msr.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/msr.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -90,10 +90,16 @@
  			  : "=a" (low), "=d" (high) \
  			  : "c" (counter))
@@ -83692,9 +83692,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/msr.h
  		: "=a" (eax), "=d" (edx)
  		: "0" (op)
  		: "bx", "cx");
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/nmi.h
---- a/include/asm-x86_64/nmi.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/nmi.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/nmi.h
+--- a/include/asm-x86_64/nmi.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/nmi.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -7,6 +7,10 @@
  #include <linux/pm.h>
  #include <asm/io.h>
@@ -83732,9 +83732,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/nmi.h
  
  extern int panic_on_timeout;
  extern int unknown_nmi_panic;
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/pci.h
---- a/include/asm-x86_64/pci.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/pci.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/pci.h
+--- a/include/asm-x86_64/pci.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/pci.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -61,6 +61,23 @@ extern int iommu_setup(char *opt);
   */
  extern int iommu_sac_force;
@@ -83759,9 +83759,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/pci.h
  
  #define DECLARE_PCI_UNMAP_ADDR(ADDR_NAME)	\
  	dma_addr_t ADDR_NAME;
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/processor.h
---- a/include/asm-x86_64/processor.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/processor.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/processor.h
+--- a/include/asm-x86_64/processor.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/processor.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -188,7 +188,9 @@ static inline void clear_in_cr4 (unsigne
  #define IO_BITMAP_BITS  65536
  #define IO_BITMAP_BYTES (IO_BITMAP_BITS/8)
@@ -83841,9 +83841,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/processor.h
  
  struct task_struct;
  struct mm_struct;
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/smp.h
---- a/include/asm-x86_64/smp.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/smp.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/smp.h
+--- a/include/asm-x86_64/smp.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/smp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -54,7 +54,11 @@ extern u8 cpu_llc_id[NR_CPUS];
  
  static inline int num_booting_cpus(void)
@@ -83856,9 +83856,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/smp.h
  }
  
  #define raw_smp_processor_id() read_pda(cpunumber)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/swiotlb.h
---- a/include/asm-x86_64/swiotlb.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/swiotlb.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/swiotlb.h
+--- a/include/asm-x86_64/swiotlb.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/swiotlb.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -38,6 +38,13 @@ extern int swiotlb_dma_mapping_error(dma
  extern int swiotlb_dma_mapping_error(dma_addr_t dma_addr);
  extern void swiotlb_free_coherent (struct device *hwdev, size_t size,
@@ -83873,9 +83873,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/swiotlb.h
  extern int swiotlb_dma_supported(struct device *hwdev, u64 mask);
  extern void swiotlb_init(void);
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/system.h
---- a/include/asm-x86_64/system.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/system.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/system.h
+--- a/include/asm-x86_64/system.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/system.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -4,6 +4,12 @@
  #include <linux/kernel.h>
  #include <asm/segment.h>
@@ -83925,9 +83925,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/system.h
  
  #define wbinvd() \
  	__asm__ __volatile__ ("wbinvd": : :"memory");
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/tlbflush.h
---- a/include/asm-x86_64/tlbflush.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/tlbflush.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/tlbflush.h
+--- a/include/asm-x86_64/tlbflush.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/tlbflush.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -16,10 +16,14 @@ static inline void set_cr3(unsigned long
  	asm volatile("mov %0,%%cr3" :: "r" (cr3) : "memory");
  }
@@ -83967,9 +83967,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/tlbflush.h
  
  
  /*
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/vga.h
---- a/include/asm-x86_64/vga.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/vga.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/vga.h
+--- a/include/asm-x86_64/vga.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/vga.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -12,7 +12,11 @@
   *	access the videoram directly without any black magic.
   */
@@ -83982,9 +83982,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/vga.h
  
  #define vga_readb(x) (*(x))
  #define vga_writeb(x,y) (*(y) = (x))
-diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/xor.h
---- a/include/asm-x86_64/xor.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/asm-x86_64/xor.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/asm-x86_64/xor.h
+--- a/include/asm-x86_64/xor.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/asm-x86_64/xor.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -37,6 +37,37 @@ typedef struct { unsigned long a,b; } __
  
  /* Doesn't use gcc to save the XMM registers, because there is no easy way to 
@@ -84031,9 +84031,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/asm-x86_64/xor.h
  
  #define OFFS(x)		"16*("#x")"
  #define PF_OFFS(x)	"256+16*("#x")"
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/crash_dump.h
---- a/include/linux/crash_dump.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/crash_dump.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/crash_dump.h
+--- a/include/linux/crash_dump.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/crash_dump.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -14,5 +14,13 @@ extern const struct file_operations proc
  extern const struct file_operations proc_vmcore_operations;
  extern struct proc_dir_entry *proc_vmcore;
@@ -84048,9 +84048,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/crash_dump.h
 +
  #endif /* CONFIG_CRASH_DUMP */
  #endif /* LINUX_CRASHDUMP_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/elfnote.h
---- a/include/linux/elfnote.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/elfnote.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/elfnote.h
+--- a/include/linux/elfnote.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/elfnote.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -38,13 +38,13 @@
   * e.g. ELFNOTE(XYZCo, 42, .asciz, "forty-two")
   *      ELFNOTE(XYZCo, 12, .long, 0xdeadbeef)
@@ -84067,9 +84067,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/elfnote.h
  2:.align 4				;	\
  3:desctype descdata			;	\
  4:.align 4				;	\
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/gfp.h
---- a/include/linux/gfp.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/gfp.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/gfp.h
+--- a/include/linux/gfp.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/gfp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -116,7 +116,11 @@ static inline enum zone_type gfp_zone(gf
   */
  
@@ -84083,9 +84083,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/gfp.h
  #endif
  #ifndef HAVE_ARCH_ALLOC_PAGE
  static inline void arch_alloc_page(struct page *page, int order) { }
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/highmem.h
---- a/include/linux/highmem.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/highmem.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/highmem.h
+--- a/include/linux/highmem.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/highmem.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -26,10 +26,16 @@ static inline void flush_kernel_dcache_p
  /* declarations for linux/mm/highmem.c */
  unsigned int nr_free_highpages(void);
@@ -84103,9 +84103,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/highmem.h
  
  #define totalhigh_pages 0
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/interrupt.h
---- a/include/linux/interrupt.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/interrupt.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/interrupt.h
+--- a/include/linux/interrupt.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/interrupt.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -193,6 +193,12 @@ static inline int disable_irq_wake(unsig
  
  #endif /* CONFIG_GENERIC_HARDIRQS */
@@ -84119,9 +84119,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/interrupt.h
  #ifndef __ARCH_SET_SOFTIRQ_PENDING
  #define set_softirq_pending(x) (local_softirq_pending() = (x))
  #define or_softirq_pending(x)  (local_softirq_pending() |= (x))
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/kexec.h
---- a/include/linux/kexec.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/kexec.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/kexec.h
+--- a/include/linux/kexec.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/kexec.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -29,6 +29,13 @@
  
  #ifndef KEXEC_ARCH
@@ -84149,9 +84149,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/kexec.h
  extern asmlinkage long sys_kexec_load(unsigned long entry,
  					unsigned long nr_segments,
  					struct kexec_segment __user *segments,
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/mm.h
---- a/include/linux/mm.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/mm.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/mm.h
+--- a/include/linux/mm.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/mm.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -169,6 +169,9 @@ extern unsigned int kobjsize(const void 
  #define VM_MAPPED_COPY	0x01000000	/* T if mapped copy of data (nommu mmap) */
  #define VM_INSERTPAGE	0x02000000	/* The vma has had "vm_insert_page()" done on it */
@@ -84189,9 +84189,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/mm.h
  #ifdef CONFIG_PROC_FS
  void vm_stat_account(struct mm_struct *, unsigned long, struct file *, long);
  #else
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/oprofile.h
---- a/include/linux/oprofile.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/oprofile.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/oprofile.h
+--- a/include/linux/oprofile.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/oprofile.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -16,6 +16,10 @@
  #include <linux/types.h>
  #include <linux/spinlock.h>
@@ -84224,9 +84224,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/oprofile.h
  
  /**
   * Create a file of the given name as a child of the given root, with
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/page-flags.h
---- a/include/linux/page-flags.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/page-flags.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/page-flags.h
+--- a/include/linux/page-flags.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/page-flags.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -104,6 +104,8 @@
   */
  #define PG_uncached		31	/* Page has been mapped as uncached */
@@ -84255,9 +84255,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/page-flags.h
  struct page;	/* forward declaration */
  
  extern void cancel_dirty_page(struct page *page, unsigned int account_size);
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/sched.h
---- a/include/linux/sched.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/sched.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/sched.h
+--- a/include/linux/sched.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/sched.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -223,10 +223,15 @@ extern void scheduler_tick(void);
  extern void scheduler_tick(void);
  
@@ -84274,9 +84274,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/sched.h
  static inline void softlockup_tick(void)
  {
  }
-diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/skbuff.h
---- a/include/linux/skbuff.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/linux/skbuff.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/linux/skbuff.h
+--- a/include/linux/skbuff.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/linux/skbuff.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -31,10 +31,11 @@
  #define HAVE_ALLOC_SKB		/* For the drivers to know */
  #define HAVE_ALIGNABLE_SKB	/* Ditto 8)		   */
@@ -84370,9 +84370,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/linux/skbuff.h
 +
  #endif	/* __KERNEL__ */
  #endif	/* _LINUX_SKBUFF_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/net/tcp.h
---- a/include/net/tcp.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/net/tcp.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/net/tcp.h
+--- a/include/net/tcp.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/net/tcp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -815,7 +815,7 @@ static inline __sum16 __tcp_checksum_com
  
  static inline int tcp_checksum_complete(struct sk_buff *skb)
@@ -84382,9 +84382,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/net/tcp.h
  		__tcp_checksum_complete(skb);
  }
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/net/udp.h
---- a/include/net/udp.h	Fri Jul 20 11:42:41 2007 -0300
-+++ b/include/net/udp.h	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 include/net/udp.h
+--- a/include/net/udp.h	Thu Sep 13 18:35:01 2007 -0300
++++ b/include/net/udp.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -80,7 +80,7 @@ static inline __sum16 __udp_lib_checksum
  
  static inline int udp_lib_checksum_complete(struct sk_buff *skb)
@@ -84394,9 +84394,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/net/udp.h
  		__udp_lib_checksum_complete(skb);
  }
  
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/balloon.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/balloon.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/balloon.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/balloon.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,57 @@
 +/******************************************************************************
 + * balloon.h
@@ -84455,9 +84455,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/balloon.h
 +#define balloon_unlock(__flags) spin_unlock_irqrestore(&balloon_lock, __flags)
 +
 +#endif /* __ASM_BALLOON_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/blkif.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/blkif.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/blkif.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/blkif.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,97 @@
 +#ifndef __XEN_BLKIF_H__
 +#define __XEN_BLKIF_H__
@@ -84556,9 +84556,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/blkif.h
 +}
 +
 +#endif /* __XEN_BLKIF_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/cpu_hotplug.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/cpu_hotplug.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/cpu_hotplug.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/cpu_hotplug.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,44 @@
 +#ifndef __XEN_CPU_HOTPLUG_H__
 +#define __XEN_CPU_HOTPLUG_H__
@@ -84604,9 +84604,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/cpu_hotplug.h
 +#endif /* !defined(CONFIG_HOTPLUG_CPU) */
 +
 +#endif /* __XEN_CPU_HOTPLUG_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/driver_util.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/driver_util.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/driver_util.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/driver_util.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,14 @@
 +
 +#ifndef __ASM_XEN_DRIVER_UTIL_H__
@@ -84622,9 +84622,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/driver_util.h
 +extern struct class *get_xen_class(void);
 +
 +#endif /* __ASM_XEN_DRIVER_UTIL_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/evtchn.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/evtchn.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/evtchn.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/evtchn.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,126 @@
 +/******************************************************************************
 + * evtchn.h
@@ -84752,9 +84752,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/evtchn.h
 +int irq_to_evtchn_port(int irq);
 +
 +#endif /* __ASM_EVTCHN_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/features.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/features.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/features.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/features.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,20 @@
 +/******************************************************************************
 + * features.h
@@ -84776,9 +84776,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/features.h
 +#define xen_feature(flag)	(xen_features[flag])
 +
 +#endif /* __ASM_XEN_FEATURES_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/gnttab.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/gnttab.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/gnttab.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/gnttab.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,138 @@
 +/******************************************************************************
 + * gnttab.h
@@ -84918,9 +84918,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/gnttab.h
 +}
 +
 +#endif /* __ASM_GNTTAB_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/hvm.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/hvm.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/hvm.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/hvm.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,23 @@
 +/* Simple wrappers around HVM functions */
 +#ifndef XEN_HVM_H__
@@ -84945,9 +84945,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/hvm.h
 +}
 +
 +#endif /* XEN_HVM_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/hypercall.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/hypercall.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/hypercall.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/hypercall.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,24 @@
 +#ifndef __XEN_HYPERCALL_H__
 +#define __XEN_HYPERCALL_H__
@@ -84973,9 +84973,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/hypercall.h
 +}
 +
 +#endif /* __XEN_HYPERCALL_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/hypervisor_sysfs.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/hypervisor_sysfs.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/hypervisor_sysfs.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/hypervisor_sysfs.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,32 @@
 +/*
 + *  copyright (c) 2006 IBM Corporation
@@ -85009,9 +85009,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/hypervisor_sysfs.h
 +};
 +
 +#endif /* _HYP_SYSFS_H_ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/COPYING
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/COPYING
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/COPYING	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/COPYING	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,38 @@
 +XEN NOTICE
 +==========
@@ -85051,9 +85051,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/COPYING
 +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
 +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
 +DEALINGS IN THE SOFTWARE.
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/acm.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/acm.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/acm.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/acm.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,228 @@
 +/*
 + * acm.h: Xen access control module interface defintions
@@ -85283,9 +85283,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/acm.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/acm_ops.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/acm_ops.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/acm_ops.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/acm_ops.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,166 @@
 +/*
 + * acm_ops.h: Xen access control module hypervisor commands
@@ -85453,9 +85453,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/acm_ops.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-ia64.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/arch-ia64.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/arch-ia64.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/arch-ia64.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,508 @@
 +/******************************************************************************
 + * arch-ia64/hypervisor-if.h
@@ -85965,9 +85965,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-ia64.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-powerpc.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/arch-powerpc.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/arch-powerpc.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/arch-powerpc.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,125 @@
 +/*
 + * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -86094,9 +86094,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-powerpc.h
 +#endif
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86/xen-x86_32.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/arch-x86/xen-x86_32.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/arch-x86/xen-x86_32.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/arch-x86/xen-x86_32.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,168 @@
 +/******************************************************************************
 + * xen-x86_32.h
@@ -86266,9 +86266,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86/xen-x86_32.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86/xen-x86_64.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/arch-x86/xen-x86_64.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/arch-x86/xen-x86_64.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/arch-x86/xen-x86_64.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,211 @@
 +/******************************************************************************
 + * xen-x86_64.h
@@ -86481,9 +86481,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86/xen-x86_64.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86/xen.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/arch-x86/xen.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/arch-x86/xen.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/arch-x86/xen.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,204 @@
 +/******************************************************************************
 + * arch-x86/xen.h
@@ -86689,9 +86689,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86/xen.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86_32.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/arch-x86_32.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/arch-x86_32.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/arch-x86_32.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,27 @@
 +/******************************************************************************
 + * arch-x86_32.h
@@ -86720,9 +86720,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86_32.h
 + */
 +
 +#include "arch-x86/xen.h"
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86_64.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/arch-x86_64.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/arch-x86_64.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/arch-x86_64.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,27 @@
 +/******************************************************************************
 + * arch-x86_64.h
@@ -86751,9 +86751,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/arch-x86_64.h
 + */
 +
 +#include "arch-x86/xen.h"
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/callback.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/callback.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/callback.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/callback.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,92 @@
 +/******************************************************************************
 + * callback.h
@@ -86847,9 +86847,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/callback.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/dom0_ops.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/dom0_ops.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/dom0_ops.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/dom0_ops.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,120 @@
 +/******************************************************************************
 + * dom0_ops.h
@@ -86971,9 +86971,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/dom0_ops.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/domctl.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/domctl.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/domctl.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/domctl.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,478 @@
 +/******************************************************************************
 + * domctl.h
@@ -87453,9 +87453,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/domctl.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/elfnote.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/elfnote.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/elfnote.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/elfnote.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,233 @@
 +/******************************************************************************
 + * elfnote.h
@@ -87690,9 +87690,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/elfnote.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/elfstructs.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/elfstructs.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/elfstructs.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/elfstructs.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,527 @@
 +#ifndef __XEN_PUBLIC_ELFSTRUCTS_H__
 +#define __XEN_PUBLIC_ELFSTRUCTS_H__ 1
@@ -88221,9 +88221,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/elfstructs.h
 +#endif
 +
 +#endif /* __XEN_PUBLIC_ELFSTRUCTS_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/event_channel.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/event_channel.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/event_channel.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/event_channel.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,264 @@
 +/******************************************************************************
 + * event_channel.h
@@ -88489,9 +88489,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/event_channel.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/features.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/features.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/features.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/features.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,71 @@
 +/******************************************************************************
 + * features.h
@@ -88564,9 +88564,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/features.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/Makefile
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/foreign/Makefile
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/foreign/Makefile	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/foreign/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,37 @@
 +XEN_ROOT=../../../..
 +include $(XEN_ROOT)/Config.mk
@@ -88605,9 +88605,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/Makefile
 +
 +checker.c: $(scripts)
 +	python mkchecker.py $(XEN_TARGET_ARCH) $@ $(architectures)
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/mkchecker.py
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/foreign/mkchecker.py
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/foreign/mkchecker.py	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/foreign/mkchecker.py	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,58 @@
 +#!/usr/bin/python
 +
@@ -88667,9 +88667,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/mkchecker.py
 +
 +f.close();
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/mkheader.py
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/foreign/mkheader.py
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/foreign/mkheader.py	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/foreign/mkheader.py	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,153 @@
 +#!/usr/bin/python
 +
@@ -88824,9 +88824,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/mkheader.py
 +f.write(output);
 +f.close;
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/reference.size
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/foreign/reference.size
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/foreign/reference.size	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/foreign/reference.size	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,17 @@
 +
 +structs              |  x86_32  x86_64    ia64
@@ -88845,9 +88845,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/reference.siz
 +arch_shared_info     |     268     280     272
 +shared_info          |    2584    3368    4384
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/structs.py
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/foreign/structs.py
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/foreign/structs.py	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/foreign/structs.py	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,54 @@
 +# configuration: what needs translation
 +
@@ -88903,9 +88903,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/foreign/structs.py
 +            "MAX_VIRT_CPUS",
 +            "MAX_GUEST_CMDLINE" ];
 +
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/grant_table.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/grant_table.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/grant_table.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/grant_table.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,399 @@
 +/******************************************************************************
 + * grant_table.h
@@ -89306,9 +89306,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/grant_table.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/e820.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/hvm/e820.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/hvm/e820.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/hvm/e820.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,47 @@
 +
 +/*
@@ -89357,9 +89357,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/e820.h
 +#define HVM_BELOW_4G_MMIO_LENGTH    ((1ULL << 32) - HVM_BELOW_4G_MMIO_START)
 +
 +#endif /* __XEN_PUBLIC_HVM_E820_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/hvm_info_table.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/hvm/hvm_info_table.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/hvm/hvm_info_table.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/hvm/hvm_info_table.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,41 @@
 +/******************************************************************************
 + * hvm/hvm_info_table.h
@@ -89402,9 +89402,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/hvm_info_table.h
 +};
 +
 +#endif /* __XEN_PUBLIC_HVM_HVM_INFO_TABLE_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/hvm_op.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/hvm/hvm_op.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/hvm/hvm_op.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/hvm/hvm_op.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,73 @@
 +/*
 + * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -89479,9 +89479,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/hvm_op.h
 +DEFINE_XEN_GUEST_HANDLE(xen_hvm_set_pci_link_route_t);
 +
 +#endif /* __XEN_PUBLIC_HVM_HVM_OP_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/ioreq.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/hvm/ioreq.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/hvm/ioreq.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/hvm/ioreq.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,122 @@
 +/*
 + * ioreq.h: I/O request definitions for device models
@@ -89605,9 +89605,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/ioreq.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/params.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/hvm/params.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/hvm/params.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/hvm/params.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,55 @@
 +/*
 + * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -89664,9 +89664,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/params.h
 +#define HVM_NR_PARAMS          7
 +
 +#endif /* __XEN_PUBLIC_HVM_PARAMS_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/save.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/hvm/save.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/hvm/save.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/hvm/save.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,462 @@
 +/* 
 + * hvm/save.h
@@ -90130,9 +90130,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/save.h
 +DECLARE_HVM_SAVE_TYPE(END, 0, struct hvm_save_end);
 +
 +#endif /* __XEN_PUBLIC_HVM_SAVE_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/vmx_assist.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/hvm/vmx_assist.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/hvm/vmx_assist.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/hvm/vmx_assist.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,116 @@
 +/*
 + * vmx_assist.h: Context definitions for the VMXASSIST world switch.
@@ -90250,9 +90250,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/hvm/vmx_assist.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/blkif.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/blkif.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/blkif.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/blkif.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,128 @@
 +/******************************************************************************
 + * blkif.h
@@ -90382,9 +90382,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/blkif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/console.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/console.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/console.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/console.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,51 @@
 +/******************************************************************************
 + * console.h
@@ -90437,9 +90437,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/console.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/fbif.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/fbif.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/fbif.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/fbif.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,138 @@
 +/*
 + * fbif.h -- Xen virtual frame buffer device
@@ -90579,9 +90579,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/fbif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/kbdif.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/kbdif.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/kbdif.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/kbdif.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,130 @@
 +/*
 + * kbdif.h -- Xen virtual keyboard/mouse
@@ -90713,9 +90713,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/kbdif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/netif.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/netif.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/netif.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/netif.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,184 @@
 +/******************************************************************************
 + * netif.h
@@ -90901,9 +90901,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/netif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/pciif.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/pciif.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/pciif.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/pciif.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,83 @@
 +/*
 + * PCI Backend/Frontend Common Data Structures & Macros
@@ -90988,9 +90988,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/pciif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/protocols.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/protocols.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/protocols.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/protocols.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,21 @@
 +#ifndef __XEN_PROTOCOLS_H__
 +#define __XEN_PROTOCOLS_H__
@@ -91013,9 +91013,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/protocols.h
 +#endif
 +
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/ring.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/ring.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/ring.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/ring.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,299 @@
 +/******************************************************************************
 + * ring.h
@@ -91316,9 +91316,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/ring.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/tpmif.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/tpmif.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/tpmif.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/tpmif.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,77 @@
 +/******************************************************************************
 + * tpmif.h
@@ -91397,9 +91397,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/tpmif.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/xenbus.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/xenbus.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/xenbus.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/xenbus.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,73 @@
 +/*****************************************************************************
 + * xenbus.h
@@ -91474,9 +91474,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/xenbus.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/xs_wire.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/io/xs_wire.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/io/xs_wire.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/io/xs_wire.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,117 @@
 +/*
 + * Details of the "wire" protocol between Xen Store Daemon and client
@@ -91595,9 +91595,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/io/xs_wire.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/kexec.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/kexec.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/kexec.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/kexec.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,137 @@
 +/******************************************************************************
 + * kexec.h - Public portion
@@ -91736,9 +91736,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/kexec.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/libelf.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/libelf.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/libelf.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/libelf.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,241 @@
 +#ifndef __XC_LIBELF__
 +#define __XC_LIBELF__ 1
@@ -91981,9 +91981,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/libelf.h
 +		  struct elf_dom_parms *parms);
 +
 +#endif /* __XC_LIBELF__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/memory.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/memory.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/memory.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/memory.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,281 @@
 +/******************************************************************************
 + * memory.h
@@ -92266,9 +92266,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/memory.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/nmi.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/nmi.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/nmi.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/nmi.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,78 @@
 +/******************************************************************************
 + * nmi.h
@@ -92348,9 +92348,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/nmi.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/physdev.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/physdev.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/physdev.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/physdev.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,169 @@
 +/*
 + * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -92521,9 +92521,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/physdev.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/platform.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/platform.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/platform.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/platform.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,143 @@
 +/******************************************************************************
 + * platform.h
@@ -92668,9 +92668,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/platform.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/sched.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/sched.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/sched.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/sched.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,121 @@
 +/******************************************************************************
 + * sched.h
@@ -92793,9 +92793,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/sched.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/sysctl.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/sysctl.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/sysctl.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/sysctl.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,182 @@
 +/******************************************************************************
 + * sysctl.h
@@ -92979,9 +92979,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/sysctl.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/trace.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/trace.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/trace.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/trace.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,119 @@
 +/******************************************************************************
 + * include/public/trace.h
@@ -93102,9 +93102,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/trace.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/vcpu.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/vcpu.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/vcpu.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/vcpu.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,192 @@
 +/******************************************************************************
 + * vcpu.h
@@ -93298,9 +93298,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/vcpu.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/version.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/version.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/version.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/version.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,91 @@
 +/******************************************************************************
 + * version.h
@@ -93393,9 +93393,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/version.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xen-compat.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/xen-compat.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/xen-compat.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/xen-compat.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,51 @@
 +/******************************************************************************
 + * xen-compat.h
@@ -93448,9 +93448,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xen-compat.h
 +#endif
 +
 +#endif /* __XEN_PUBLIC_XEN_COMPAT_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xen.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/xen.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/xen.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/xen.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,610 @@
 +/******************************************************************************
 + * xen.h
@@ -94062,9 +94062,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xen.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xencomm.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/xencomm.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/xencomm.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/xencomm.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,41 @@
 +/*
 + * Permission is hereby granted, free of charge, to any person obtaining a copy
@@ -94107,9 +94107,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xencomm.h
 +};
 +
 +#endif /* _XEN_XENCOMM_H_ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xenoprof.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/interface/xenoprof.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/interface/xenoprof.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/interface/xenoprof.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,132 @@
 +/******************************************************************************
 + * xenoprof.h
@@ -94243,9 +94243,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/interface/xenoprof.h
 + * indent-tabs-mode: nil
 + * End:
 + */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/pcifront.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/pcifront.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/pcifront.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/pcifront.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,76 @@
 +/*
 + * PCI Frontend - arch-dependendent declarations
@@ -94323,9 +94323,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/pcifront.h
 +#endif /* __KERNEL__ */
 +
 +#endif /* __XEN_ASM_PCIFRONT_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/public/evtchn.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/public/evtchn.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/public/evtchn.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/public/evtchn.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,88 @@
 +/******************************************************************************
 + * evtchn.h
@@ -94415,9 +94415,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/public/evtchn.h
 +	_IOC(_IOC_NONE, 'E', 5, 0)
 +
 +#endif /* __LINUX_PUBLIC_EVTCHN_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/public/gntdev.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/public/gntdev.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/public/gntdev.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/public/gntdev.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,105 @@
 +/******************************************************************************
 + * gntdev.h
@@ -94524,9 +94524,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/public/gntdev.h
 +};
 +
 +#endif /* __LINUX_PUBLIC_GNTDEV_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/public/privcmd.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/public/privcmd.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/public/privcmd.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/public/privcmd.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,79 @@
 +/******************************************************************************
 + * privcmd.h
@@ -94607,9 +94607,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/public/privcmd.h
 +	_IOC(_IOC_NONE, 'P', 3, sizeof(privcmd_mmapbatch_t))
 +
 +#endif /* __LINUX_PUBLIC_PRIVCMD_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xen_proc.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/xen_proc.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/xen_proc.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/xen_proc.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,12 @@
 +
 +#ifndef __ASM_XEN_PROC_H__
@@ -94623,9 +94623,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xen_proc.h
 +	const char *name);
 +
 +#endif /* __ASM_XEN_PROC_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xenbus.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/xenbus.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/xenbus.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/xenbus.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,302 @@
 +/******************************************************************************
 + * xenbus.h
@@ -94929,9 +94929,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xenbus.h
 +int xenbus_frontend_closed(struct xenbus_device *dev);
 +
 +#endif /* _XEN_XENBUS_H */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xencons.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/xencons.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/xencons.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/xencons.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,19 @@
 +#ifndef __ASM_XENCONS_H__
 +#define __ASM_XENCONS_H__
@@ -94952,9 +94952,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xencons.h
 +void xencons_early_setup(void);
 +
 +#endif /* __ASM_XENCONS_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xenoprof.h
+diff -r d91e11100fb0 -r d610071e6045 include/xen/xenoprof.h
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/include/xen/xenoprof.h	Fri Jul 20 11:56:41 2007 -0300
++++ b/include/xen/xenoprof.h	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,42 @@
 +/******************************************************************************
 + * xen/xenoprof.h
@@ -94998,9 +94998,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 include/xen/xenoprof.h
 +
 +#endif /* CONFIG_XEN */
 +#endif /* __XEN_XENOPROF_H__ */
-diff -r 4edbf98e9507 -r 3990a07432f0 kernel/Kconfig.preempt
---- a/kernel/Kconfig.preempt	Fri Jul 20 11:42:41 2007 -0300
-+++ b/kernel/Kconfig.preempt	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 kernel/Kconfig.preempt
+--- a/kernel/Kconfig.preempt	Thu Sep 13 18:35:01 2007 -0300
++++ b/kernel/Kconfig.preempt	Thu Sep 13 18:36:53 2007 -0300
 @@ -35,6 +35,7 @@ config PREEMPT_VOLUNTARY
  
  config PREEMPT
@@ -95009,9 +95009,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 kernel/Kconfig.preempt
  	help
  	  This option reduces the latency of the kernel by making
  	  all kernel code (that is not executing in a critical section)
-diff -r 4edbf98e9507 -r 3990a07432f0 kernel/fork.c
---- a/kernel/fork.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/kernel/fork.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 kernel/fork.c
+--- a/kernel/fork.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/kernel/fork.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -286,6 +286,9 @@ static inline int dup_mmap(struct mm_str
  		if (retval)
  			goto out;
@@ -95022,9 +95022,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 kernel/fork.c
  	retval = 0;
  out:
  	up_write(&mm->mmap_sem);
-diff -r 4edbf98e9507 -r 3990a07432f0 kernel/irq/manage.c
---- a/kernel/irq/manage.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/kernel/irq/manage.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 kernel/irq/manage.c
+--- a/kernel/irq/manage.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/kernel/irq/manage.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -30,6 +30,7 @@ void synchronize_irq(unsigned int irq)
  {
  	struct irq_desc *desc = irq_desc + irq;
@@ -95033,9 +95033,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 kernel/irq/manage.c
  	if (irq >= NR_IRQS)
  		return;
  
-diff -r 4edbf98e9507 -r 3990a07432f0 kernel/irq/spurious.c
---- a/kernel/irq/spurious.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/kernel/irq/spurious.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 kernel/irq/spurious.c
+--- a/kernel/irq/spurious.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/kernel/irq/spurious.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -139,7 +139,8 @@ void note_interrupt(unsigned int irq, st
  		    irqreturn_t action_ret)
  {
@@ -95046,9 +95046,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 kernel/irq/spurious.c
  		if (unlikely(action_ret != IRQ_NONE))
  			report_bad_irq(irq, desc, action_ret);
  	}
-diff -r 4edbf98e9507 -r 3990a07432f0 kernel/kexec.c
---- a/kernel/kexec.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/kernel/kexec.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 kernel/kexec.c
+--- a/kernel/kexec.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/kernel/kexec.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -331,13 +331,27 @@ static int kimage_is_destination_range(s
  	return 0;
  }
@@ -95260,9 +95260,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 kernel/kexec.c
  	/* Install the new kernel, and  Uninstall the old */
  	image = xchg(dest_image, image);
  
-diff -r 4edbf98e9507 -r 3990a07432f0 kernel/softlockup.c
---- a/kernel/softlockup.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/kernel/softlockup.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 kernel/softlockup.c
+--- a/kernel/softlockup.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/kernel/softlockup.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -39,6 +39,19 @@ void touch_softlockup_watchdog(void)
  	__raw_get_cpu_var(touch_timestamp) = jiffies;
  }
@@ -95283,9 +95283,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 kernel/softlockup.c
  
  /*
   * This callback runs from the timer interrupt, and checks
-diff -r 4edbf98e9507 -r 3990a07432f0 lib/Makefile
---- a/lib/Makefile	Fri Jul 20 11:42:41 2007 -0300
-+++ b/lib/Makefile	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 lib/Makefile
+--- a/lib/Makefile	Thu Sep 13 18:35:01 2007 -0300
++++ b/lib/Makefile	Thu Sep 13 18:36:53 2007 -0300
 @@ -57,6 +57,7 @@ obj-$(CONFIG_AUDIT_GENERIC) += audit.o
  
  obj-$(CONFIG_SWIOTLB) += swiotlb.o
@@ -95294,9 +95294,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 lib/Makefile
  
  lib-$(CONFIG_GENERIC_BUG) += bug.o
  
-diff -r 4edbf98e9507 -r 3990a07432f0 mm/Kconfig
---- a/mm/Kconfig	Fri Jul 20 11:42:41 2007 -0300
-+++ b/mm/Kconfig	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 mm/Kconfig
+--- a/mm/Kconfig	Thu Sep 13 18:35:01 2007 -0300
++++ b/mm/Kconfig	Thu Sep 13 18:36:53 2007 -0300
 @@ -132,11 +132,14 @@ config MEMORY_HOTPLUG_SPARSE
  # Default to 4 for wider testing, though 8 might be more appropriate.
  # ARM's adjust_pte (unused if VIPT) depends on mm-wide page_table_lock.
@@ -95312,9 +95312,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 mm/Kconfig
  	default "4"
  
  #
-diff -r 4edbf98e9507 -r 3990a07432f0 mm/highmem.c
---- a/mm/highmem.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/mm/highmem.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 mm/highmem.c
+--- a/mm/highmem.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/mm/highmem.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -148,6 +148,17 @@ start:
  
  	return vaddr;
@@ -95333,9 +95333,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 mm/highmem.c
  
  void fastcall *kmap_high(struct page *page)
  {
-diff -r 4edbf98e9507 -r 3990a07432f0 mm/memory.c
---- a/mm/memory.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/mm/memory.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 mm/memory.c
+--- a/mm/memory.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/mm/memory.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -404,7 +404,8 @@ struct page *vm_normal_page(struct vm_ar
  	 * and that the resulting page looks ok.
  	 */
@@ -95510,9 +95510,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 mm/memory.c
  		return;
  
  	}
-diff -r 4edbf98e9507 -r 3990a07432f0 mm/mmap.c
---- a/mm/mmap.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/mm/mmap.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 mm/mmap.c
+--- a/mm/mmap.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/mm/mmap.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -1978,6 +1978,10 @@ void exit_mmap(struct mm_struct *mm)
  	struct vm_area_struct *vma = mm->mmap;
  	unsigned long nr_accounted = 0;
@@ -95524,9 +95524,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 mm/mmap.c
  
  	lru_add_drain();
  	flush_cache_mm(mm);
-diff -r 4edbf98e9507 -r 3990a07432f0 mm/page_alloc.c
---- a/mm/page_alloc.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/mm/page_alloc.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 mm/page_alloc.c
+--- a/mm/page_alloc.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/mm/page_alloc.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -203,7 +203,11 @@ static void bad_page(struct page *page)
  			1 << PG_slab    |
  			1 << PG_swapcache |
@@ -95593,9 +95593,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 mm/page_alloc.c
  
  	if (PageAnon(page))
  		page->mapping = NULL;
-diff -r 4edbf98e9507 -r 3990a07432f0 net/bridge/br_forward.c
---- a/net/bridge/br_forward.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/bridge/br_forward.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/bridge/br_forward.c
+--- a/net/bridge/br_forward.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/bridge/br_forward.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -71,7 +71,7 @@ static void __br_forward(const struct ne
  
  	indev = skb->dev;
@@ -95605,9 +95605,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/bridge/br_forward.c
  
  	NF_HOOK(PF_BRIDGE, NF_BR_FORWARD, skb, indev, skb->dev,
  			br_forward_finish);
-diff -r 4edbf98e9507 -r 3990a07432f0 net/core/dev.c
---- a/net/core/dev.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/core/dev.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/core/dev.c
+--- a/net/core/dev.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/core/dev.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -1167,7 +1167,7 @@ int skb_checksum_help(struct sk_buff *sk
  int skb_checksum_help(struct sk_buff *skb)
  {
@@ -95658,9 +95658,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/core/dev.c
  
  gso:
  	spin_lock_prefetch(&dev->queue_lock);
-diff -r 4edbf98e9507 -r 3990a07432f0 net/core/netpoll.c
---- a/net/core/netpoll.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/core/netpoll.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/core/netpoll.c
+--- a/net/core/netpoll.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/core/netpoll.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -86,7 +86,7 @@ static __sum16 checksum_udp(struct sk_bu
  {
  	__wsum psum;
@@ -95670,9 +95670,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/core/netpoll.c
  		return 0;
  
  	psum = csum_tcpudp_nofold(saddr, daddr, ulen, IPPROTO_UDP, 0);
-diff -r 4edbf98e9507 -r 3990a07432f0 net/core/skbuff.c
---- a/net/core/skbuff.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/core/skbuff.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/core/skbuff.c
+--- a/net/core/skbuff.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/core/skbuff.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -192,6 +192,62 @@ out:
  	return skb;
  nodata:
@@ -95791,9 +95791,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/core/skbuff.c
 +}
 +EXPORT_SYMBOL(skb_checksum_setup);
 +#endif
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/ip_forward.c
---- a/net/ipv4/ip_forward.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv4/ip_forward.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv4/ip_forward.c
+--- a/net/ipv4/ip_forward.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv4/ip_forward.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -67,7 +67,7 @@ int ip_forward(struct sk_buff *skb)
  	if (skb->pkt_type != PACKET_HOST)
  		goto drop;
@@ -95803,9 +95803,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/ip_forward.c
  
  	/*
  	 *	According to the RFC, we must first decrease the TTL field. If
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/ipvs/ip_vs_core.c
---- a/net/ipv4/ipvs/ip_vs_core.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv4/ipvs/ip_vs_core.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv4/ipvs/ip_vs_core.c
+--- a/net/ipv4/ipvs/ip_vs_core.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv4/ipvs/ip_vs_core.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -680,8 +680,7 @@ static int ip_vs_out_icmp(struct sk_buff
  	}
  
@@ -95826,9 +95826,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/ipvs/ip_vs_core.c
  		/* Failed checksum! */
  		IP_VS_DBG(1, "Incoming ICMP: failed checksum from %d.%d.%d.%d!\n",
  			  NIPQUAD(iph->saddr));
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/tcp_input.c
---- a/net/ipv4/tcp_input.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv4/tcp_input.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv4/tcp_input.c
+--- a/net/ipv4/tcp_input.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv4/tcp_input.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -3790,7 +3790,7 @@ static int tcp_copy_to_iovec(struct sock
  	int err;
  
@@ -95856,9 +95856,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/tcp_input.c
  
  		dma_cookie = dma_skb_copy_datagram_iovec(tp->ucopy.dma_chan,
  			skb, hlen, tp->ucopy.iov, chunk, tp->ucopy.pinned_list);
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/tcp_ipv4.c
---- a/net/ipv4/tcp_ipv4.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv4/tcp_ipv4.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv4/tcp_ipv4.c
+--- a/net/ipv4/tcp_ipv4.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv4/tcp_ipv4.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -504,6 +504,7 @@ void tcp_v4_send_check(struct sock *sk, 
  	if (skb->ip_summed == CHECKSUM_PARTIAL) {
  		th->check = ~tcp_v4_check(len, inet->saddr,
@@ -95885,9 +95885,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/tcp_ipv4.c
  		goto bad_packet;
  
  	th = skb->h.th;
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/udp.c
---- a/net/ipv4/udp.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv4/udp.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv4/udp.c
+--- a/net/ipv4/udp.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv4/udp.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -426,6 +426,7 @@ static void udp4_hwcsum_outgoing(struct 
  		/*
  		 * Only one fragment on the socket.
@@ -95923,9 +95923,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv4/udp.c
  		skb->csum = csum_tcpudp_nofold(skb->nh.iph->saddr,
  					       skb->nh.iph->daddr,
  					       skb->len, IPPROTO_UDP, 0);
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/ip6_output.c
---- a/net/ipv6/ip6_output.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv6/ip6_output.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv6/ip6_output.c
+--- a/net/ipv6/ip6_output.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv6/ip6_output.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -372,7 +372,7 @@ int ip6_forward(struct sk_buff *skb)
  		goto drop;
  	}
@@ -95935,9 +95935,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/ip6_output.c
  
  	/*
  	 *	We DO NOT make any processing on
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/raw.c
---- a/net/ipv6/raw.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv6/raw.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv6/raw.c
+--- a/net/ipv6/raw.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv6/raw.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -368,7 +368,7 @@ int rawv6_rcv(struct sock *sk, struct sk
  				     skb->len, inet->num, skb->csum))
  			skb->ip_summed = CHECKSUM_UNNECESSARY;
@@ -95956,9 +95956,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/raw.c
  		err = skb_copy_datagram_iovec(skb, 0, msg->msg_iov, copied);
  	} else if (msg->msg_flags&MSG_TRUNC) {
  		if (__skb_checksum_complete(skb))
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/tcp_ipv6.c
---- a/net/ipv6/tcp_ipv6.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv6/tcp_ipv6.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv6/tcp_ipv6.c
+--- a/net/ipv6/tcp_ipv6.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv6/tcp_ipv6.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -948,6 +948,7 @@ static void tcp_v6_send_check(struct soc
  
  	if (skb->ip_summed == CHECKSUM_PARTIAL) {
@@ -95985,9 +95985,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/tcp_ipv6.c
  		goto bad_packet;
  
  	th = skb->h.th;
-diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/udp.c
---- a/net/ipv6/udp.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/ipv6/udp.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/ipv6/udp.c
+--- a/net/ipv6/udp.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/ipv6/udp.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -143,7 +143,7 @@ try_again:
  	/*
  	 * 	Decide whether to checksum and/or copy data.
@@ -96006,9 +96006,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/ipv6/udp.c
  		skb->csum = ~csum_unfold(csum_ipv6_magic(&skb->nh.ipv6h->saddr,
  							 &skb->nh.ipv6h->daddr,
  							 skb->len, IPPROTO_UDP,
-diff -r 4edbf98e9507 -r 3990a07432f0 net/sctp/input.c
---- a/net/sctp/input.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/sctp/input.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/sctp/input.c
+--- a/net/sctp/input.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/sctp/input.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -144,8 +144,7 @@ int sctp_rcv(struct sk_buff *skb)
  	__skb_pull(skb, skb->h.raw - skb->data);
  	if (skb->len < sizeof(struct sctphdr))
@@ -96019,9 +96019,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/sctp/input.c
  		goto discard_it;
  
  	skb_pull(skb, sizeof(struct sctphdr));
-diff -r 4edbf98e9507 -r 3990a07432f0 net/sunrpc/socklib.c
---- a/net/sunrpc/socklib.c	Fri Jul 20 11:42:41 2007 -0300
-+++ b/net/sunrpc/socklib.c	Fri Jul 20 11:56:41 2007 -0300
+diff -r d91e11100fb0 -r d610071e6045 net/sunrpc/socklib.c
+--- a/net/sunrpc/socklib.c	Thu Sep 13 18:35:01 2007 -0300
++++ b/net/sunrpc/socklib.c	Thu Sep 13 18:36:53 2007 -0300
 @@ -154,7 +154,7 @@ int csum_partial_copy_to_xdr(struct xdr_
  	desc.offset = sizeof(struct udphdr);
  	desc.count = skb->len - desc.offset;
@@ -96031,9 +96031,9 @@ diff -r 4edbf98e9507 -r 3990a07432f0 net/sunrpc/socklib.c
  		goto no_checksum;
  
  	desc.csum = csum_partial(skb->data, desc.offset, skb->csum);
-diff -r 4edbf98e9507 -r 3990a07432f0 scripts/Makefile.xen
+diff -r d91e11100fb0 -r d610071e6045 scripts/Makefile.xen
 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/scripts/Makefile.xen	Fri Jul 20 11:56:41 2007 -0300
++++ b/scripts/Makefile.xen	Thu Sep 13 18:36:53 2007 -0300
 @@ -0,0 +1,14 @@
 +
 +# cherrypickxen($1 = allobj)
diff --git a/trunk/2.6.21/20952_linux-2.6-xen-x86_64-silence-up-apic-errors.patch b/trunk/2.6.21/20952_linux-2.6-xen-x86_64-silence-up-apic-errors.patch
deleted file mode 100644
index 788af81..0000000
--- a/trunk/2.6.21/20952_linux-2.6-xen-x86_64-silence-up-apic-errors.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -r 00cc4568f10f arch/x86_64/kernel/apic-xen.c
---- a/arch/x86_64/kernel/apic-xen.c	Tue Jul 25 21:07:37 2006 +0200
-+++ b/arch/x86_64/kernel/apic-xen.c	Tue Jul 25 21:17:54 2006 +0200
-@@ -174,7 +174,8 @@ asmlinkage void smp_error_interrupt(void
- 	   6: Received illegal vector
- 	   7: Illegal register address
- 	*/
--	printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n",
-+	if (num_online_cpus() > 1)
-+		printk (KERN_DEBUG "APIC error on CPU%d: %02x(%02x)\n",
- 	        smp_processor_id(), v , v1);
- 	irq_exit();
- }
diff --git a/trunk/2.6.21/20963_linux-2.6-xen-sleazy-fpu-i386.patch b/trunk/2.6.21/20963_linux-2.6-xen-sleazy-fpu-i386.patch
new file mode 100644
index 0000000..0145385
--- /dev/null
+++ b/trunk/2.6.21/20963_linux-2.6-xen-sleazy-fpu-i386.patch
@@ -0,0 +1,96 @@
+# HG changeset patch
+# User "Eduardo Habkost <ehabkost@redhat.com>"
+# Date 1190313016 10800
+# Node ID 8792a16b6dd531cad0ed28d9bef86e3e597ea8db
+# Parent  35983eae211a531bd50bcd177a9da77d48631e2c
+Fix sleazy-fpu under Xen
+
+- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
+- Make it call clts() before restoring the fpu state during task switch
+  (clts() will still not be called during the device_not_available trap,
+  because it is not needed under Xen)
+
+diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/entry-xen.S
+--- a/arch/i386/kernel/entry-xen.S	Wed Aug 08 16:15:30 2007 -0300
++++ b/arch/i386/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
+@@ -950,7 +950,9 @@ device_available_emulate:
+ device_available_emulate:
+ #endif
+ 	preempt_stop(CLBR_ANY)
+-	call math_state_restore
++	# 'clts' is done by Xen during virtual trap, so we can call
++	# __math_state_restore instead of math_state_restore
++	call __math_state_restore
+ 	jmp ret_from_exception
+ 	CFI_ENDPROC
+ 
+diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/process-xen.c
+--- a/arch/i386/kernel/process-xen.c	Wed Aug 08 16:15:30 2007 -0300
++++ b/arch/i386/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
+@@ -597,7 +597,9 @@ struct task_struct fastcall * __switch_t
+ 		mcl->op      = __HYPERVISOR_fpu_taskswitch;
+ 		mcl->args[0] = 1;
+ 		mcl++;
+-	}
++	} else
++		prev_p->fpu_counter = 0;
++
+ #if 0 /* lazy fpu sanity check */
+ 	else BUG_ON(!(read_cr0() & 8));
+ #endif
+diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps-xen.c
+--- a/arch/i386/kernel/traps-xen.c	Wed Aug 08 16:15:30 2007 -0300
++++ b/arch/i386/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
+@@ -1012,17 +1012,22 @@ fastcall unsigned long patch_espfix_desc
+  * Must be called with kernel preemption disabled (in this case,
+  * local interrupts are disabled at the call-site in entry.S).
+  */
+-asmlinkage void math_state_restore(void)
++asmlinkage void __math_state_restore(void)
+ {
+ 	struct thread_info *thread = current_thread_info();
+ 	struct task_struct *tsk = thread->task;
+ 
+-	/* NB. 'clts' is done for us by Xen during virtual trap. */
+ 	if (!tsk_used_math(tsk))
+ 		init_fpu(tsk);
+ 	restore_fpu(tsk);
+ 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
+ 	tsk->fpu_counter++;
++}
++
++asmlinkage void math_state_restore(void)
++{
++	clts();		/* Allow maths ops (or we recurse) */
++	__math_state_restore();
+ }
+ 
+ #ifndef CONFIG_MATH_EMULATION
+diff -r 35983eae211a -r 8792a16b6dd5 arch/i386/kernel/traps.c
+--- a/arch/i386/kernel/traps.c	Wed Aug 08 16:15:30 2007 -0300
++++ b/arch/i386/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
+@@ -1041,17 +1041,22 @@ fastcall unsigned long patch_espfix_desc
+  * Must be called with kernel preemption disabled (in this case,
+  * local interrupts are disabled at the call-site in entry.S).
+  */
+-asmlinkage void math_state_restore(void)
++asmlinkage void __math_state_restore(void)
+ {
+ 	struct thread_info *thread = current_thread_info();
+ 	struct task_struct *tsk = thread->task;
+ 
+-	clts();		/* Allow maths ops (or we recurse) */
+ 	if (!tsk_used_math(tsk))
+ 		init_fpu(tsk);
+ 	restore_fpu(tsk);
+ 	thread->status |= TS_USEDFPU;	/* So we fnsave on switch_to() */
+ 	tsk->fpu_counter++;
++}
++
++asmlinkage void math_state_restore(void)
++{
++	clts();		/* Allow maths ops (or we recurse) */
++	__math_state_restore();
+ }
+ 
+ #ifndef CONFIG_MATH_EMULATION
diff --git a/trunk/2.6.21/20964_linux-2.6-xen-sleazy-fpu-x86_64.patch b/trunk/2.6.21/20964_linux-2.6-xen-sleazy-fpu-x86_64.patch
new file mode 100644
index 0000000..198182d
--- /dev/null
+++ b/trunk/2.6.21/20964_linux-2.6-xen-sleazy-fpu-x86_64.patch
@@ -0,0 +1,93 @@
+# HG changeset patch
+# User "Eduardo Habkost <ehabkost@redhat.com>"
+# Date 1190317568 10800
+# Node ID ab958de6e67d1b4f6c321cd46d2793d2409b91fd
+# Parent  8792a16b6dd531cad0ed28d9bef86e3e597ea8db
+x86_64: Fix sleazy-fpu under Xen
+
+- Make it reset fpu_counter when needed (like __unlazy_fpu() does)
+- Make it call clts() before restoring the fpu state during task switch
+  (clts() will still not be called during the device_not_available trap,
+  because it is not needed under Xen)
+
+diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/entry-xen.S
+--- a/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 15:30:16 2007 -0300
++++ b/arch/x86_64/kernel/entry-xen.S	Thu Sep 20 16:46:08 2007 -0300
+@@ -1071,7 +1071,9 @@ END(simd_coprocessor_error)
+ END(simd_coprocessor_error)
+ 
+ ENTRY(device_not_available)
+-	zeroentry math_state_restore
++	# 'clts' is done by Xen during virtual trap, so we can call
++	# __math_state_restore instead of math_state_restore
++	zeroentry __math_state_restore
+ END(device_not_available)
+ 
+ 	/* runs on exception stack */
+diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/process-xen.c
+--- a/arch/x86_64/kernel/process-xen.c	Thu Sep 20 15:30:16 2007 -0300
++++ b/arch/x86_64/kernel/process-xen.c	Thu Sep 20 16:46:08 2007 -0300
+@@ -637,7 +637,8 @@ __switch_to(struct task_struct *prev_p, 
+ 	if (prev_p->thread_info->status & TS_USEDFPU) {
+ 		__save_init_fpu(prev_p); /* _not_ save_init_fpu() */
+ 		HYPERVISOR_fpu_taskswitch(1);
+-	}
++	} else
++		prev_p->fpu_counter = 0;
+ 
+ 	/* 
+ 	 * Switch the PDA context.
+diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps-xen.c
+--- a/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 15:30:16 2007 -0300
++++ b/arch/x86_64/kernel/traps-xen.c	Thu Sep 20 16:46:08 2007 -0300
+@@ -1064,16 +1064,21 @@ asmlinkage void __attribute__((weak)) mc
+  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
+  * Don't touch unless you *really* know how it works.
+  */
+-asmlinkage void math_state_restore(void)
++asmlinkage void __math_state_restore(void)
+ {
+ 	struct task_struct *me = current;
+-        /* clts(); */ /* 'clts' is done for us by Xen during virtual trap. */
+ 
+ 	if (!used_math())
+ 		init_fpu(me);
+ 	restore_fpu_checking(&me->thread.i387.fxsave);
+ 	task_thread_info(me)->status |= TS_USEDFPU;
+ 	me->fpu_counter++;
++}
++
++asmlinkage void math_state_restore(void)
++{
++	clts();			/* Allow maths ops (or we recurse) */
++	__math_state_restore();
+ }
+ 
+ 
+diff -r 8792a16b6dd5 -r ab958de6e67d arch/x86_64/kernel/traps.c
+--- a/arch/x86_64/kernel/traps.c	Thu Sep 20 15:30:16 2007 -0300
++++ b/arch/x86_64/kernel/traps.c	Thu Sep 20 16:46:08 2007 -0300
+@@ -1056,16 +1056,21 @@ asmlinkage void __attribute__((weak)) mc
+  * Careful.. There are problems with IBM-designed IRQ13 behaviour.
+  * Don't touch unless you *really* know how it works.
+  */
+-asmlinkage void math_state_restore(void)
++asmlinkage void __math_state_restore(void)
+ {
+ 	struct task_struct *me = current;
+-	clts();			/* Allow maths ops (or we recurse) */
+ 
+ 	if (!used_math())
+ 		init_fpu(me);
+ 	restore_fpu_checking(&me->thread.i387.fxsave);
+ 	task_thread_info(me)->status |= TS_USEDFPU;
+ 	me->fpu_counter++;
++}
++
++asmlinkage void math_state_restore(void)
++{
++	clts();			/* Allow maths ops (or we recurse) */
++	__math_state_restore();
+ }
+ 
+ void __init trap_init(void)
diff --git a/trunk/2.6.21/20965_linux-2.6-xen-privcmd-use-nopfn.patch b/trunk/2.6.21/20965_linux-2.6-xen-privcmd-use-nopfn.patch
new file mode 100644
index 0000000..8d80d7b
--- /dev/null
+++ b/trunk/2.6.21/20965_linux-2.6-xen-privcmd-use-nopfn.patch
@@ -0,0 +1,35 @@
+From: Eduardo Habkost <ehabkost@redhat.com>
+Subject: Use the nopfn() handler where nopage() was being used on privcmd
+
+This patch changes the privcmd mmap vma to use nopfn(), that is supposed
+to be used for VM_PFNMAP vmas.
+
+This should make the program receive a SIGBUS (as the original nopage() handler
+was supposed to do) instead of causing an Oops.
+
+Signed-off-by: Eduardo Habkost <ehabkost@redhat.com
+---
+Index: linux-2.6.21-xen-3.1.0/drivers/xen/privcmd/privcmd.c
+===================================================================
+--- linux-2.6.21-xen-3.1.0.orig/drivers/xen/privcmd/privcmd.c
++++ linux-2.6.21-xen-3.1.0/drivers/xen/privcmd/privcmd.c
+@@ -216,15 +216,14 @@ static int privcmd_ioctl(struct inode *i
+ }
+ 
+ #ifndef HAVE_ARCH_PRIVCMD_MMAP
+-static struct page *privcmd_nopage(struct vm_area_struct *vma,
+-				   unsigned long address,
+-				   int *type)
++unsigned long privcmd_nopfn(struct vm_area_struct *vma,
++				unsigned long address)
+ {
+-	return NOPAGE_SIGBUS;
++	return NOPFN_SIGBUS;
+ }
+ 
+ static struct vm_operations_struct privcmd_vm_ops = {
+-	.nopage = privcmd_nopage
++	.nopfn = privcmd_nopfn
+ };
+ 
+ static int privcmd_mmap(struct file * file, struct vm_area_struct * vma)
diff --git a/trunk/2.6.21/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch b/trunk/2.6.21/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch
new file mode 100644
index 0000000..7220996
--- /dev/null
+++ b/trunk/2.6.21/20966_linux-2.6-xen-fix-irq-warn-mismerge.patch
@@ -0,0 +1,21 @@
+# HG changeset patch
+# User ehabkost@localhost.localdomain
+# Date 1192026477 10800
+# Node ID b24c00d1fb598b75c87fc76879082f3cb535bd92
+# Parent  b3725a59160f28b2fa1a68b12512a06dcf3ffaae
+Fix mismerge from changeset 7968bef2c9af
+
+That WARN_ON() is supposed to be on free_irq(), not synchronize_irq().
+
+Index: linux-2.6.21.i386/kernel/irq/manage.c
+===================================================================
+--- linux-2.6.21.i386.orig/kernel/irq/manage.c
++++ linux-2.6.21.i386/kernel/irq/manage.c
+@@ -30,7 +30,6 @@ void synchronize_irq(unsigned int irq)
+ {
+ 	struct irq_desc *desc = irq_desc + irq;
+ 
+-	WARN_ON(in_interrupt());
+ 	if (irq >= NR_IRQS)
+ 		return;
+ 
diff --git a/trunk/2.6.21/26000_linux-2.6-cve-2008-0600.patch b/trunk/2.6.21/26000_linux-2.6-cve-2008-0600.patch
new file mode 100644
index 0000000..b783259
--- /dev/null
+++ b/trunk/2.6.21/26000_linux-2.6-cve-2008-0600.patch
@@ -0,0 +1,37 @@
+From: Bastian Blank <bastian@waldi.eu.org>
+Date: Sun, 10 Feb 2008 14:47:57 +0000 (+0200)
+Subject: splice: fix user pointer access in get_iovec_page_array()
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=712a30e63c8066ed84385b12edbfb804f49cbc44
+
+splice: fix user pointer access in get_iovec_page_array()
+
+Commit 8811930dc74a503415b35c4a79d14fb0b408a361 ("splice: missing user
+pointer access verification") added the proper access_ok() calls to
+copy_from_user_mmap_sem() which ensures we can copy the struct iovecs
+from userspace to the kernel.
+
+But we also must check whether we can access the actual memory region
+pointed to by the struct iovec to fix the access checks properly.
+
+Signed-off-by: Bastian Blank <waldi@debian.org>
+Acked-by: Oliver Pinter <oliver.pntr@gmail.com>
+Cc: Jens Axboe <jens.axboe@oracle.com>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+
+diff --git a/fs/splice.c b/fs/splice.c
+index 14e2262..9b559ee 100644
+--- a/fs/splice.c
++++ b/fs/splice.c
+@@ -1234,7 +1234,7 @@ static int get_iovec_page_array(const struct iovec __user *iov,
+ 		if (unlikely(!len))
+ 			break;
+ 		error = -EFAULT;
+-		if (unlikely(!base))
++		if (!access_ok(VERIFY_READ, base, len))
+ 			break;
+ 
+ 		/*
+
diff --git a/trunk/2.6.21/30037_amd64-zero-extend-32bit-ptrace-xen.patch b/trunk/2.6.21/30037_amd64-zero-extend-32bit-ptrace-xen.patch
new file mode 100644
index 0000000..25e56d3
--- /dev/null
+++ b/trunk/2.6.21/30037_amd64-zero-extend-32bit-ptrace-xen.patch
@@ -0,0 +1,50 @@
+Adjusted to apply to Debian's 2.6.18 Xen
+
+--- linux-source-2.6.18.orig/arch/x86_64/ia32/ia32entry-xen.S	2006-09-19 21:42:06.000000000 -0600
++++ linux-source-2.6.18/arch/x86_64/ia32/ia32entry-xen.S	2007-09-25 00:10:16.089100799 -0600
+@@ -38,6 +38,18 @@
+ #define __sti		sti	
+ #endif			
+ 
++	.macro LOAD_ARGS32 offset
++	movl \offset(%rsp),%r11d
++	movl \offset+8(%rsp),%r10d
++	movl \offset+16(%rsp),%r9d
++	movl \offset+24(%rsp),%r8d
++	movl \offset+40(%rsp),%ecx
++	movl \offset+48(%rsp),%edx
++	movl \offset+56(%rsp),%esi
++	movl \offset+64(%rsp),%edi
++	movl \offset+72(%rsp),%eax
++	.endm
++	
+ 	.macro CFI_STARTPROC32 simple
+ 	CFI_STARTPROC	\simple
+ 	CFI_UNDEFINED	r8
+@@ -151,7 +163,7 @@ sysenter_tracesys:
+ 	movq	$-ENOSYS,RAX(%rsp)	/* really needed? */
+ 	movq	%rsp,%rdi        /* &pt_regs -> arg1 */
+ 	call	syscall_trace_enter
+-	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
++	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
+ 	RESTORE_REST
+ 	movl	%ebp, %ebp
+ 	/* no need to do an access_ok check here because rbp has been
+@@ -253,7 +265,7 @@ cstar_tracesys:	
+ 	movq $-ENOSYS,RAX(%rsp)	/* really needed? */
+ 	movq %rsp,%rdi        /* &pt_regs -> arg1 */
+ 	call syscall_trace_enter
+-	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
++	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
+ 	RESTORE_REST
+ 	movl RSP-ARGOFFSET(%rsp), %r8d
+ 	/* no need to do an access_ok check here because r8 has been
+@@ -330,7 +342,7 @@ ia32_tracesys:			 
+ 	movq $-ENOSYS,RAX(%rsp)	/* really needed? */
+ 	movq %rsp,%rdi        /* &pt_regs -> arg1 */
+ 	call syscall_trace_enter
+-	LOAD_ARGS ARGOFFSET  /* reload args from stack in case ptrace changed it */
++	LOAD_ARGS32 ARGOFFSET  /* reload args from stack in case ptrace changed it */
+ 	RESTORE_REST
+ 	jmp ia32_do_syscall
+ END(ia32_syscall)
diff --git a/trunk/2.6.21/40001_i386-fix-xen_l1_entry_update-for-highptes.patch b/trunk/2.6.21/40001_i386-fix-xen_l1_entry_update-for-highptes.patch
new file mode 100644
index 0000000..15a62eb
--- /dev/null
+++ b/trunk/2.6.21/40001_i386-fix-xen_l1_entry_update-for-highptes.patch
@@ -0,0 +1,26 @@
+# HG changeset patch
+# User Keir Fraser <keir@xensource.com>
+# Date 1192114936 -3600
+# Node ID e797297402885cc19e0799c7bcaf3e1acb427523
+# Parent  48a6d8bc31b8717c4218fc5e3c5bc9d848703db4
+i386: Fix xen_l1_entry_update() for highptes.
+Signed-off-by: Keir Fraser <keir@xensource.com>
+
+(Tweaked for 2.6.20)
+
+diff -r 48a6d8bc31b8 -r e79729740288 arch/i386/mm/hypervisor.c
+--- a/arch/i386/mm/hypervisor.c	Wed Oct 10 11:32:15 2007 +0100
++++ b/arch/i386/mm/hypervisor.c	Thu Oct 11 16:02:16 2007 +0100
+@@ -47,7 +47,12 @@ void xen_l1_entry_update(pte_t *ptr, pte
+ void xen_l1_entry_update(pte_t *ptr, pte_t val)
+ {
+ 	mmu_update_t u;
++#ifdef CONFIG_HIGHPTE
++	u.ptr = ((unsigned long)ptr >= (unsigned long)high_memory) ?
++		arbitrary_virt_to_machine(ptr) : virt_to_machine(ptr);
++#else
+ 	u.ptr = virt_to_machine(ptr);
++#endif
+ 	u.val = pte_val_ma(val);
+ 	BUG_ON(HYPERVISOR_mmu_update(&u, 1, NULL, DOMID_SELF) < 0);
+ }
diff --git a/trunk/2.6.21/50008_reenable-tls-warning.patch b/trunk/2.6.21/50008_reenable-tls-warning.patch
new file mode 100644
index 0000000..c2bfdbe
--- /dev/null
+++ b/trunk/2.6.21/50008_reenable-tls-warning.patch
@@ -0,0 +1,23 @@
+--- linux-2.6.20-xen-r6.orig/arch/i386/kernel/fixup.c	2007-10-15 15:22:09.000000000 -0700
++++ linux-2.6.20-xen-r6/arch/i386/kernel/fixup.c	2007-10-15 16:04:23.000000000 -0700
+@@ -38,7 +38,6 @@
+ 
+ fastcall void do_fixup_4gb_segment(struct pt_regs *regs, long error_code)
+ {
+-#if 0
+ 	static unsigned long printed = 0;
+ 	char info[100];
+ 	int i;
+@@ -78,12 +77,6 @@
+ 	}
+ 
+ 	printk("Continuing...\n\n");
+-#else
+-	if (printk_ratelimit())
+-		printk(KERN_WARNING
+-		       "4gb seg fixup, process %s (pid %d), cs:ip %02x:%08lx\n",
+-		       current->comm, current->tgid, regs->xcs, regs->eip);
+-#endif
+ }
+ 
+ static int __init fixup_init(void)
diff --git a/trunk/2.6.21/50009_gentooify-tls-warning.patch b/trunk/2.6.21/50009_gentooify-tls-warning.patch
new file mode 100644
index 0000000..3c3db12
--- /dev/null
+++ b/trunk/2.6.21/50009_gentooify-tls-warning.patch
@@ -0,0 +1,16 @@
+--- linux-2.6.20-xen-r6.orig/arch/i386/kernel/fixup.c	2007-10-15 16:07:58.000000000 -0700
++++ linux-2.6.20-xen-r6/arch/i386/kernel/fixup.c	2007-10-15 16:15:01.000000000 -0700
+@@ -60,10 +60,9 @@
+ 	DP("** WARNING: Currently emulating unsupported memory accesses  **");
+ 	DP("**          in /lib/tls glibc libraries. The emulation is    **");
+ 	DP("**          slow. To ensure full performance you should      **");
+-	DP("**          install a 'xen-friendly' (nosegneg) version of   **");
+-	DP("**          the library, or disable tls support by executing **");
+-	DP("**          the following as root:                           **");
+-	DP("**          mv /lib/tls /lib/tls.disabled                    **");
++	DP("**          add -mno-tls-direct-seg-refs to your CFLAGS and  **");
++	DP("**          re-emerge glibc and any staticly linked programs **");
++	DP("**          or emerge -e world to catch everything.          **");
+ 	DP("** Offending process: %-38.38s **", info);
+ 	DP("***************************************************************");
+ 	DP("***************************************************************");
diff --git a/trunk/2.6.21/50010_remove-pte_offset_map-redefinition.patch b/trunk/2.6.21/50010_remove-pte_offset_map-redefinition.patch
new file mode 100644
index 0000000..9e2426a
--- /dev/null
+++ b/trunk/2.6.21/50010_remove-pte_offset_map-redefinition.patch
@@ -0,0 +1,36 @@
+--- linux-2.6.21-xen.orig/include/asm-i386/mach-xen/asm/pgtable.h	2008-02-22 15:17:29.000000000 -0800
++++ linux-2.6.21-xen/include/asm-i386/mach-xen/asm/pgtable.h	2008-02-22 15:19:55.000000000 -0800
+@@ -273,7 +273,6 @@
+  */
+ #define pte_update(mm, addr, ptep)		do { } while (0)
+ #define pte_update_defer(mm, addr, ptep)	do { } while (0)
+-#define paravirt_map_pt_hook(slot, va, pfn)	do { } while (0)
+ #endif
+ 
+ /*
+@@ -460,25 +459,6 @@
+ #endif
+ 
+ #if defined(CONFIG_HIGHPTE)
+-#define pte_offset_map(dir, address)				\
+-({								\
+-	pte_t *__ptep;						\
+-	unsigned pfn = pmd_val(*(dir)) >> PAGE_SHIFT;	   	\
+-	__ptep = (pte_t *)kmap_atomic_pte(pfn_to_page(pfn),KM_PTE0);\
+-	paravirt_map_pt_hook(KM_PTE0,__ptep, pfn);		\
+-	__ptep = __ptep + pte_index(address);			\
+-	__ptep;							\
+-})
+-#define pte_offset_map_nested(dir, address)			\
+-({								\
+-	pte_t *__ptep;						\
+-	unsigned pfn = pmd_val(*(dir)) >> PAGE_SHIFT;	   	\
+-	__ptep = (pte_t *)kmap_atomic_pte(pfn_to_page(pfn),KM_PTE1);\
+-	paravirt_map_pt_hook(KM_PTE1,__ptep, pfn);		\
+-	__ptep = __ptep + pte_index(address);			\
+-	__ptep;							\
+-})
+-
+ #define pte_offset_map(dir, address) \
+ 	((pte_t *)kmap_atomic_pte(pmd_page(*(dir)),KM_PTE0) + \
+ 	 pte_index(address))