aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64/kernel/acpi.c
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2009-01-01 10:12:13 +1030
committerRusty Russell <rusty@rustcorp.com.au>2009-01-01 10:12:13 +1030
commitf320786063a9d1f885d2cf34ab44aa69c1d88f43 (patch)
tree391e7c08bcff4665b347ed8ad19343f503981e58 /arch/ia64/kernel/acpi.c
parentMerge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 (diff)
downloadlinux-dev-f320786063a9d1f885d2cf34ab44aa69c1d88f43.tar.xz
linux-dev-f320786063a9d1f885d2cf34ab44aa69c1d88f43.zip
cpumask: Remove IA64 definition of total_cpus now it's in core code
Impact: fix IA64 compile Fortunately, they have exactly the same semantics. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'arch/ia64/kernel/acpi.c')
-rw-r--r--arch/ia64/kernel/acpi.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 54ae373e6e22..0553648b7595 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -202,7 +202,6 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size)
Boot-time Table Parsing
-------------------------------------------------------------------------- */
-static int total_cpus __initdata;
static int available_cpus __initdata;
struct acpi_table_madt *acpi_madt __initdata;
static u8 has_8259;