---

yaml
---
r: 11482
b: refs/heads/master
c: ba0dd61
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: beeca08738c4c4024c81a591812bfe38f8c436c0
+refs/heads/master: ba0dd617a3e23321a14cb38ff7ad6f796ba32c34

trunk/arch/powerpc/Makefile

@@ -152,13 +152,13 @@ CPPFLAGS_vmlinux.lds	:= -Upowerpc
 # All the instructions talk about "make bzImage".
 bzImage: zImage
 
-boot := arch/$(OLDARCH)/boot
+boot := arch/$(ARCH)/boot
 
 $(BOOT_TARGETS): vmlinux
-	$(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot) $@
+	$(Q)$(MAKE) $(build)=$(boot) $@
 
 uImage: vmlinux
-	$(Q)$(MAKE) ARCH=$(OLDARCH) $(build)=$(boot)/images $(boot)/images/$@
+	$(Q)$(MAKE) $(build)=$(boot)/images $(boot)/images/$@
 
 define archhelp
   @echo '* zImage          - Compressed kernel image (arch/$(ARCH)/boot/images/zImage.*)'
@@ -171,7 +171,7 @@ define archhelp
 endef
 
 archclean:
-	$(Q)$(MAKE) $(clean)=$(boot)
+	$(Q)$(MAKE) $(clean)=arch/ppc/boot
 	# Temporary hack until we have migrated to asm-powerpc
 	$(Q)rm -rf arch/$(ARCH)/include
 

trunk/arch/powerpc/kernel/Makefile

@@ -14,5 +14,5 @@ extra-$(CONFIG_PPC_FPU)		+= fpu.o
 extra-y				+= vmlinux.lds
 
 obj-y				:= semaphore.o traps.o process.o
-obj-$(CONFIG_MODULES)		+= ppc_ksyms.o
+
 obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

trunk/arch/powerpc/kernel/head.S

@@ -1059,6 +1059,7 @@ __secondary_start:
 
 	lis	r3,-KERNELBASE@h
 	mr	r4,r24
+	bl	identify_cpu
 	bl	call_setup_cpu		/* Call setup_cpu for this CPU */
 #ifdef CONFIG_6xx
 	lis	r3,-KERNELBASE@h
@@ -1108,6 +1109,11 @@ __secondary_start:
  * Those generic dummy functions are kept for CPUs not
  * included in CONFIG_6xx
  */
+_GLOBAL(__setup_cpu_power3)
+	blr
+_GLOBAL(__setup_cpu_generic)
+	blr
+
 #if !defined(CONFIG_6xx) && !defined(CONFIG_POWER4)
 _GLOBAL(__save_cpu_setup)
 	blr