Merge samba.org:/home/paulus/kernel/linux-2.5

into samba.org:/home/paulus/kernel/for-linus-ppc

arch/ppc/Makefile

@@ -108,7 +108,7 @@ $(BOOT_TARGETS): vmlinux
 
 %_config: arch/ppc/configs/%_defconfig
 	rm -f .config arch/ppc/defconfig
-	cp -f arch/ppc/configs/$(@:config=defconfig) arch/ppc/defconfig
+	cp -f arch/ppc/configs/$(@:config=defconfig) .config
 
 archclean:
 	rm -f arch/ppc/kernel/{mk_defs,asm-offsets.h,find_name}

arch/ppc/boot/prep/Makefile

@@ -21,14 +21,14 @@ TFTPIMAGE			= $(TFTPBOOT).smp
 endif
 
 LD_ARGS				= -T ../ld.script -Ttext 0x00800000 -Bstatic
-obj-y				:= head.o ../simple/legacy.o misc.o of1275.o \
+boot-y				:= head.o ../simple/legacy.o misc.o of1275.o \
 					../common/util.o ../common/string.o \
 					../common/misc-common.o
 OBJCOPY_ARGS			= -O elf32-powerpc
 LIBS 				= ../lib/zlib.a
 
-obj-$(CONFIG_SERIAL_CONSOLE)	+= ../common/ns16550.o
-obj-$(CONFIG_VGA_CONSOLE)	+= vreset.o kbd.o
+boot-$(CONFIG_SERIAL_CONSOLE)	+= ../common/ns16550.o
+boot-$(CONFIG_VGA_CONSOLE)	+= vreset.o kbd.o
 
 # Tools
 MKPREP				:= ../utils/mkprep
@@ -40,18 +40,18 @@ CFLAGS_kbd.o			+= -I$(TOPDIR)/drivers/char
 
 all: zImage
 
-zImage: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz ../common/dummy.o \
+zImage: $(boot-y) $(LIBS) ../ld.script ../images/vmlinux.gz ../common/dummy.o \
 		$(MKPREP)
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=.image=../images/vmlinux.gz \
 		--set-section-flags=.image=contents,alloc,load,readonly,data \
 		../common/dummy.o image.o
-	$(LD) $(LD_ARGS) -o $@ $(obj-y) image.o $(LIBS)
+	$(LD) $(LD_ARGS) -o $@ $(boot-y) image.o $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab -R .stabstr
 	$(MKPREP) -pbp $@ ../images/$@.prep
 	rm -f $@
 
-zImage.initrd: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz $(MKPREP) \
+zImage.initrd: $(boot-y) $(LIBS) ../ld.script ../images/vmlinux.gz $(MKPREP) \
 		../common/dummy.o
 	$(OBJCOPY) $(OBJCOPY_ARGS) -R .comment \
 		--add-section=.ramdisk=../images/ramdisk.image.gz \
@@ -59,7 +59,7 @@ zImage.initrd: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz $(MKPREP) \
 		--add-section=.image=../images/vmlinux.gz \
 		--set-section-flags=.image=contents,alloc,load,readonly,data \
 		../common/dummy.o image.o
-	$(LD) $(LD_ARGS) -o $@ $(obj-y) image.o $(LIBS)
+	$(LD) $(LD_ARGS) -o $@ $(boot-y) image.o $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab -R .stabstr
 	$(MKPREP) -pbp $@ ../images/$@.prep
 	rm -f $@

arch/ppc/boot/simple/Makefile

@@ -122,22 +122,22 @@ endif
 OBJCOPY_ARGS			:= -O elf32-powerpc
 
 # head.o and ../common/relocate.o must be at the start.
-obj-y				:= head.o ../common/relocate.o $(HEADHELP) \
+boot-y				:= head.o ../common/relocate.o $(HEADHELP) \
 				$(MISC) ../common/misc-common.o \
 				../common/string.o ../common/util.o
-obj-$(CONFIG_4xx)		+= embed_config.o
-obj-$(CONFIG_8xx)		+= embed_config.o
-obj-$(CONFIG_8260)		+= embed_config.o
-obj-$(CONFIG_BSEIP)		+= iic.o
-obj-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o
-obj-$(CONFIG_RPXCLASSIC)	+= iic.o pci.o qspan_pci.o
-obj-$(CONFIG_RPXLITE)		+= iic.o
+boot-$(CONFIG_4xx)		+= embed_config.o
+boot-$(CONFIG_8xx)		+= embed_config.o
+boot-$(CONFIG_8260)		+= embed_config.o
+boot-$(CONFIG_BSEIP)		+= iic.o
+boot-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o
+boot-$(CONFIG_RPXCLASSIC)	+= iic.o pci.o qspan_pci.o
+boot-$(CONFIG_RPXLITE)		+= iic.o
 # Different boards need different serial implementations.
 ifeq ($(CONFIG_SERIAL_CONSOLE),y)
-obj-$(CONFIG_8xx)		+= m8xx_tty.o
-obj-$(CONFIG_8260)		+= m8260_tty.o
-obj-$(CONFIG_GT64260_CONSOLE)   += gt64260_tty.o
-obj-$(CONFIG_SERIAL)		+= ../common/ns16550.o
+boot-$(CONFIG_8xx)		+= m8xx_tty.o
+boot-$(CONFIG_8260)		+= m8260_tty.o
+boot-$(CONFIG_GT64260_CONSOLE)   += gt64260_tty.o
+boot-$(CONFIG_SERIAL)		+= ../common/ns16550.o
 endif
 
 LIBS				:= ../lib/zlib.a
@@ -147,16 +147,16 @@ MKBUGBOOT			:= ../utils/mkbugboot
 MKPREP				:= ../utils/mkprep
 MKTREE				:= ../utils/mktree
 
-zvmlinux: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz ../common/dummy.o
+zvmlinux: $(boot-y) $(LIBS) ../ld.script ../images/vmlinux.gz ../common/dummy.o
 	$(OBJCOPY) $(OBJCOPY_ARGS) \
 		--add-section=.image=../images/vmlinux.gz \
 		--set-section-flags=.image=contents,alloc,load,readonly,data \
 		../common/dummy.o image.o
-	$(LD) $(LD_ARGS) -o $@ $(obj-y) image.o $(LIBS)
+	$(LD) $(LD_ARGS) -o $@ $(boot-y) image.o $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab -R .stabstr \
 		-R .ramdisk -R .sysmap
 
-zvmlinux.initrd: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz \
+zvmlinux.initrd: $(boot-y) $(LIBS) ../ld.script ../images/vmlinux.gz \
 		../common/dummy.o
 	$(OBJCOPY) $(OBJCOPY_ARGS) \
 		--add-section=.ramdisk=../images/ramdisk.image.gz \
@@ -164,7 +164,7 @@ zvmlinux.initrd: $(obj-y) $(LIBS) ../ld.script ../images/vmlinux.gz \
 		--add-section=.image=../images/vmlinux.gz \
 		--set-section-flags=.image=contents,alloc,load,readonly,data \
 		../common/dummy.o image.o
-	$(LD) $(LD_ARGS) -o $@ $(obj-y) image.o $(LIBS)
+	$(LD) $(LD_ARGS) -o $@ $(boot-y) image.o $(LIBS)
 	$(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab -R .stabstr \
 		-R .sysmap
 

arch/ppc/platforms/prep_pci.c

@@ -665,9 +665,9 @@ static struct pci_ops prep_pci_ops =
 #define	MPIC_HAWK_ID		0x48030000
 #define	MOT_PROC2_BIT		0x800
 
-static u_char mvme2600_openpic_initsenses[] __initdata = {
-    (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* MVME2600_INT_SIO */
-    (IRQ_SENSE_EDGE | IRQ_POLARITY_POSITIVE), /* MVME2600_INT_FALCN_ECC_ERR */
+static u_char prep_openpic_initsenses[] __initdata = {
+    (IRQ_SENSE_LEVEL | IRQ_POLARITY_POSITIVE), /* MVME2600_INT_SIO */
+    (IRQ_SENSE_EDGE | IRQ_POLARITY_NEGATIVE), /* MVME2600_INT_FALCON_ECC_ERR */
     (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* MVME2600_INT_PCI_ETHERNET */
     (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* MVME2600_INT_PCI_SCSI */
     (IRQ_SENSE_LEVEL | IRQ_POLARITY_NEGATIVE), /* MVME2600_INT_PCI_GRAPHICS */
@@ -737,8 +737,8 @@ raven_init(void)
 	/* Map the Raven MPIC registers to virtual memory. */
 	OpenPIC_Addr = ioremap(pci_membase+0xC0000000, 0x22000);
 
-	OpenPIC_InitSenses = mvme2600_openpic_initsenses;
-	OpenPIC_NumInitSenses = sizeof(mvme2600_openpic_initsenses);
+	OpenPIC_InitSenses = prep_openpic_initsenses;
+	OpenPIC_NumInitSenses = sizeof(prep_openpic_initsenses);
 
 	ppc_md.get_irq = openpic_get_irq;
 	
@@ -821,6 +821,9 @@ ibm_prep_init(void)
 			addr += PREP_ISA_MEM_BASE;
 			OpenPIC_Addr = ioremap(addr, 0x40000);
 			ppc_md.get_irq = openpic_get_irq;
+
+			OpenPIC_InitSenses = prep_openpic_initsenses;
+			OpenPIC_NumInitSenses = sizeof(prep_openpic_initsenses);
 		}
 	}