Skip to content

Commit

Permalink
[IA64] xen_domu_defconfig: fix build issues/warnings
Browse files Browse the repository at this point in the history
- 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>
  • Loading branch information
Jan Beulich authored and Tony Luck committed May 5, 2009
1 parent f328ddc commit 0692698
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 9 deletions.
7 changes: 7 additions & 0 deletions arch/ia64/include/asm/idle.h
Original file line number Diff line number Diff line change
@@ -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 */
7 changes: 1 addition & 6 deletions arch/ia64/include/asm/xen/events.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
2 changes: 0 additions & 2 deletions arch/ia64/xen/xensetup.S
Original file line number Diff line number Diff line change
Expand Up @@ -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;;
Expand Down
3 changes: 2 additions & 1 deletion drivers/xen/balloon.c
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 0692698

Please sign in to comment.