summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2008-03-04 12:13:26 +0900
committerSimon Horman <horms@verge.net.au>2008-03-04 12:13:26 +0900
commit3f8791a7ed926363a882213886299cb65a4738d4 (patch)
tree1e95e6e75dd18eee706bfc3bfb3f45a68e1238df
parent29b41380ebb1e4d1dbb2bb5bb26239e659a6b52b (diff)
kexec-tools: [ia64] always use /proc/iomem_machine on ia64 xen
When I first added proc_iomem() it was for ia64 Xen as certain regions are added /proc/iomem_machine instead of /proc/iomem on that platform. On further examination I have found that all regions need to be added to /proc/iomem_machine. This patch changes the ia64 implementation of proc_iomem() to always return /proc/iomem_machine if xen is in use. A subsequent patch will remove the machine parameter to proc_iomem() which is no longer of any use. Signed-off-by: Simon Horman <horms@verge.net.au>
-rw-r--r--kexec/arch/ia64/kexec-iomem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kexec/arch/ia64/kexec-iomem.c b/kexec/arch/ia64/kexec-iomem.c
index 97f7730..7696113 100644
--- a/kexec/arch/ia64/kexec-iomem.c
+++ b/kexec/arch/ia64/kexec-iomem.c
@@ -17,7 +17,7 @@ static const char proc_iomem_machine_str[]= "/proc/iomem_machine";
*/
const char *proc_iomem(int machine)
{
- if (machine && xen_present())
+ if (xen_present())
return proc_iomem_machine_str;
return proc_iomem_str;
}