# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID 5a4893a537caab12222b24b4d55b09f7221a08d5
# Parent b4263a0216a9ed6349b883aa3e6bbf790ae440fc
Minor driver code changes/rearrangement to reduce ia64-specific patches
Signed-off by: Dan Magenheimer <dan.magenheimer@xxxxxx>
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
Fri Nov 4 03:37:29 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/console.c.patch
Fri Nov 4 16:40:29 2005
@@ -1,15 +1,5 @@
--- xen/console/console.c 2005-11-02 14:13:07.000000000 +0100
+++ xen.patched/console/console.c 2005-11-02 14:21:20.000000000 +0100
-@@ -196,6 +196,9 @@
- void xen_console_init(void)
- #endif
- {
-+ if (xen_init() < 0)
-+ return __RETCODE;
-+
- if (xen_start_info->flags & SIF_INITDOMAIN) {
- if (xc_mode == XC_DEFAULT)
- xc_mode = XC_SERIAL;
@@ -768,9 +771,15 @@
#endif
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch Fri Nov
4 03:37:29 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/devmem.c.patch Fri Nov
4 16:40:29 2005
@@ -1,13 +1,3 @@
diff -Naur xen/core/devmem.c xen.patched/core/devmem.c
--- xen/core/devmem.c 2005-09-23 10:54:50.000000000 -0600
+++ xen.patched/core/devmem.c 2005-09-23 10:57:51.000000000 -0600
-@@ -93,6 +93,9 @@
- if (uncached_access(file))
- vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
-
-+#ifdef __ia64__
-+#define direct_remap_pfn_range(a,b,c,d,e,f)
remap_pfn_range(a,b,c,d,e)
-+#endif
- if (direct_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
- vma->vm_end - vma->vm_start,
- vma->vm_page_prot, DOMID_IO))
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch Fri Nov
4 03:37:29 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/gnttab.c.patch Fri Nov
4 16:40:29 2005
@@ -1,17 +1,6 @@
diff -Naur xen/core/gnttab.c xen.patched/core/gnttab.c
--- xen/core/gnttab.c 2005-09-23 10:54:50.000000000 -0600
+++ xen.patched/core/gnttab.c 2005-09-23 10:57:51.000000000 -0600
-@@ -19,6 +19,10 @@
- #include <asm-xen/gnttab.h>
- #include <asm/synch_bitops.h>
-
-+#ifdef __ia64__
-+#define synch_cmpxchg ia64_cmpxchg4_acq
-+#endif
-+
- #if 1
- #define ASSERT(_p) \
- if ( !(_p) ) { printk(KERN_ALERT"Assertion '%s': line %d, file %s\n", \
@@ -346,6 +350,10 @@
if ( hypercall.op != __HYPERVISOR_grant_table_op )
return -ENOSYS;
@@ -45,17 +34,6 @@
return 0;
}
-@@ -434,8 +448,10 @@
- {
- int i;
-
-+#ifndef __ia64__
- for (i = 0; i < NR_GRANT_FRAMES; i++)
- clear_fixmap(FIX_GNTTAB_END - i);
-+#endif
-
- return 0;
- }
@@ -450,7 +466,9 @@
BUG_ON(gnttab_resume());
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch
Fri Nov 4 03:37:29 2005
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/patches/privcmd.c.patch
Fri Nov 4 16:40:29 2005
@@ -1,16 +1,6 @@
diff -Naur xen/privcmd/privcmd.c xen.patched/privcmd/privcmd.c
--- xen/privcmd/privcmd.c 2005-09-23 10:54:50.000000000 -0600
+++ xen.patched/privcmd/privcmd.c 2005-09-23 10:57:51.000000000 -0600
-@@ -134,6 +134,9 @@
- > vma->vm_end )
- return -EINVAL;
-
-+#ifdef __ia64__
-+#define direct_remap_pfn_range(a,b,c,d,e,f) remap_pfn_range(a,b,c,d,e)
-+#endif
- if ((rc = direct_remap_pfn_range(
- vma,
- msg[j].va&PAGE_MASK,
@@ -180,6 +183,15 @@
for (i = 0; i < m.num; i++, addr += PAGE_SIZE, p++) {
if (get_user(mfn, p))
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/arch/xen/kernel/devmem.c
--- a/linux-2.6-xen-sparse/arch/xen/kernel/devmem.c Fri Nov 4 03:37:29 2005
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/devmem.c Fri Nov 4 16:40:29 2005
@@ -26,6 +26,7 @@
#include <asm/pgalloc.h>
#include <asm/uaccess.h>
#include <asm/io.h>
+#include <asm/hypervisor.h>
static inline int uncached_access(struct file *file)
{
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c Fri Nov 4
03:37:29 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c Fri Nov 4
16:40:29 2005
@@ -13,6 +13,7 @@
#include <linux/spinlock.h>
#include <asm-xen/balloon.h>
+#include <asm/hypervisor.h>
#include "common.h"
/*
@@ -494,6 +495,9 @@
int i;
struct page *page;
+ if (xen_init() < 0)
+ return -ENODEV;
+
blkif_interface_init();
page = balloon_alloc_empty_page_range(MMAP_PAGES);
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c
--- a/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Fri Nov 4
03:37:29 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/blkfront/blkfront.c Fri Nov 4
16:40:29 2005
@@ -49,6 +49,7 @@
#include <asm-xen/xenbus.h>
#include <asm-xen/xen-public/grant_table.h>
#include <asm-xen/gnttab.h>
+#include <asm/hypervisor.h>
#define BLKIF_STATE_DISCONNECTED 0
#define BLKIF_STATE_CONNECTED 1
@@ -727,6 +728,9 @@
static int __init xlblk_init(void)
{
+ if (xen_init() < 0)
+ return -ENODEV;
+
xenbus_register_driver(&blkfront);
return 0;
}
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/drivers/xen/console/console.c
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c Fri Nov 4
03:37:29 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c Fri Nov 4
16:40:29 2005
@@ -196,6 +196,9 @@
void xen_console_init(void)
#endif
{
+ if (xen_init() < 0)
+ return __RETCODE;
+
if (xen_start_info->flags & SIF_INITDOMAIN) {
if (xc_mode == XC_DEFAULT)
xc_mode = XC_SERIAL;
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c
--- a/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Fri Nov 4
03:37:29 2005
+++ b/linux-2.6-xen-sparse/drivers/xen/privcmd/privcmd.c Fri Nov 4
16:40:29 2005
@@ -20,6 +20,7 @@
#include <linux/pagemap.h>
#include <linux/seq_file.h>
#include <linux/kthread.h>
+#include <asm/hypervisor.h>
#include <asm/pgalloc.h>
#include <asm/pgtable.h>
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/include/asm-xen/asm-ia64/fixmap.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/fixmap.h Fri Nov 4
03:37:29 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/fixmap.h Fri Nov 4
16:40:29 2005
@@ -1,1 +1,2 @@
-/* empty */
+#define clear_fixmap(x) do {} while (0)
+#define set_fixmap(x,y) do {} while (0)
diff -r b4263a0216a9 -r 5a4893a537ca
linux-2.6-xen-sparse/include/asm-xen/asm-ia64/synch_bitops.h
--- a/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/synch_bitops.h Fri Nov
4 03:37:29 2005
+++ b/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/synch_bitops.h Fri Nov
4 16:40:29 2005
@@ -51,6 +51,8 @@
return test_bit(nr, addr);
}
+#define synch_cmpxchg ia64_cmpxchg4_acq
+
#define synch_test_bit(nr,addr) \
(__builtin_constant_p(nr) ? \
synch_const_test_bit((nr),(addr)) : \
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home