Commit 9c869eda authored by Zachary Amsden's avatar Zachary Amsden Committed by Linus Torvalds

[PATCH] Fix topology.c location

When compiling a non-default subarch, topology.c is missing from the kernel
build.  This causes builds with CONFIG_HOTPLUG_CPU to fail.  In addition,
on Intel processors with cpuid level > 4, it causes intel_cacheinfo.c to
reference uninitialized data that should have been set up by the initcall
in topology.c which calls register_cpu.  This causes a kernel panic on boot
on newer Intel processors.  Moving topology.c to arch/i386/kernel fixes
both of these problems.

Thanks to Dan Hecht for finding and fixing this problem.
Signed-off-by: default avatarZachary Amsden <zach@vmware.com>
Signed-off-by: default avatarDan Hecht <dhect@vmware.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ad329b15
...@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.lds ...@@ -7,7 +7,7 @@ extra-y := head.o init_task.o vmlinux.lds
obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \ ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_i386.o \
pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \ pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
quirks.o i8237.o quirks.o i8237.o topology.o
obj-y += cpu/ obj-y += cpu/
obj-y += timers/ obj-y += timers/
......
/* /*
* arch/i386/mach-generic/topology.c - Populate driverfs with topology information * arch/i386/kernel/topology.c - Populate driverfs with topology information
* *
* Written by: Matthew Dobson, IBM Corporation * Written by: Matthew Dobson, IBM Corporation
* Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL * Original Code: Paul Dorwin, IBM Corporation, Patrick Mochel, OSDL
* *
* Copyright (C) 2002, IBM Corp. * Copyright (C) 2002, IBM Corp.
* *
* All rights reserved. * All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
...@@ -34,7 +34,7 @@ static struct i386_cpu cpu_devices[NR_CPUS]; ...@@ -34,7 +34,7 @@ static struct i386_cpu cpu_devices[NR_CPUS];
int arch_register_cpu(int num){ int arch_register_cpu(int num){
struct node *parent = NULL; struct node *parent = NULL;
#ifdef CONFIG_NUMA #ifdef CONFIG_NUMA
int node = cpu_to_node(num); int node = cpu_to_node(num);
if (node_online(node)) if (node_online(node))
......
...@@ -2,4 +2,4 @@ ...@@ -2,4 +2,4 @@
# Makefile for the linux kernel. # Makefile for the linux kernel.
# #
obj-y := setup.o topology.o obj-y := setup.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment