Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc: Add target for a stripped kernel
sparc64: Make NUMA depend upon SMP.

+13 -2
+6 -2
arch/sparc/Makefile
··· 52 52 export INIT_Y CORE_Y DRIVERS_Y NET_Y LIBS_Y HEAD_Y kallsyms.o 53 53 54 54 # Default target 55 - all: image 55 + all: zImage 56 56 57 57 boot := arch/sparc/boot 58 58 59 - image tftpboot.img: vmlinux 59 + image zImage tftpboot.img: vmlinux 60 60 $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@ 61 61 62 62 archclean: 63 63 $(Q)$(MAKE) $(clean)=$(boot) 64 + 65 + # This is the image used for packaging 66 + KBUILD_IMAGE := $(boot)/zImage 64 67 65 68 CLEAN_FILES += arch/$(ARCH)/boot/System.map 66 69 67 70 # Don't use tabs in echo arguments. 68 71 define archhelp 69 72 echo '* image - kernel image ($(boot)/image)' 73 + echo '* zImage - stripped kernel image ($(boot)/zImage)' 70 74 echo ' tftpboot.img - image prepared for tftp' 71 75 endef
+6
arch/sparc/boot/Makefile
··· 19 19 cmd_sysmap = $(CONFIG_SHELL) $(srctree)/scripts/mksysmap 20 20 quiet_cmd_image = LD $@ 21 21 cmd_image = $(LD) $(LDFLAGS) $(EXTRA_LDFLAGS) $(LDFLAGS_$(@F)) -o $@ 22 + quiet_cmd_strip = STRIP $@ 23 + cmd_strip = $(STRIP) -R .comment -R .note -K sun4u_init -K _end -K _start $(obj)/image -o $@ 24 + 22 25 23 26 define rule_image 24 27 $(if $($(quiet)cmd_image), \ ··· 51 48 # these files being recompiled for each build. 52 49 $(obj)/image: $(obj)/btfix.o FORCE 53 50 $(call if_changed_rule,image) 51 + 52 + $(obj)/zImage: $(obj)/image 53 + $(call if_changed,strip) 54 54 55 55 $(obj)/tftpboot.img: $(obj)/piggyback $(obj)/System.map $(obj)/image FORCE 56 56 $(call if_changed,elftoaout)
+1
arch/sparc64/Kconfig
··· 231 231 232 232 config NUMA 233 233 bool "NUMA support" 234 + depends on SMP 234 235 235 236 config NODES_SHIFT 236 237 int