mirror of
https://github.com/torvalds/linux.git
synced 2024-12-29 14:21:47 +00:00
bf67f3a5c4
Pull smp hotplug cleanups from Thomas Gleixner:
"This series is merily a cleanup of code copied around in arch/* and
not changing any of the real cpu hotplug horrors yet. I wish I'd had
something more substantial for 3.5, but I underestimated the lurking
horror..."
Fix up trivial conflicts in arch/{arm,sparc,x86}/Kconfig and
arch/sparc/include/asm/thread_info_32.h
* 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (79 commits)
um: Remove leftover declaration of alloc_task_struct_node()
task_allocator: Use config switches instead of magic defines
sparc: Use common threadinfo allocator
score: Use common threadinfo allocator
sh-use-common-threadinfo-allocator
mn10300: Use common threadinfo allocator
powerpc: Use common threadinfo allocator
mips: Use common threadinfo allocator
hexagon: Use common threadinfo allocator
m32r: Use common threadinfo allocator
frv: Use common threadinfo allocator
cris: Use common threadinfo allocator
x86: Use common threadinfo allocator
c6x: Use common threadinfo allocator
fork: Provide kmemcache based thread_info allocator
tile: Use common threadinfo allocator
fork: Provide weak arch_release_[task_struct|thread_info] functions
fork: Move thread info gfp flags to header
fork: Remove the weak insanity
sh: Remove cpu_idle_wait()
...
92 lines
2.3 KiB
Makefile
92 lines
2.3 KiB
Makefile
#
|
|
# sparc/Makefile
|
|
#
|
|
# Makefile for the architecture dependent flags and dependencies on the
|
|
# Sparc and sparc64.
|
|
#
|
|
# Copyright (C) 1994,1996,1998 David S. Miller (davem@caip.rutgers.edu)
|
|
# Copyright (C) 1998 Jakub Jelinek (jj@ultra.linux.cz)
|
|
|
|
# We are not yet configured - so test on arch
|
|
ifeq ($(ARCH),sparc)
|
|
KBUILD_DEFCONFIG := sparc32_defconfig
|
|
else
|
|
KBUILD_DEFCONFIG := sparc64_defconfig
|
|
endif
|
|
|
|
ifeq ($(CONFIG_SPARC32),y)
|
|
#####
|
|
# sparc32
|
|
#
|
|
|
|
CHECKFLAGS += -D__sparc__
|
|
LDFLAGS := -m elf32_sparc
|
|
export BITS := 32
|
|
UTS_MACHINE := sparc
|
|
|
|
KBUILD_CFLAGS += -m32 -mcpu=v8 -pipe -mno-fpu -fcall-used-g5 -fcall-used-g7
|
|
KBUILD_AFLAGS += -m32 -Wa,-Av8
|
|
|
|
else
|
|
#####
|
|
# sparc64
|
|
#
|
|
|
|
CHECKFLAGS += -D__sparc__ -D__sparc_v9__ -D__arch64__ -m64
|
|
LDFLAGS := -m elf64_sparc
|
|
export BITS := 64
|
|
UTS_MACHINE := sparc64
|
|
|
|
KBUILD_CFLAGS += -m64 -pipe -mno-fpu -mcpu=ultrasparc -mcmodel=medlow
|
|
KBUILD_CFLAGS += -ffixed-g4 -ffixed-g5 -fcall-used-g7 -Wno-sign-compare
|
|
KBUILD_CFLAGS += -Wa,--undeclared-regs
|
|
KBUILD_CFLAGS += $(call cc-option,-mtune=ultrasparc3)
|
|
KBUILD_AFLAGS += -m64 -mcpu=ultrasparc -Wa,--undeclared-regs
|
|
|
|
ifeq ($(CONFIG_MCOUNT),y)
|
|
KBUILD_CFLAGS += -pg
|
|
endif
|
|
|
|
endif
|
|
|
|
head-y := arch/sparc/kernel/head_$(BITS).o
|
|
|
|
# See arch/sparc/Kbuild for the core part of the kernel
|
|
core-y += arch/sparc/
|
|
|
|
libs-y += arch/sparc/prom/
|
|
libs-y += arch/sparc/lib/
|
|
|
|
drivers-$(CONFIG_OPROFILE) += arch/sparc/oprofile/
|
|
|
|
boot := arch/sparc/boot
|
|
|
|
# Default target
|
|
all: zImage
|
|
|
|
image zImage uImage tftpboot.img vmlinux.aout: vmlinux
|
|
$(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
|
|
|
|
archclean:
|
|
$(Q)$(MAKE) $(clean)=$(boot)
|
|
|
|
# This is the image used for packaging
|
|
KBUILD_IMAGE := $(boot)/zImage
|
|
|
|
# Don't use tabs in echo arguments.
|
|
ifeq ($(ARCH),sparc)
|
|
define archhelp
|
|
echo '* image - kernel image ($(boot)/image)'
|
|
echo '* zImage - stripped kernel image ($(boot)/zImage)'
|
|
echo ' uImage - U-Boot SPARC32 Image (only for LEON)'
|
|
echo ' tftpboot.img - image prepared for tftp'
|
|
endef
|
|
else
|
|
define archhelp
|
|
echo '* vmlinux - standard sparc64 kernel'
|
|
echo '* zImage - stripped and compressed sparc64 kernel ($(boot)/zImage)'
|
|
echo ' vmlinux.aout - a.out kernel for sparc64'
|
|
echo ' tftpboot.img - image prepared for tftp'
|
|
endef
|
|
endif
|