diff options
| author | Jan Beulich <jbeulich@novell.com> | 2009-05-05 13:57:52 +0100 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-05-05 11:43:13 -0700 |
| commit | 0692698cb7369ea1ce74f3f87f70baf5072f8a37 (patch) | |
| tree | 086afdae8fd416fca8fec1d8288dfe7bfe97706e | |
| parent | f328ddc154605be11c4ca38fee6ace8adb140087 (diff) | |
| download | kernel_samsung_tuna-0692698cb7369ea1ce74f3f87f70baf5072f8a37.zip kernel_samsung_tuna-0692698cb7369ea1ce74f3f87f70baf5072f8a37.tar.gz kernel_samsung_tuna-0692698cb7369ea1ce74f3f87f70baf5072f8a37.tar.bz2 | |
[IA64] xen_domu_defconfig: fix build issues/warnings
- drivers/xen/events.c did not compile
- xen_setup_hook caused a modpost section warning
- the use of u64 (instead of unsigned long long) together with a %llu
in drivers/xen/balloon.c caused a compiler warning
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/include/asm/idle.h | 7 | ||||
| -rw-r--r-- | arch/ia64/include/asm/xen/events.h | 7 | ||||
| -rw-r--r-- | arch/ia64/xen/xensetup.S | 2 | ||||
| -rw-r--r-- | drivers/xen/balloon.c | 3 |
4 files changed, 10 insertions, 9 deletions
diff --git a/arch/ia64/include/asm/idle.h b/arch/ia64/include/asm/idle.h new file mode 100644 index 0000000..b768501 --- /dev/null +++ b/arch/ia64/include/asm/idle.h @@ -0,0 +1,7 @@ +#ifndef _ASM_IA64_IDLE_H +#define _ASM_IA64_IDLE_H + +static inline void enter_idle(void) { } +static inline void exit_idle(void) { } + +#endif /* _ASM_IA64_IDLE_H */ diff --git a/arch/ia64/include/asm/xen/events.h b/arch/ia64/include/asm/xen/events.h index 7324878..b8370c8 100644 --- a/arch/ia64/include/asm/xen/events.h +++ b/arch/ia64/include/asm/xen/events.h @@ -36,14 +36,9 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) return !(ia64_psr(regs)->i); } -static inline void xen_do_IRQ(int irq, struct pt_regs *regs) +static inline void handle_irq(int irq, struct pt_regs *regs) { - struct pt_regs *old_regs; - old_regs = set_irq_regs(regs); - irq_enter(); __do_IRQ(irq); - irq_exit(); - set_irq_regs(old_regs); } #define irq_ctx_init(cpu) do { } while (0) diff --git a/arch/ia64/xen/xensetup.S b/arch/ia64/xen/xensetup.S index 28fed1f..aff8346 100644 --- a/arch/ia64/xen/xensetup.S +++ b/arch/ia64/xen/xensetup.S @@ -54,8 +54,6 @@ END(startup_xen) #define isBP p3 // are we the Bootstrap Processor? - .text - GLOBAL_ENTRY(xen_setup_hook) mov r8=XEN_PV_DOMAIN_ASM (isBP) movl r9=xen_domain_type;; diff --git a/drivers/xen/balloon.c b/drivers/xen/balloon.c index efa4b36..f5bbd9e 100644 --- a/drivers/xen/balloon.c +++ b/drivers/xen/balloon.c @@ -513,7 +513,8 @@ static ssize_t show_target(struct sys_device *dev, struct sysdev_attribute *attr char *buf) { return sprintf(buf, "%llu\n", - (u64)balloon_stats.target_pages << PAGE_SHIFT); + (unsigned long long)balloon_stats.target_pages + << PAGE_SHIFT); } static ssize_t store_target(struct sys_device *dev, |