Re: Re: [Xen-changelog] [linux-2.6.18-xen] Add "#ifdef ARCH_HAS_DEV_MEM" to archtecture specific file_operations.

[Jun Kamada <kama@jp.fujitsu.com>]

[-- Attachment #1: Type: text/plain, Size: 635 bytes --]

Keir-san and Hollis-san,

On Sat, 07 Jul 2007 10:01:31 +0100
Keir Fraser <Keir.Fraser@cl.cam.ac.uk> wrote:
> We define it in asm/mach-xen/asm/io.h.
> 
> However, the patch *is* of questionable value. It guards the only non-static
> definition in the file with #ifdef ARCH_HAS_DEV_MEM. Which begs the question
> why you would build the file at all if !ARCH_HAS_DEV_MEM. I'll revert it.

I'm sorry that I had posted the incomplete patch. I will attach a new
one modified. The patch resolves ploblems mentioned above?

Best regards,

-----
Jun Kamada
Linux Technology Development Div.
Server Systems Unit
Fujitsu Ltd.
kama@jp.fujitsu.com

[-- Attachment #2: add_ifdef_arch_has_dev_mem.patch --]
[-- Type: application/octet-stream, Size: 1157 bytes --]

# HG changeset patch
# User Jun Kamada <kama@jp.fujitsu.com>
# Date 1184125315 -32400
# Node ID d427a098231e8aba4c930d9b54fce4be52952a53
# Parent  86ac3059ab675a1c80ab02be513afb57b5e63efa
ARCH_HAS_DEV_MEM for read_mem() and write_mem() in drivers/xen/char/mem.c

Signed-off-by: Jun Kamada <kama@jp.fujitsu.com>

diff -r 86ac3059ab67 -r d427a098231e drivers/xen/char/mem.c
--- a/drivers/xen/char/mem.c	Tue Jul 10 11:18:07 2007 -0600
+++ b/drivers/xen/char/mem.c	Wed Jul 11 12:41:55 2007 +0900
@@ -33,6 +33,7 @@ static inline int valid_phys_addr_range(
 }
 #endif
 
+#ifdef ARCH_HAS_DEV_MEM
 /*
  * This funcion reads the *physical* memory. The f_pos points directly to the 
  * memory location. 
@@ -135,6 +136,7 @@ static ssize_t write_mem(struct file * f
 	*ppos += written;
 	return written;
 }
+#endif
 
 #ifndef ARCH_HAS_DEV_MEM_MMAP_MEM
 static inline int uncached_access(struct file *file)
@@ -196,8 +198,10 @@ static int open_mem(struct inode * inode
 
 const struct file_operations mem_fops = {
 	.llseek		= memory_lseek,
+#ifdef ARCH_HAS_DEV_MEM
 	.read		= read_mem,
 	.write		= write_mem,
+#endif
 	.mmap		= xen_mmap_mem,
 	.open		= open_mem,
 };

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel