[Xen-devel] [GIT] domain 0 build fix

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

The following changes since commit 06040e28e2c2078fb247f7c3d5eb2542e9671445:
  Wei Gang (1):
        xen/acpi: Make poweroff really work for pv-ops dom0

are available in the git repository at:

  git://xenbits.xensource.com/people/ianc/linux-2.6.git for-jeremy/dom0/core

Ian Campbell (1):
      x86/hpet: fix build error with CONFIG_HPET_TIMER=n

 arch/x86/include/asm/hpet.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Subject: [PATCH] x86/hpet: fix build error with CONFIG_HPET_TIMER=n

    In file included from arch/x86/kernel/time_32.c:38:
    arch/x86/include/asm/hpet.h: In function 'disable_hpet':
    arch/x86/include/asm/hpet.h:111: error: parameter name omitted
    make[3]: *** [arch/x86/kernel/time_32.o] Error 1
    make[3]: *** Waiting for unfinished jobs....
    make[2]: *** [arch/x86/kernel] Error 2
    make[2]: *** Waiting for unfinished jobs....

Caused by:
    commit b2a93181340b2efd58f16a2d7303f6f45591bca0
    Author: Wei Gang <gang.wei@xxxxxxxxx>
    Date:   Sun Oct 18 17:39:04 2009 +0900

        x86/hpet: allow hpet to be programmatically disabled

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Cc: Wei Gang <gang.wei@xxxxxxxxx>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@xxxxxxxxxx>
---
 arch/x86/include/asm/hpet.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/x86/include/asm/hpet.h b/arch/x86/include/asm/hpet.h
index be24e01..ed15247 100644
--- a/arch/x86/include/asm/hpet.h
+++ b/arch/x86/include/asm/hpet.h
@@ -108,7 +108,7 @@ extern void hpet_unregister_irq_handler(rtc_irq_handler 
handler);
 #else /* CONFIG_HPET_TIMER */
 
 static inline int hpet_enable(void) { return 0; }
-static inline int disable_hpet(char *) { return 0; }
+static inline int disable_hpet(char *s) { return 0; }
 static inline int is_hpet_enabled(void) { return 0; }
 #define hpet_readl(a) 0
 
-- 
1.5.6.5




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