# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1291282624 0
# Node ID 1b6cc8c6d1c7889c31e75b34954b1af29fac871e
# Parent c443d02158542a9509f2521089ad6f29e290e6df
x86: Add -Wredundant-decls to Xen build flags.
Fix up the fallout.
Signed-off-by: Keir Fraser <keir@xxxxxxx>
---
xen/arch/x86/Rules.mk | 2 +-
xen/arch/x86/cpu/mcheck/mce.h | 2 --
xen/arch/x86/tboot.c | 2 +-
xen/arch/x86/time.c | 1 -
xen/arch/x86/traps.c | 30 ------------------------------
xen/common/memory.c | 1 +
xen/common/page_alloc.c | 1 +
xen/include/asm-x86/processor.h | 25 ++++++++++++++++++++++++-
xen/include/xen/tmem.h | 1 -
9 files changed, 28 insertions(+), 37 deletions(-)
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/arch/x86/Rules.mk
--- a/xen/arch/x86/Rules.mk Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/arch/x86/Rules.mk Thu Dec 02 09:37:04 2010 +0000
@@ -16,7 +16,7 @@ CFLAGS += -nostdinc
CFLAGS += -nostdinc
endif
-CFLAGS += -fno-builtin -fno-common
+CFLAGS += -fno-builtin -fno-common -Wredundant-decls
CFLAGS += -iwithprefix include -Werror -Wno-pointer-arith -pipe
CFLAGS += -I$(BASEDIR)/include
CFLAGS += -I$(BASEDIR)/include/asm-x86/mach-generic
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/arch/x86/cpu/mcheck/mce.h
--- a/xen/arch/x86/cpu/mcheck/mce.h Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/arch/x86/cpu/mcheck/mce.h Thu Dec 02 09:37:04 2010 +0000
@@ -169,8 +169,6 @@ int vmce_domain_inject(struct mcinfo_ban
int vmce_domain_inject(struct mcinfo_bank *bank, struct domain *d, struct
mcinfo_global *global);
extern int vmce_init(struct cpuinfo_x86 *c);
-
-extern unsigned int nr_mce_banks;
static inline int mce_vendor_bank_msr(uint32_t msr)
{
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/arch/x86/tboot.c
--- a/xen/arch/x86/tboot.c Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/arch/x86/tboot.c Thu Dec 02 09:37:04 2010 +0000
@@ -46,7 +46,7 @@ static uint64_t __initdata sinit_base, _
#define TXTCR_HEAP_BASE 0x0300
#define TXTCR_HEAP_SIZE 0x0308
-extern char __init_begin[], __per_cpu_start[], __bss_start[];
+extern char __init_begin[], __bss_start[];
#define SHA1_SIZE 20
typedef uint8_t sha1_hash_t[SHA1_SIZE];
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/arch/x86/time.c
--- a/xen/arch/x86/time.c Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/arch/x86/time.c Thu Dec 02 09:37:04 2010 +0000
@@ -1837,7 +1837,6 @@ static void dump_softtsc(unsigned char k
{
struct domain *d;
int domcnt = 0;
- extern unsigned int max_cstate;
tsc_check_reliability();
if ( boot_cpu_has(X86_FEATURE_TSC_RELIABLE) )
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/arch/x86/traps.c
--- a/xen/arch/x86/traps.c Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/arch/x86/traps.c Thu Dec 02 09:37:04 2010 +0000
@@ -97,30 +97,6 @@ idt_entry_t idt_table[IDT_ENTRIES];
/* Pointer to the IDT of every CPU. */
idt_entry_t *idt_tables[NR_CPUS] __read_mostly;
-#define DECLARE_TRAP_HANDLER(_name) \
-asmlinkage void _name(void); \
-asmlinkage void do_ ## _name(struct cpu_user_regs *regs)
-
-DECLARE_TRAP_HANDLER(divide_error);
-DECLARE_TRAP_HANDLER(debug);
-DECLARE_TRAP_HANDLER(nmi);
-DECLARE_TRAP_HANDLER(int3);
-DECLARE_TRAP_HANDLER(overflow);
-DECLARE_TRAP_HANDLER(bounds);
-DECLARE_TRAP_HANDLER(invalid_op);
-DECLARE_TRAP_HANDLER(device_not_available);
-DECLARE_TRAP_HANDLER(coprocessor_segment_overrun);
-DECLARE_TRAP_HANDLER(invalid_TSS);
-DECLARE_TRAP_HANDLER(segment_not_present);
-DECLARE_TRAP_HANDLER(stack_segment);
-DECLARE_TRAP_HANDLER(general_protection);
-DECLARE_TRAP_HANDLER(page_fault);
-DECLARE_TRAP_HANDLER(coprocessor_error);
-DECLARE_TRAP_HANDLER(simd_coprocessor_error);
-DECLARE_TRAP_HANDLER(machine_check);
-DECLARE_TRAP_HANDLER(alignment_check);
-DECLARE_TRAP_HANDLER(spurious_interrupt_bug);
-
void (*ioemul_handle_quirk)(
u8 opcode, char *io_emul_stub, struct cpu_user_regs *regs);
@@ -1570,9 +1546,6 @@ static uint32_t guest_io_read(
unsigned int port, unsigned int bytes,
struct vcpu *v, struct cpu_user_regs *regs)
{
- extern uint32_t pci_conf_read(
- uint32_t cf8, uint8_t offset, uint8_t bytes);
-
uint32_t data = 0;
unsigned int shift = 0;
@@ -1626,9 +1599,6 @@ static void guest_io_write(
unsigned int port, unsigned int bytes, uint32_t data,
struct vcpu *v, struct cpu_user_regs *regs)
{
- extern void pci_conf_write(
- uint32_t cf8, uint8_t offset, uint8_t bytes, uint32_t data);
-
if ( admin_io_okay(port, bytes, v, regs) )
{
switch ( bytes ) {
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/common/memory.c
--- a/xen/common/memory.c Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/common/memory.c Thu Dec 02 09:37:04 2010 +0000
@@ -20,6 +20,7 @@
#include <xen/hypercall.h>
#include <xen/errno.h>
#include <xen/tmem.h>
+#include <xen/tmem_xen.h>
#include <asm/current.h>
#include <asm/hardirq.h>
#ifdef CONFIG_X86
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/common/page_alloc.c
--- a/xen/common/page_alloc.c Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/common/page_alloc.c Thu Dec 02 09:37:04 2010 +0000
@@ -36,6 +36,7 @@
#include <xen/numa.h>
#include <xen/nodemask.h>
#include <xen/tmem.h>
+#include <xen/tmem_xen.h>
#include <public/sysctl.h>
#include <asm/page.h>
#include <asm/numa.h>
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/include/asm-x86/processor.h
--- a/xen/include/asm-x86/processor.h Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/include/asm-x86/processor.h Thu Dec 02 09:37:04 2010 +0000
@@ -556,7 +556,30 @@ extern void mtrr_bp_init(void);
extern void mtrr_bp_init(void);
void mcheck_init(struct cpuinfo_x86 *c);
-asmlinkage void do_machine_check(struct cpu_user_regs *regs);
+
+#define DECLARE_TRAP_HANDLER(_name) \
+asmlinkage void _name(void); \
+asmlinkage void do_ ## _name(struct cpu_user_regs *regs)
+DECLARE_TRAP_HANDLER(divide_error);
+DECLARE_TRAP_HANDLER(debug);
+DECLARE_TRAP_HANDLER(nmi);
+DECLARE_TRAP_HANDLER(int3);
+DECLARE_TRAP_HANDLER(overflow);
+DECLARE_TRAP_HANDLER(bounds);
+DECLARE_TRAP_HANDLER(invalid_op);
+DECLARE_TRAP_HANDLER(device_not_available);
+DECLARE_TRAP_HANDLER(coprocessor_segment_overrun);
+DECLARE_TRAP_HANDLER(invalid_TSS);
+DECLARE_TRAP_HANDLER(segment_not_present);
+DECLARE_TRAP_HANDLER(stack_segment);
+DECLARE_TRAP_HANDLER(general_protection);
+DECLARE_TRAP_HANDLER(page_fault);
+DECLARE_TRAP_HANDLER(coprocessor_error);
+DECLARE_TRAP_HANDLER(simd_coprocessor_error);
+DECLARE_TRAP_HANDLER(machine_check);
+DECLARE_TRAP_HANDLER(alignment_check);
+DECLARE_TRAP_HANDLER(spurious_interrupt_bug);
+#undef DECLARE_TRAP_HANDLER
int cpuid_hypervisor_leaves( uint32_t idx, uint32_t sub_idx,
uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx);
diff -r c443d0215854 -r 1b6cc8c6d1c7 xen/include/xen/tmem.h
--- a/xen/include/xen/tmem.h Wed Dec 01 21:20:14 2010 +0000
+++ b/xen/include/xen/tmem.h Thu Dec 02 09:37:04 2010 +0000
@@ -12,6 +12,5 @@ extern void tmem_destroy(void *);
extern void tmem_destroy(void *);
extern void *tmem_relinquish_pages(unsigned int, unsigned int);
extern unsigned long tmem_freeable_pages(void);
-extern int opt_tmem;
#endif /* __XEN_TMEM_H__ */
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home