diff options
| author | Keir Fraser <keir@xen.org> | 2011-01-10 08:45:19 +0000 |
|---|---|---|
| committer | Keir Fraser <keir@xen.org> | 2011-01-10 08:45:19 +0000 |
| commit | 5dd5892da9642d6de10794014bb22285a0fac4e1 (patch) | |
| tree | 48f5221d2b4ac0e3b428a4684f6a8b3fda340532 /xen/drivers/acpi | |
| parent | a85a31246a56e513597a3edc0de33d32856bdeed (diff) | |
| download | xen-5dd5892da9642d6de10794014bb22285a0fac4e1.tar.gz xen-5dd5892da9642d6de10794014bb22285a0fac4e1.tar.bz2 xen-5dd5892da9642d6de10794014bb22285a0fac4e1.zip | |
x86_64: don't use weak symbols on x86-64
Various gcc versions inline functions that are both weak and hidden,
without even giving a warning.
Certainly the risk exists that we'll see the problem again when
another weak function gets introduced, but I don't see a way to
protect us from that.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Just remove the weak attribute altogether. It's the only one in
non-ia64-specific code. We can get teh same effect with ifdefs which
although a bit unsightly is better than using compiler/linker features
we cannot trust.
Signed-off-by: Keir Fraser <keir@xen.org>
Diffstat (limited to 'xen/drivers/acpi')
| -rw-r--r-- | xen/drivers/acpi/numa.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xen/drivers/acpi/numa.c b/xen/drivers/acpi/numa.c index 2da987914c..451773c1c4 100644 --- a/xen/drivers/acpi/numa.c +++ b/xen/drivers/acpi/numa.c @@ -120,14 +120,15 @@ static int __init acpi_parse_slit(struct acpi_table_header *table) return 0; } -void __init __attribute__ ((weak)) +#ifndef CONFIG_X86 +void __init acpi_numa_x2apic_affinity_init(struct acpi_srat_x2apic_cpu_affinity *pa) { printk(KERN_WARNING PREFIX "Found unsupported x2apic [0x%08x] SRAT entry\n", pa->apic_id); return; } - +#endif static int __init acpi_parse_x2apic_affinity(struct acpi_subtable_header *header, |