Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] xen_domu_defconfig: fix build issues/warnings
This commit is contained in:
commit
899ad580fe
7
arch/ia64/include/asm/idle.h
Normal file
7
arch/ia64/include/asm/idle.h
Normal file
|
@ -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 */
|
|
@ -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)
|
||||
|
||||
|
|
|
@ -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;;
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue