remove some redundant args for ipf

Commit Message

Zhang, Xiantao Feb. 17, 2009, 1:50 a.m. UTC

Avi, 
	Please help to check-in this patch, and it breaks ia64's build.  
Xiantao 

-----Original Message-----
From: Zhang, Yang 
Sent: Monday, February 16, 2009 4:31 PM
To: [e-mail]
Cc: [e-mail]; Avi Kivity; Zhang, Xiantao
Subject: [PATCH]remove some redundant args for ipf 

Hi
This patch remove some redundant args in function pci_vga_init(),isa_vga_init(),
rtc_init() in ipf.c

Please review it 

yang

From 2a7c4cdf02c992da36f25bfe62ab1e4b0d9e3e91 Mon Sep 17 00:00:00 2001
From: Yang Zhang <Yang Zhang>
Date: Mon, 16 Feb 2009 01:17:52 -0600
Subject: [PATCH] kvm : qemu: remove some redundant args of ipf 

remove redundant args of pci_vga_init(),isa_vga_init(),
rtc_init() in ia64.

Signed-off-by: Yang Zhang <Yang Zhang>
---
 kernel/ia64/hack-module.awk |    1 +
 qemu/hw/ipf.c               |   10 +++++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

Patch

diff --git a/kernel/ia64/hack-module.awk b/kernel/ia64/hack-module.awk
index d0ef130..2e4e05f 100644
--- a/kernel/ia64/hack-module.awk
+++ b/kernel/ia64/hack-module.awk
@@ -20,6 +20,7 @@  BEGIN { split("INIT_WORK on_each_cpu smp_call_function " \
 }
 
 /#include <linux\/compiler.h>/ { $0 = "" }
+/#include <linux\/types.h>/ { $0 = "#include <asm/types.h>" }
 
 { sub(/linux\/mm_types\.h/, "linux/mm.h") }
 
diff --git a/qemu/hw/ipf.c b/qemu/hw/ipf.c
index a761d52..eb9aaec 100644
--- a/qemu/hw/ipf.c
+++ b/qemu/hw/ipf.c
@@ -514,23 +514,23 @@  static void ipf_init1(ram_addr_t ram_size, int vga_ram_size,
 
     if (cirrus_vga_enabled) {
         if (pci_enabled) {
-            pci_cirrus_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr,
+            pci_cirrus_vga_init(pci_bus, phys_ram_base + vga_ram_addr,
                                 vga_ram_addr, vga_ram_size);
         } else {
-            isa_cirrus_vga_init(ds, phys_ram_base + vga_ram_addr,
+            isa_cirrus_vga_init(phys_ram_base + vga_ram_addr,
                                 vga_ram_addr, vga_ram_size);
         }
     } else {
         if (pci_enabled) {
-            pci_vga_init(pci_bus, ds, phys_ram_base + vga_ram_addr,
+            pci_vga_init(pci_bus, phys_ram_base + vga_ram_addr,
                          vga_ram_addr, vga_ram_size, 0, 0);
         } else {
-            isa_vga_init(ds, phys_ram_base + vga_ram_addr,
+            isa_vga_init(phys_ram_base + vga_ram_addr,
                          vga_ram_addr, vga_ram_size);
         }
     }
 
-    rtc_state = rtc_init(0x70, i8259[8]);
+    rtc_state = rtc_init(0x70, i8259[8], 2000);
 
     if (pci_enabled) {
         pic_set_alt_irq_func(isa_pic, NULL, NULL);